releasing package apt version 1.0.4ubuntu2

56 files changed, 20786 insertions, 20724 deletions

diff --git a/configure.ac b/configure.ac
index ad7d2e592..95ebc01b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
-PACKAGE_VERSION="1.0.4ubuntu1"
+PACKAGE_VERSION="1.0.4ubuntu2"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index e9d63dda3..7b4113713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (1.0.4ubuntu2) utopic; urgency=medium
+
+  * debian/test/control:
+    - add missing db-util to test dependencies
+  * debian/tests/run-tests:
+    - fix path for apt-internal-solver
+
+ -- Michael Vogt <mvo@ubuntu.com>  Wed, 11 Jun 2014 14:51:31 +0200
+
 apt (1.0.4ubuntu1) utopic; urgency=low
 
   * Merged from debian/sid, remaining changes:
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 51ad08b83..496c4c324 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.4">
+<!ENTITY apt-product-version "1.0.4ubuntu2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a058e6506..7a51f0ab5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.0.4~20140610\n"
+"Project-Id-Version: apt-doc 1.0.4ubuntu1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -6242,7 +6242,7 @@ msgstr ""
 #: guide.sgml:163
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/de.po b/doc/po/de.po
index e5b61da60..c336f638c 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.16\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -8847,7 +8847,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/es.po b/doc/po/es.po
index 2cf3a070a..cafda0041 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -8897,7 +8897,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 530de5046..e0c251751 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -8857,7 +8857,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/it.po b/doc/po/it.po
index c5ef090ff..f2a64ea7a 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -8817,7 +8817,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 2475b810d..4185c0bfc 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -8440,7 +8440,7 @@ msgstr ""
 #: guide.sgml:163
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 5f92c521c..36c6eedfb 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 13:59+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -8097,7 +8097,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6ebf93bc7..0c3052c72 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-01 13:59+0200\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -8806,7 +8806,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index e9e785f08..3813a7ed8 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\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"
@@ -6647,7 +6647,7 @@ msgstr ""
 #: guide.sgml:163
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 5ff8f5244..28393d95c 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.2\n"
+"Project-Id-Version: apt 1.0.4ubuntu1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-25 13:52+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
@@ -154,9 +154,9 @@ msgid "  Version table:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
@@ -275,6 +275,7 @@ msgid "Couldn't find package %s"
 msgstr ""
 
 #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
+#: apt-private/private-install.cc:855
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
@@ -302,19 +303,19 @@ msgstr ""
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:786
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:791
 #, c-format
 msgid ""
 "Please use:\n"
@@ -322,151 +323,151 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:843
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:882
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:891
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:888
+#: cmdline/apt-get.cc:896
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:902
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:920
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:942
+#: cmdline/apt-get.cc:950
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:962
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:991
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1010
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1029
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1046
+#: cmdline/apt-get.cc:1054
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
+#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1101
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1263
+#: cmdline/apt-get.cc:1271
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1289
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1304
+#: cmdline/apt-get.cc:1312
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1343
+#: cmdline/apt-get.cc:1351
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1357
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1380
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1387
+#: cmdline/apt-get.cc:1395
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1392
+#: cmdline/apt-get.cc:1400
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1586
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1627
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -516,11 +517,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:52
+#: cmdline/apt-helper.cc:53
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:65
+#: cmdline/apt-helper.cc:66
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -558,9 +559,8 @@ msgstr ""
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1201
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -721,9 +721,9 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1478
-#: apt-pkg/contrib/fileutl.cc:1487 apt-pkg/contrib/fileutl.cc:1492
-#: apt-pkg/contrib/fileutl.cc:1494
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
+#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
+#: apt-pkg/contrib/fileutl.cc:1492
 msgid "Read error"
 msgstr ""
 
@@ -735,10 +735,10 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1600 apt-pkg/contrib/fileutl.cc:1609
-#: apt-pkg/contrib/fileutl.cc:1614 apt-pkg/contrib/fileutl.cc:1616
-#: apt-pkg/contrib/fileutl.cc:1641
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
+#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
+#: apt-pkg/contrib/fileutl.cc:1639
 msgid "Write error"
 msgstr ""
 
@@ -924,31 +924,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:508
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:522
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:524
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:560
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:620
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:625
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:648
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr ""
 
@@ -992,97 +992,10 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr ""
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr ""
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr ""
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr ""
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr ""
-
-#: apt-private/acqprogress.cc:297
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-download.cc:31
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: apt-private/private-download.cc:35
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: apt-private/private-download.cc:45
-msgid "Install these packages without verification?"
-msgstr ""
-
-#: apt-private/private-download.cc:54 apt-private/private-install.cc:209
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1132,6 +1045,10 @@ msgstr ""
 msgid "You don't have enough free space in %s."
 msgstr ""
 
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
 #: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
@@ -1214,7 +1131,7 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:643
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
@@ -1255,7 +1172,7 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: apt-private/private-install.cc:627
+#: apt-private/private-install.cc:628
 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"
@@ -1263,22 +1180,63 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:648
+#: apt-private/private-install.cc:649
 msgid "Broken packages"
 msgstr ""
 
-#: apt-private/private-install.cc:701
+#: apt-private/private-install.cc:702
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: apt-private/private-install.cc:791
+#: apt-private/private-install.cc:792
 msgid "Suggested packages:"
 msgstr ""
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:793
 msgid "Recommended packages:"
 msgstr ""
 
+#: apt-private/private-install.cc:815
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:819
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:831
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:836
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:884
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:889
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:931
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:937
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
 #: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
@@ -1291,139 +1249,159 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-main.cc:23
-msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: apt-private/private-output.cc:81 apt-private/private-show.cc:84
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:233
 #, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:215
+#: apt-private/private-output.cc:237
 msgid "[installed,local]"
 msgstr ""
 
-#: apt-private/private-output.cc:218
+#: apt-private/private-output.cc:240
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:220
+#: apt-private/private-output.cc:242
 msgid "[installed,automatic]"
 msgstr ""
 
-#: apt-private/private-output.cc:222
+#: apt-private/private-output.cc:244
 msgid "[installed]"
 msgstr ""
 
-#: apt-private/private-output.cc:226
+#: apt-private/private-output.cc:248
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:230
+#: apt-private/private-output.cc:252
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:330
+#: apt-private/private-output.cc:352
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:442
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: apt-private/private-output.cc:422
+#: apt-private/private-output.cc:444
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: apt-private/private-output.cc:429
+#: apt-private/private-output.cc:451
 msgid "but it is not installable"
 msgstr ""
 
-#: apt-private/private-output.cc:431
+#: apt-private/private-output.cc:453
 msgid "but it is a virtual package"
 msgstr ""
 
-#: apt-private/private-output.cc:434
+#: apt-private/private-output.cc:456
 msgid "but it is not installed"
 msgstr ""
 
-#: apt-private/private-output.cc:434
+#: apt-private/private-output.cc:456
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: apt-private/private-output.cc:439
+#: apt-private/private-output.cc:461
 msgid " or"
 msgstr ""
 
-#: apt-private/private-output.cc:468
+#: apt-private/private-output.cc:490
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: apt-private/private-output.cc:494
+#: apt-private/private-output.cc:516
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: apt-private/private-output.cc:516
+#: apt-private/private-output.cc:538
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: apt-private/private-output.cc:537
+#: apt-private/private-output.cc:559
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: apt-private/private-output.cc:558
+#: apt-private/private-output.cc:580
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-output.cc:578
+#: apt-private/private-output.cc:600
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-output.cc:633
+#: apt-private/private-output.cc:655
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: apt-private/private-output.cc:641
+#: apt-private/private-output.cc:663
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: apt-private/private-output.cc:672
+#: apt-private/private-output.cc:694
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: apt-private/private-output.cc:676
+#: apt-private/private-output.cc:698
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: apt-private/private-output.cc:678
+#: apt-private/private-output.cc:700
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: apt-private/private-output.cc:680
+#: apt-private/private-output.cc:702
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:684
+#: apt-private/private-output.cc:706
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
@@ -1432,7 +1410,7 @@ msgstr ""
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:728
 msgid "[Y/n]"
 msgstr ""
 
@@ -1440,29 +1418,37 @@ msgstr ""
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:712
+#: apt-private/private-output.cc:734
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:723
+#: apt-private/private-output.cc:745
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:729
+#: apt-private/private-output.cc:751
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:751 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
 msgstr ""
 
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"
@@ -1475,6 +1461,35 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:50
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1485,8 +1500,8 @@ msgstr ""
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
@@ -1501,13 +1516,47 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr ""
+
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
+msgstr ""
+
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
+msgstr ""
+
+#: apt-private/acqprogress.cc:125
+msgid "Err "
+msgstr ""
+
+#: apt-private/acqprogress.cc:146
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
+
+#: apt-private/acqprogress.cc:236
+#, c-format
+msgid " [Working]"
+msgstr ""
+
+#: apt-private/acqprogress.cc:297
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:491
-#: apt-pkg/clean.cc:40 apt-pkg/init.cc:103 apt-pkg/init.cc:111
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:371
-#: apt-pkg/contrib/fileutl.cc:484
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1586,524 +1635,364 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
-#, c-format
-msgid "Unable to write to %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
-msgid "Package extension list is too long"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
-#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
-#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:271
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:388
-msgid "Error writing header to contents file"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:418
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:606
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:812
-msgid "No selections matched"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:890
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:51
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
+msgid "The path %s is too long"
 msgstr ""
 
-#: ftparchive/cachedb.cc:69
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:80
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/cachedb.cc:85
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Unable to open DB file %s: %s"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
-#: apt-inst/extract.cc:216
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:253
-msgid "Archive has no control record"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:494
-msgid "Unable to get a cursor"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:91
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:182
 #, c-format
-msgid "W: Unable to read directory %s\n"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:96
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "W: Unable to stat %s\n"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
+#: apt-inst/extract.cc:249
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:154
-msgid "W: "
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:219
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to open %s"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:498
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Failed to readlink %s"
+msgid "Failed to write file %s"
 msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Failed to close file %s"
 msgstr ""
 
-#: ftparchive/writer.cc:298
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/writer.cc:308
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:413
-msgid "Archive had no package field"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
-#, c-format
-msgid "  %s has no override entry\n"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/writer.cc:721
-#, c-format
-msgid "  %s has no source override entry\n"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/writer.cc:725
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
-msgid "realloc - Failed to allocate memory"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, c-format
-msgid "Malformed override %s line %llu (%s)"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
 msgstr ""
 
-#: ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr ""
-
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr ""
-
-#: cmdline/apt-internal-solver.cc:46
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Failed to write file %s"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
 #, c-format
-msgid "Failed to close file %s"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "The path %s is too long"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/extract.cc:132
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-inst/extract.cc:142
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "The directory %s is diverted"
+msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-inst/extract.cc:152
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-inst/extract.cc:249
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-inst/extract.cc:438
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-inst/extract.cc:498
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Unable to stat %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
+#: apt-pkg/pkgcache.cc:322
+msgid "Conflicts"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
-#, c-format
-msgid "Invalid archive member header %s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816
-#, c-format
-msgid "List directory %spartial is missing."
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Archives directory %spartial is missing."
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
-#, c-format
-msgid "Unable to lock directory %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:901
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Retrieving file %li of %li"
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2054
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
@@ -2120,35 +2009,35 @@ msgstr ""
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1579
+#: apt-pkg/acquire-item.cc:1581
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1595
+#: apt-pkg/acquire-item.cc:1597
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1637
+#: apt-pkg/acquire-item.cc:1639
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1675
+#: apt-pkg/acquire-item.cc:1677
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1697
+#: apt-pkg/acquire-item.cc:1699
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1727
+#: apt-pkg/acquire-item.cc:1729
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2156,667 +2045,837 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
+#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:1867
 #, 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:1931
+#: apt-pkg/acquire-item.cc:1933
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1989
+#: apt-pkg/acquire-item.cc:1991
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:487
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:490
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:601
+#: apt-pkg/acquire.cc:99
 #, c-format
-msgid "Couldn't find task '%s'"
+msgid "Unable to lock directory %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:607
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:613
+#: apt-pkg/acquire.cc:901
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
+msgid "Retrieving file %li of %li"
+msgstr ""
+
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:624
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638
+#: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:661
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
 #, c-format
-msgid "Line %u too long in source list %s."
+msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:577
+#: apt-pkg/packagemanager.cc:583
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"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 ""
+
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893
+#: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:592
+#: apt-pkg/cdrom.cc:586
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:602
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:610
+#: apt-pkg/cdrom.cc:620
 msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:648
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:672
+#: apt-pkg/cdrom.cc:680
 msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:733
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:789
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:806
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:808
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:843
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:851
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Unable to stat %s."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Failed to open StateFile %s"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
-msgid "Send scenario to solver"
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:216
-msgid "Send request to solver"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "Prepare for receiving solution"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:293
-msgid "External solver failed without a proper error message"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
-msgid "Execute external solver"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Unable to parse Release file %s"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid "No sections in Release file %s"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "Packaging system '%s' is not supported"
+msgid "Opening %s"
 msgstr ""
 
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Could not configure '%s'. "
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:577
+#: apt-pkg/cacheset.cc:603
 #, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"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."
+msgid "Couldn't find task '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: apt-pkg/cacheset.cc:615
+#, c-format
+msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
+#: apt-pkg/deb/dpkgpm.cc:95
+#, c-format
+msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#, c-format
+msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#, c-format
+msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
+#: apt-pkg/deb/dpkgpm.cc:98
+#, c-format
+msgid "Completely removing %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
+#: apt-pkg/deb/dpkgpm.cc:99
+#, c-format
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
+#: apt-pkg/deb/dpkgpm.cc:100
+#, c-format
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
+#, c-format
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#, c-format
+msgid "Could not open file '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
+#: apt-pkg/deb/dpkgpm.cc:989
+#, c-format
+msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
+#: apt-pkg/deb/dpkgpm.cc:990
+#, c-format
+msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
+#: apt-pkg/deb/dpkgpm.cc:995
+#, c-format
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
+#: apt-pkg/deb/dpkgpm.cc:997
+#, c-format
+msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/deb/dpkgpm.cc:1004
+#, c-format
+msgid "Removed %s"
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/deb/dpkgpm.cc:1010
+#, c-format
+msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, c-format
+msgid "Can not write log (%s)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
+#: apt-pkg/deb/dpkgpm.cc:1569
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
+#: apt-pkg/deb/dpkgpm.cc:1631
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1636
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/deb/dpkgpm.cc:1638
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/deb/dpkgpm.cc:1644
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1651
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1685
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:190
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/contrib/fileutl.cc:195
 #, c-format
-msgid "Did not understand pin type %s"
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/contrib/fileutl.cc:218
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/contrib/fileutl.cc:223
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/contrib/fileutl.cc:826
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/contrib/fileutl.cc:913
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/contrib/fileutl.cc:1101
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
 #, c-format
-msgid "Opening %s"
+msgid "Could not open file descriptor %d"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/contrib/fileutl.cc:1315
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1373
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1514
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/contrib/fileutl.cc:1915
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Problem closing the file %s"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/contrib/fileutl.cc:1927
+#, c-format
+msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/contrib/fileutl.cc:1938
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/contrib/fileutl.cc:1951
+msgid "Problem syncing the file"
+msgstr ""
+
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "%c%s... %u%%"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:65
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
 #, c-format
-msgid "Unable to stat the mount point %s"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:121
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
-#: apt-pkg/contrib/cmndline.cc:163
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Command line option %s is not understood"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/strutl.cc:1236
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:111
 #, c-format
-msgid "Option %s requires an argument."
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#: apt-pkg/contrib/mmap.cc:119
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:290
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:341
 #, c-format
-msgid "Option '%s' is too long"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/mmap.cc:446
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Invalid operation %s"
+msgid "Unable to stat the mount point %s"
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:519
@@ -2874,384 +2933,378 @@ msgstr ""
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:193
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid "No keyring installed in %s."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:198
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid "Could not open lock file %s"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:221
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:226
+#: apt-pkg/contrib/cmndline.cc:168
 #, c-format
-msgid "Could not get lock %s"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:363 apt-pkg/contrib/fileutl.cc:477
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:397
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:415
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:424
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:827
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:829
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "Sub-process %s received signal %u."
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:833 apt-pkg/contrib/gpgv.cc:239
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
+#: cmdline/apt-extracttemplates.cc:224
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:835 apt-pkg/contrib/gpgv.cc:232
+#: cmdline/apt-extracttemplates.cc:254
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
+msgid "Unable to mkstemp %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:916
-#, c-format
-msgid "Problem closing the gzip file %s"
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1104
-#, c-format
-msgid "Could not open file %s"
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Could not open file descriptor %d"
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1317
-msgid "Failed to create subprocess IPC"
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1375
-msgid "Failed to exec compressor "
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1516
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1629 apt-pkg/contrib/fileutl.cc:1651
-#, c-format
-msgid "write, still have %llu to write but couldn't"
+#: ftparchive/apt-ftparchive.cc:626
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1922
-#, c-format
-msgid "Problem closing the file %s"
+#: ftparchive/apt-ftparchive.cc:841
+msgid "No selections matched"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1934
+#: ftparchive/apt-ftparchive.cc:919
 #, c-format
-msgid "Problem renaming the file %s to %s"
+msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1945
+#: ftparchive/cachedb.cc:65
 #, c-format
-msgid "Problem unlinking the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1958
-msgid "Problem syncing the file"
+msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#: ftparchive/cachedb.cc:83
 #, c-format
-msgid "No keyring installed in %s."
+msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
+#: ftparchive/cachedb.cc:94
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:111
+#: ftparchive/cachedb.cc:99
 #, c-format
-msgid "Couldn't duplicate file descriptor %i"
+msgid "Unable to open DB file %s: %s"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
+#: ftparchive/cachedb.cc:332
+msgid "Failed to read .dsc"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:290
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:341
+#: ftparchive/writer.cc:96
 #, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+#: ftparchive/writer.cc:152
+msgid "E: "
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: ftparchive/writer.cc:154
+msgid "W: "
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:150
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "%c%s... Done"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "%c%s... %u%%"
+msgid "Failed to open %s"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
+#: ftparchive/writer.cc:278
 #, c-format
-msgid "%lid %lih %limin %lis"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
+#: ftparchive/writer.cc:286
 #, c-format
-msgid "%lih %limin %lis"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "%limin %lis"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: ftparchive/writer.cc:298
 #, c-format
-msgid "%lis"
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1236
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Selection %s not found"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: ftparchive/writer.cc:706
 #, c-format
-msgid "Installing %s"
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: ftparchive/writer.cc:710
 #, c-format
-msgid "Configuring %s"
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
-#, c-format
-msgid "Removing %s"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Completely removing %s"
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: ftparchive/override.cc:166
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: ftparchive/override.cc:178
 #, c-format
-msgid "Could not open file '%s'"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: ftparchive/override.cc:191
 #, c-format
-msgid "Preparing %s"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: ftparchive/multicompress.cc:73
 #, c-format
-msgid "Unpacking %s"
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: ftparchive/multicompress.cc:103
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:997
-#, c-format
-msgid "Installed %s"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
-#, c-format
-msgid "Preparing for removal of %s"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Removed %s"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Preparing to completely remove %s"
+msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Completely removed %s"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1065
-msgid "ioctl(TIOCGWINSZ) failed"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
+#: ftparchive/multicompress.cc:359
 #, c-format
-msgid "Can not write log (%s)"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1068
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1089
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1567
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1629
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1634
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1642
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1649
+#: cmdline/apt-internal-solver.cc:47
 msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1683
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 50864ff75..175275a23 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr " جدول النسخ:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -471,11 +471,11 @@ msgstr ""
 msgid "Changelog for %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1005,252 +1005,10 @@ msgstr "فشل الاتصال"
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "حساب الترقية..."
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "تمّ"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " فشل."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " تم"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "إلا أن %s مثبت"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "إلا أنه سيتم تثبيت %s"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "إلا أنه غير قابل للتثبيت"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "إلا أنها حزمة وهمية"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "إلا أنها غير مثبتة"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "إلا أنه لن يتم تثبيتها"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " أو"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "سيتم إزالة الحزم التالية:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "سيتم الإبقاء على الحزم التالية:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "ستتم ترقية الحزم التالية:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "سيتم تثبيط الحزم التالية:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "سيتم تغيير الحزم المبقاة التالية:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (بسبب %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
-"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu أعيد تثبيتها، "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu مثبطة، "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "لا يقبل الأمر update أية مُعطيات"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
@@ -1500,6 +1258,235 @@ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "تصحيح المعتمدات..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " فشل."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "لم يمكن تصحيح المعتمدات"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "لم يمكن تقليص مجموعة الترقية"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " تم"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "إلا أن %s مثبت"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "إلا أنه غير قابل للتثبيت"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "إلا أنها حزمة وهمية"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "إلا أنها غير مثبتة"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "إلا أنه لن يتم تثبيتها"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " أو"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "سيتم إزالة الحزم التالية:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "سيتم الإبقاء على الحزم التالية:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "ستتم ترقية الحزم التالية:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "سيتم تثبيط الحزم التالية:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "سيتم تغيير الحزم المبقاة التالية:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (بسبب %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
+"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu أعيد تثبيتها، "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu مثبطة، "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "لا يقبل الأمر update أية مُعطيات"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1543,6 +1530,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "حساب الترقية..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "تمّ"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
@@ -1582,8 +1582,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1591,9 +1591,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1832,11 +1832,6 @@ msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1885,26 +1880,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -1998,93 +1973,57 @@ msgstr "اختياري"
 msgid "extra"
 msgstr "إضافي"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "قراءة قوائم الحزم"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Unable to write to %s"
-msgstr "تعذرت الكتابة إلى %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2164,6 +2103,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "قراءة قوائم الحزم"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "تعذرت الكتابة إلى %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2206,6 +2208,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2341,32 +2348,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2378,58 +2378,6 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2530,6 +2478,58 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2694,35 +2694,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "تعذر العثور على التحديد %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2856,6 +2827,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... تمّ"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "تعذر العثور على التحديد %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 3fae4b970..9a0ce0674 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -154,7 +154,7 @@ msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -532,11 +532,11 @@ msgstr "Fallu al procesar les dependencies de construcción"
 msgid "Changelog for %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1114,252 +1114,10 @@ msgstr "Fallo la conexón"
 msgid "Internal error"
 msgstr "Fallu internu"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando l'anovamientu... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error internu, AllUpgrade rompió coses"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Fecho"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Iguando dependencies..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nun pudieron iguase les dependencies"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nun pue amenorgase'l conxuntu d'actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fecho"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Habríes d'executar 'apt-get -f install' para igualo."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencies incumplíes. Téntalo usando -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes nun cumplen dependencies:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s ta instaláu"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s ta pa instalar"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "pero nun ye instalable"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "pero ye un paquete virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "pero nun ta instaláu"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "pero nun va instalase"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Van instalase los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes van DESANICIASE:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes tan reteníos:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Los siguientes paquetes van actualizase:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Van camudase los siguientes paquetes reteníos:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
-"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizaos, %lu nuevos instalaos, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalaos, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizaos, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación d'espresión regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La orde update nun lleva argumentos"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
@@ -1623,6 +1381,235 @@ msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fecho"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Habríes d'executar 'apt-get -f install' para igualo."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencies incumplíes. Téntalo usando -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s ta instaláu"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s ta pa instalar"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "pero nun ye instalable"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "pero ye un paquete virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "pero nun ta instaláu"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "pero nun va instalase"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Van instalase los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes van DESANICIASE:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes tan reteníos:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Los siguientes paquetes van actualizase:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Los siguientes paquetes van DESACTUALIZASE:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Van camudase los siguientes paquetes reteníos:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
+"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalaos, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizaos, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación d'espresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1671,6 +1658,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando l'anovamientu... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Error internu, AllUpgrade rompió coses"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fecho"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Oxe "
@@ -1710,8 +1710,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1719,9 +1719,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1963,11 +1963,6 @@ msgstr "Falló la suma de control de tar, ficheru tollíu"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Testera  del TAR triba %u desconocida, miembru %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nun pudo lleese %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2018,26 +2013,6 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
 msgid "Hash mismatch for: %s"
 msgstr "El hash nun concasa pa: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nun pudo alncontrase'l controlador de métodu %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2133,94 +2108,56 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tien un sistema de versiones incompatible"
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de métodu %s."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hebo un error al procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lleendo llista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recoyendo ficheros qu'apurren"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nun se pue escribir en %s"
+msgid "Index file type '%s' is not supported"
+msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Fallu de E/S al grabar caché d'oríxenes"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidates"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeneración de dependencies"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lleendo información d'estáu"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2305,6 +2242,70 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "La caché tien un sistema de versiones incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hebo un error al procesar %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lleendo llista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Fallu de E/S al grabar caché d'oríxenes"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2350,6 +2351,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2498,31 +2504,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencies"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidates"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lleendo información d'estáu"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2534,66 +2534,6 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nun s'alcontró la versión '%s' pa '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nun pudo alcontrase la xera '%s'"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
-"como non tien nengún d'ellos"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
-"virtual"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Nun puede seleicionase versión candidata pal paquete %s que nun tien "
-"candidata"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2697,6 +2637,66 @@ msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nun s'alcontró la versión '%s' pa '%s'"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nun pudo alcontrase la xera '%s'"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
+"como non tien nengún d'ellos"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
+"virtual"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Nun puede seleicionase versión candidata pal paquete %s que nun tien "
+"candidata"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2876,35 +2876,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloquiáu"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Escoyeta %s que nun s'atopa"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3038,6 +3009,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Fecho"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nun se puede facer mmap d'un ficheru baleru"
diff --git a/po/bg.po b/po/bg.po
index 00affd028..51e04bf90 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -540,11 +540,11 @@ msgstr "Неуспех при обработката на зависимости
 msgid "Changelog for %s (%s)"
 msgstr "Журнал на промените в %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1146,254 +1146,10 @@ msgstr "Неуспех при свързването"
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Изчисляване на актуализацията..."
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Готово"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Коригиране на зависимостите..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " пропадна."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неуспех при коригирането на зависимостите"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неуспех при минимизирането на набора актуализации"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
-"неизправности."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Следните пакети имат неудовлетворени зависимости:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "но е инсталиран %s"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но ще бъде инсталиран %s"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "но той не може да бъде инсталиран"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "но той е виртуален пакет"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "но той не е инсталиран"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "но той няма да бъде инсталиран"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Следните пакети няма да бъдат променени:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Следните пакети ще бъдат актуализирани:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Следните задържани пакети ще бъдат променени:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (поради %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
-"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu актуализирани, %lu нови инсталирани, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu преинсталирани, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu върнати към по-стара версия, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu за премахване и %lu без промяна.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu не са напълно инсталирани или премахнати.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Грешка при компилирането на регулярния израз - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Командата „update“ не възприема аргументи"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
@@ -1661,6 +1417,237 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " пропадна."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зависимости:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "но е инсталиран %s"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но ще бъде инсталиран %s"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "но той не може да бъде инсталиран"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "но той е виртуален пакет"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "но той не е инсталиран"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "но той няма да бъде инсталиран"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Следните пакети няма да бъдат променени:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Следните пакети ще бъдат актуализирани:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Следните задържани пакети ще бъдат променени:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (поради %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
+"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu актуализирани, %lu нови инсталирани, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu преинсталирани, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu върнати към по-стара версия, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu за премахване и %lu без промяна.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu не са напълно инсталирани или премахнати.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Грешка при компилирането на регулярния израз - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1708,6 +1695,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Изчисляване на актуализацията..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Готово"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Поп "
@@ -1747,8 +1747,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1756,9 +1756,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Неуспех при четенето на %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1997,11 +1997,6 @@ msgstr "Невярна контролна сума на tar, развален а
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неуспех при получаването на атрибути на %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2050,26 +2045,6 @@ msgstr "Не е намерен oторизационен запис за: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Несъответствие на контролната сума за: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Неуспех при намирането на драйвер за метод %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не стартира правилно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2166,100 +2141,56 @@ msgstr "незадължителен"
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Не се поддържа индексен файл от типа „%s“"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Кешът има несъвместима система за версии"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Възникна грешка при обработката на %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Четене на списъците с пакети"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Събиране на информация за „Осигурява“"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Неуспех при записа на %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Не се поддържа индексен файл от типа „%s“"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии кандидати"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Четене на информацията за състоянието"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2347,6 +2278,74 @@ msgid ""
 msgstr ""
 "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Кешът има несъвместима система за версии"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Възникна грешка при обработката на %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Четене на списъците с пакети"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Събиране на информация за „Осигурява“"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Неуспех при записа на %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2391,6 +2390,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неуспех при получаването на атрибути на %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2543,31 +2547,27 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Неуспех при коригирането на проблемите, имате задържани счупени пакети."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Изграждане на дървото със зависимости"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии кандидати"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2579,66 +2579,6 @@ msgstr "Неуспех при анализирането на пакетен ф�
 msgid "Unable to parse package file %s (2)"
 msgstr "Неуспех при анализирането на пакетен файл %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Не е намерено издание „%s“ на „%s“"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Не е намерена версия „%s“ на „%s“"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Неуспех при намиране на задача „%s“"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
-"понеже той няма нито едната"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Не е възможно избиране на на последната версия за пакета „%s“, защото е "
-"виртуален"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
-"подходящ кандидати"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
-"инсталиран"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2746,6 +2686,66 @@ msgstr "Типът „%s“ на ред %u в списъка с източниц
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Не е намерено издание „%s“ на „%s“"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Не е намерена версия „%s“ на „%s“"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Неуспех при намиране на задача „%s“"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
+"понеже той няма нито едната"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Не е възможно избиране на на последната версия за пакета „%s“, защото е "
+"виртуален"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
+"подходящ кандидати"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
+"инсталиран"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2928,35 +2928,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Без заключване"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liч %liм %liс"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liм %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%liм %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Изборът %s не е намерен"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3094,6 +3065,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Готово"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liм %liс"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liм %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liм %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Невъзможно е да се прехвърли в паметта празен файл"
diff --git a/po/bs.po b/po/bs.po
index 59a733360..6bfecf6ed 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -156,7 +156,7 @@ msgid "  Version table:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -477,11 +477,11 @@ msgstr ""
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1010,250 +1010,10 @@ msgstr "Povezivanje neuspješno"
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju..."
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Urađeno"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ali je %s instaliran"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ali se %s treba instalirati"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ali se ne može instalirati"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ali je virtuelni paket"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ali nije instaliran"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ali se neće instalirati"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ili"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Slijedeći paketi će biti UKLONJENI:"
-
-#: apt-private/private-output.cc:538
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Slijedeći paketi su zadržani:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1496,6 +1256,234 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ali je %s instaliran"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ali se %s treba instalirati"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ali se ne može instalirati"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ali je virtuelni paket"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ali nije instaliran"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ali se neće instalirati"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ili"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Slijedeći paketi će biti UKLONJENI:"
+
+#: apt-private/private-output.cc:538
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Slijedeći paketi su zadržani:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr ""
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1540,6 +1528,18 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Računam nadogradnju..."
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr ""
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Urađeno"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
@@ -1576,8 +1576,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1585,9 +1585,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1824,11 +1824,6 @@ msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1877,26 +1872,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -1991,93 +1966,57 @@ msgstr "opcionalno"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2155,6 +2094,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2197,6 +2199,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2333,93 +2340,34 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Sastavljam dostupne informacije"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:237
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:78
@@ -2522,6 +2470,58 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2686,35 +2686,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2848,6 +2819,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr ""
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr ""
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 9f7a9b7fc..1774ace37 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-10-19 13:30+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Taula de versió:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -542,11 +542,11 @@ msgstr "No es poden processar les dependències de construcció"
 msgid "Changelog for %s (%s)"
 msgstr "Registre de canvis per a %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1130,252 +1130,10 @@ msgstr "Ha fallat la connexió"
 msgid "Internal error"
 msgstr "Error intern"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "S'està calculant l'actualització… "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error intern, AllUpgrade ha trencat coses"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Fet"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ha fallat."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Els següents paquets tenen dependències sense satisfer:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "però està instaŀlat %s"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "però s'instaŀlarà %s"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "però no és instaŀlable"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "però és un paquet virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "però no està instaŀlat"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "però no serà instaŀlat"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "S'instaŀlaran els paquets NOUS següents:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Es SUPRIMIRAN els paquets següents:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "S'han mantingut els paquets següents:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "S'actualitzaran els paquets següents:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Es DESACTUALITZARAN els paquets següents:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Es canviaran els paquets retinguts següents:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (per %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstaŀlats, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualitzats, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a suprimir i %lu no actualitzats.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instaŀlats o suprimits completament.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "L'ordre update no pren arguments"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1649,6 +1407,235 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "S'estan corregint les dependències…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ha fallat."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No es poden corregir les dependències"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No es pot minimitzar el joc de versions revisades"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fet"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Els següents paquets tenen dependències sense satisfer:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "però està instaŀlat %s"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "però s'instaŀlarà %s"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "però no és instaŀlable"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "però és un paquet virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "però no està instaŀlat"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "però no serà instaŀlat"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "S'instaŀlaran els paquets NOUS següents:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Es SUPRIMIRAN els paquets següents:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "S'han mantingut els paquets següents:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "S'actualitzaran els paquets següents:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Es DESACTUALITZARAN els paquets següents:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Es canviaran els paquets retinguts següents:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (per %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualitzats, %lu nous a instaŀlar, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstaŀlats, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualitzats, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a suprimir i %lu no actualitzats.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instaŀlats o suprimits completament.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "L'ordre update no pren arguments"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1696,6 +1683,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "S'està calculant l'actualització… "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Error intern, AllUpgrade ha trencat coses"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fet"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Obj "
@@ -1735,8 +1735,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1744,9 +1744,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1988,11 +1988,6 @@ msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No es pot veure l'estat de %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2043,26 +2038,6 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
 msgid "Hash mismatch for: %s"
 msgstr "El resum no coincideix per a: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No s'ha pogut trobar el mètode de control %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2158,100 +2133,56 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "El tipus de fitxer índex «%s» no està suportat"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La memòria cau té un sistema de versions incompatible"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "S'ha produït un error en processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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. "
+msgid "The method driver %s could not be found."
+msgstr "No s'ha pogut trobar el mètode de control %s."
 
-#: apt-pkg/pkgcachegen.cc:266
-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/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "S'està llegint la llista de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "S'estan recollint els fitxers que proveeixen"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "No es pot escriure en %s"
+msgid "Index file type '%s' is not supported"
+msgstr "El tipus de fitxer índex «%s» no està suportat"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Error d'E/S en desar la memòria cau de la font"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Envia l'escenari al resoledor"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "S'està llegint la informació de l'estat"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2342,6 +2273,76 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "La memòria cau té un sistema de versions incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "S'ha produït un error en processar %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "S'està llegint la llista de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "S'estan recollint els fitxers que proveeixen"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No es pot escriure en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Error d'E/S en desar la memòria cau de la font"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2386,6 +2387,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No es pot veure l'estat de %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2538,31 +2544,25 @@ msgstr ""
 "No es poden corregir els problemes, teniu paquets retinguts que estan "
 "trencats."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "S'està construint l'arbre de dependències"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions candidates"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Envia l'escenari al resoledor"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependències que genera"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "S'està llegint la informació de l'estat"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Executa un resoledor extern"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2574,68 +2574,6 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "No es pot analitzar el fitxer del paquet %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "No s'ha trobat la versió «%s» per a «%s»"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "No s'ha pogut trobar la tasca «%s»"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
-"virtual"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
-"«%s» ja que no estan disponibles cap de les dues"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
-"purament virtual"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
-"candidata"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
-"instaŀlada"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2739,6 +2677,68 @@ msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
 msgid "Type '%s' is not known on stanza %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/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "No s'ha trobat la versió «%s» per a «%s»"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "No s'ha pogut trobar la tasca «%s»"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
+"virtual"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
+"«%s» ja que no estan disponibles cap de les dues"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
+"purament virtual"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
+"candidata"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
+"instaŀlada"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2918,35 +2918,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "No blocat"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "No s'ha trobat la selecció %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3085,6 +3056,35 @@ msgstr "…"
 msgid "%c%s... %u%%"
 msgstr "%c%s… %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "No s'ha trobat la selecció %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "No es pot transferir un fitxer buit a memòria"
diff --git a/po/cs.po b/po/cs.po
index 670654a21..ba40ef385 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-07-08 13:46+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -526,11 +526,11 @@ msgstr "Chyba při zpracování závislostí pro sestavení"
 msgid "Changelog for %s (%s)"
 msgstr "Seznam změn %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1122,255 +1122,10 @@ msgstr "Spojení selhalo"
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Propočítávám aktualizaci… "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Hotovo"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Opravuji závislosti…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pro opravení můžete spustit „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplněné závislosti. Zkuste použít -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalovaný]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Následující balíky mají nesplněné závislosti:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s je nainstalován"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s se bude instalovat"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ale nedá se nainstalovat"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ale je to virtuální balík"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ale není nainstalovaný"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ale nebude se instalovat"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " nebo"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Následující NOVÉ balíky budou nainstalovány:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Následující balíky budou ODSTRANĚNY:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Následující balíky budou aktualizovány:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Následující balíky budou DEGRADOVÁNY:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Následující podržené balíky budou změněny:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (kvůli %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizováno, %lu nově instalováno, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu přeinstalováno, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradováno, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba při kompilaci regulárního výrazu - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Příkaz update neakceptuje žádné argumenty"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
@@ -1640,6 +1395,238 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Opravuji závislosti…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " selhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pro opravení můžete spustit „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplněné závislosti. Zkuste použít -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalovaný]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Následující balíky mají nesplněné závislosti:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s je nainstalován"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s se bude instalovat"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ale nedá se nainstalovat"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ale je to virtuální balík"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ale není nainstalovaný"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ale nebude se instalovat"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " nebo"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Následující NOVÉ balíky budou nainstalovány:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Následující balíky budou ODSTRANĚNY:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Následující balíky jsou podrženy v aktuální verzi:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Následující balíky budou aktualizovány:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Následující balíky budou DEGRADOVÁNY:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Následující podržené balíky budou změněny:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvůli %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizováno, %lu nově instalováno, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu přeinstalováno, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradováno, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu k odstranění a %lu neaktualizováno.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba při kompilaci regulárního výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Příkaz update neakceptuje žádné argumenty"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1687,6 +1674,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Propočítávám aktualizaci… "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Hotovo"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Cíl "
@@ -1726,8 +1726,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1735,9 +1735,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nelze číst %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1974,11 +1974,6 @@ msgstr "Kontrolní součet taru selhal, archiv je poškozený"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznámá hlavička TARu typ %u, člen %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nebylo možno vyhodnotit %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2027,26 +2022,6 @@ msgstr "Nelze najít autentizační záznam pro: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Neshoda kontrolních součtů pro: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovladač metody %s nemohl být nalezen."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2141,93 +2116,56 @@ msgstr "volitelný"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový typ souboru „%s“ není podporován"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache má nekompatibilní systém správy verzí"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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."
+msgid "The method driver %s could not be found."
+msgstr "Ovladač metody %s nemohl být nalezen."
 
-#: apt-pkg/pkgcachegen.cc:266
-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/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Čtu seznamy balíků"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nelze zapsat do %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový typ souboru „%s“ není podporován"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Chyba IO při ukládání zdrojové cache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Scénář odeslán řešiteli"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generování závislostí"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Čtu stavové informace"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat dočasný stavový soubor %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2315,6 +2253,69 @@ msgid ""
 msgstr ""
 "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache má nekompatibilní systém správy verzí"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba při zpracování %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Čtu seznamy balíků"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nelze zapsat do %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Chyba IO při ukládání zdrojové cache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2359,6 +2360,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nebylo možno vyhodnotit %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2507,31 +2513,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytváří se strom závislostí"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátské verze"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Scénář odeslán řešiteli"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generování závislostí"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Čtu stavové informace"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat dočasný stavový soubor %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Spuštění externího řešitele"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2543,60 +2543,6 @@ msgstr "Nelze zpracovat soubor %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nelze zpracovat soubor %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nelze najít úlohu „%s“"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
-"žádné takové verze nemá"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2697,6 +2643,60 @@ msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nelze najít úlohu „%s“"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
+"žádné takové verze nemá"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2873,35 +2873,6 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
 msgid "Not locked"
 msgstr "Není uzamčen"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Výběr %s nenalezen"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3035,6 +3006,35 @@ msgstr "…"
 msgid "%c%s... %u%%"
 msgstr "%c%s… %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Výběr %s nenalezen"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nelze provést mmap prázdného souboru"
diff --git a/po/cy.po b/po/cy.po
index b15c61792..84af8238f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -174,7 +174,7 @@ msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -548,13 +548,13 @@ msgstr "Methwyd prosesu dibyniaethau adeiladu"
 msgid "Changelog for %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1140,258 +1140,10 @@ msgstr "Methodd y cysylltiad"
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
-#: apt-private/private-upgrade.cc:25
-#, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Wedi Gorffen"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " neu"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-
-#: apt-private/private-output.cc:538
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-
-#: apt-private/private-output.cc:559
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-
-#: apt-private/private-output.cc:580
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
-
-#: apt-private/private-output.cc:663
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1651,6 +1403,240 @@ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 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"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc:538
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc:559
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc:580
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
+
+#: apt-private/private-output.cc:663
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1696,6 +1682,20 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+#, fuzzy
+msgid "Calculating upgrade... "
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Wedi Gorffen"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Presennol "
@@ -1735,8 +1735,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1744,9 +1744,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1994,11 +1994,6 @@ msgstr "Methodd swm gwirio Tar, archif llygredig"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2048,29 +2043,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:455
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
@@ -2166,97 +2138,63 @@ msgstr "opsiynnol"
 msgid "extra"
 msgstr "ychwanegol"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
-
-#: apt-pkg/pkgcachegen.cc:260
-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:263
-#, 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/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:455
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
 #, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2341,6 +2279,73 @@ msgid ""
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+#, 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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2387,6 +2392,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2535,35 +2545,25 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
-
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 # FIXME: number?
 #: apt-pkg/tagfile.cc:140
@@ -2576,58 +2576,6 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 # FIXME: number?
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
@@ -2735,6 +2683,58 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2899,35 +2899,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3063,6 +3034,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Wedi Gorffen"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
diff --git a/po/da.po b/po/da.po
index f7af287a8..964b6d0c5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2013-12-14 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Versionstabel:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -538,11 +538,11 @@ msgstr "Kunne ikke behandler opbygningsafhængighederne"
 msgid "Changelog for %s (%s)"
 msgstr "Ændringslog for %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1156,249 +1156,10 @@ msgstr "Forbindelsen mislykkedes"
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Beregner opgraderingen ... "
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern fejl, opgradering blev afbrudt"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Færdig"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr "Sortering"
 
-# måske visning, kategorisering
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr "Listing"
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislykkedes."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhængigheder"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssættet"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Færdig"
-
-#: apt-private/private-cachefile.cc:108
-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«."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uopfyldte afhængigheder. Prøv med -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "installeret,kan opgraderes til: "
-
-#: apt-private/private-output.cc:237
-msgid "[installed,local]"
-msgstr "[Installeret,lokalt]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr "[installeret,kan auto-fjernes]"
-
-#: apt-private/private-output.cc:242
-msgid "[installed,automatic]"
-msgstr "[Installeret,automatisk]"
-
-#: apt-private/private-output.cc:244
-msgid "[installed]"
-msgstr "[Installeret]"
-
-#: apt-private/private-output.cc:248
-#, fuzzy, c-format
-msgid "[upgradable from: %s]"
-msgstr "[kan opgraderes fra: "
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr "[residual-konfig]"
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uopfyldte afhængigheder:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installeret"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s forventes installeret"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "men den kan ikke installeres"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "men det er en virtuel pakke"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "men den er ikke installeret"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "men den bliver ikke installeret"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil blive installeret:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil blive AFINSTALLERET:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er blevet holdt tilbage:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil blive opgraderet:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil blive NEDGRADERET:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (grundet %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
-"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu opgraderes, %lu nyinstalleres, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu geninstalleres, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderes, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fejl ved tolkning af regulært udtryk - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "»update«-kommandoen benytter ingen parametre"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "ikke en reel pakke (virtuel)"
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
@@ -1662,6 +1423,233 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
 
+# måske visning, kategorisering
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr "Listing"
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Retter afhængigheder ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislykkedes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunne ikke rette afhængigheder"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunne ikke minimere opgraderingssættet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Færdig"
+
+#: apt-private/private-cachefile.cc:108
+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«."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uopfyldte afhængigheder. Prøv med -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "installeret,kan opgraderes til: "
+
+#: apt-private/private-output.cc:237
+msgid "[installed,local]"
+msgstr "[Installeret,lokalt]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr "[installeret,kan auto-fjernes]"
+
+#: apt-private/private-output.cc:242
+msgid "[installed,automatic]"
+msgstr "[Installeret,automatisk]"
+
+#: apt-private/private-output.cc:244
+msgid "[installed]"
+msgstr "[Installeret]"
+
+#: apt-private/private-output.cc:248
+#, fuzzy, c-format
+msgid "[upgradable from: %s]"
+msgstr "[kan opgraderes fra: "
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr "[residual-konfig]"
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installeret"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s forventes installeret"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "men den kan ikke installeres"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "men det er en virtuel pakke"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "men den er ikke installeret"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "men den bliver ikke installeret"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil blive installeret:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil blive AFINSTALLERET:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er blevet holdt tilbage:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil blive opgraderet:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil blive NEDGRADERET:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Følgende tilbageholdte pakker vil blive ændret:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (grundet %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
+"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu opgraderes, %lu nyinstalleres, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu geninstalleres, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderes, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fejl ved tolkning af regulært udtryk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "»update«-kommandoen benytter ingen parametre"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ikke en reel pakke (virtuel)"
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1709,6 +1697,18 @@ msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
 msgid "Full Text Search"
 msgstr "Fuldtekst-søgning"
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Beregner opgraderingen ... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern fejl, opgradering blev afbrudt"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Færdig"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Havde "
@@ -1748,8 +1748,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1757,9 +1757,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Kunne ikke læse %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2001,11 +2001,6 @@ msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukendt TAR-hovedtype %u, element %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2054,26 +2049,6 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsum stemmer ikke: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metodedriveren %s blev ikke fundet."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
@@ -2167,95 +2142,56 @@ msgstr "frivillig"
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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."
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
 
-#: apt-pkg/pkgcachegen.cc:266
-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/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finde kildepakkelisten %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Indlæser pakkelisterne"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler filudbud"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kunne ikke skrive til %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Send scenarie til problemløser"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Læser tilstandsoplysninger"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2342,6 +2278,71 @@ 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/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kunne ikke finde kildepakkelisten %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Indlæser pakkelisterne"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler filudbud"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunne ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2386,6 +2387,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2537,31 +2543,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Opbygger afhængighedstræ"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversioner"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Send scenarie til problemløser"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Afhængighedsgenerering"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Læser tilstandsoplysninger"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Kør ekstern problemløser"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2573,62 +2573,6 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunne ikke tolke pakkefilen %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Udgaven »%s« for »%s« blev ikke fundet"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versionen »%s« for »%s« blev ikke fundet"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kunne ikke finde opgaven »%s«"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
-"har nogen af dem"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2729,6 +2673,62 @@ msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Udgaven »%s« for »%s« blev ikke fundet"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versionen »%s« for »%s« blev ikke fundet"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Kunne ikke finde opgaven »%s«"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
+"har nogen af dem"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2902,35 +2902,6 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
 msgid "Not locked"
 msgstr "Ikke låst"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Det valgte %s blev ikke fundet"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3064,6 +3035,35 @@ msgstr "..."
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Det valgte %s blev ikke fundet"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan ikke udføre mmap for en tom fil"
diff --git a/po/de.po b/po/de.po
index 855eab400..ac9ebd3df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-27 10:55+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -550,11 +550,11 @@ msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 msgid "Changelog for %s (%s)"
 msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1176,253 +1176,10 @@ msgstr "Verbindung fehlgeschlagen"
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Fertig"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fehlgeschlagen."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installiert]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "aber %s ist installiert"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "aber %s soll installiert werden"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ist aber nicht installierbar"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ist aber ein virtuelles Paket"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ist aber nicht installiert"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "soll aber nicht installiert werden"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " oder"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Die folgenden NEUEN Pakete werden installiert:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Die folgenden Pakete werden ENTFERNT:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (wegen %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
-"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualisiert, %lu neu installiert, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu erneut installiert, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu durch eine ältere Version ersetzt, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Der Befehl »update« akzeptiert keine Argumente."
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
@@ -1700,6 +1457,236 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fertig"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installiert]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "aber %s ist installiert"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "aber %s soll installiert werden"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ist aber nicht installierbar"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ist aber ein virtuelles Paket"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ist aber nicht installiert"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "soll aber nicht installiert werden"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " oder"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Die folgenden NEUEN Pakete werden installiert:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Die folgenden Pakete werden ENTFERNT:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Die folgenden Pakete sind zurückgehalten worden:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (wegen %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
+"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualisiert, %lu neu installiert, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu erneut installiert, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu durch eine ältere Version ersetzt, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nicht vollständig installiert oder entfernt.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Der Befehl »update« akzeptiert keine Argumente."
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1748,6 +1735,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fertig"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "OK   "
@@ -1787,8 +1787,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1796,9 +1796,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden."
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2040,11 +2040,6 @@ msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s mit stat abfragen nicht möglich"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2095,28 +2090,6 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-Summe stimmt nicht überein für: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet."
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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)."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2213,103 +2186,58 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexdateityp »%s« wird nicht unterstützt."
+msgid "The method driver %s could not be found."
+msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Paketlisten werden gelesen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
+"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
+"drücken Sie die Eingabetaste (Enter)."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Schreiben nach %s nicht möglich"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexdateityp »%s« wird nicht unterstützt."
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Szenario an Problemlöser senden"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Installationskandidat-Versionen"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Abhängigkeitsgenerierung"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Statusinformationen werden eingelesen."
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2402,6 +2330,78 @@ msgid ""
 msgstr ""
 "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Paketlisten werden gelesen"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Schreiben nach %s nicht möglich"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2448,6 +2448,11 @@ msgstr ""
 "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
 "eintragen."
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s mit stat abfragen nicht möglich"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2602,31 +2607,26 @@ msgstr ""
 "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
 "Pakete."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Szenario an Problemlöser senden"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Statusinformationen werden eingelesen."
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Externen Problemlöser ausführen"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2638,68 +2638,6 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 msgid "Unable to parse package file %s (2)"
 msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Task »%s« konnte nicht gefunden werden."
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
-"virtuell ist."
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Es kann weder eine installierte Version noch ein Installationskandidat von "
-"Paket »%s« ausgewählt werden, da beide nicht existieren."
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
-"virtuell ist."
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
-"solcher existiert."
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
-"nicht installiert ist."
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2801,6 +2739,68 @@ msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Task »%s« konnte nicht gefunden werden."
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
+"virtuell ist."
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Es kann weder eine installierte Version noch ein Installationskandidat von "
+"Paket »%s« ausgewählt werden, da beide nicht existieren."
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
+"virtuell ist."
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
+"solcher existiert."
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
+"nicht installiert ist."
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2983,35 +2983,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, 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:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Auswahl %s nicht gefunden"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3154,6 +3125,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Fertig"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Auswahl %s nicht gefunden"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden."
diff --git a/po/dz.po b/po/dz.po
index a9df474fa..6bc554cde 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -526,11 +526,11 @@ msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འད
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1109,252 +1109,10 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "འབད་ཚར་ཡི།"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr "ཡང་ན།"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s( %s་གིས་སྦེ)"
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
-"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "ཝའི།"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1617,6 +1375,235 @@ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུག�
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr "ཡང་ན།"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s( %s་གིས་སྦེ)"
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
+"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "ཝའི།"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1661,6 +1648,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "འབད་ཚར་ཡི།"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "ཨེབ།"
@@ -1700,8 +1700,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1709,9 +1709,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1954,11 +1954,6 @@ msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱ
 msgid "Unknown TAR header type %u, member %s"
 msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2009,26 +2004,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2123,94 +2098,57 @@ msgstr "གདམ་ཁ་ཅན།"
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+msgid "The method driver %s could not be found."
+msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
+msgid "Method %s did not start correctly"
+msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr " %sལུ་འབྲི་མ་ཚུགས།"
+msgid "Index file type '%s' is not supported"
+msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2293,6 +2231,70 @@ msgid ""
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2339,6 +2341,11 @@ msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2483,32 +2490,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2520,58 +2520,6 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་�
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2672,6 +2620,58 @@ msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་ག
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2836,35 +2836,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2999,6 +2970,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... འབད་ཚར་ཡོད།"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
diff --git a/po/el.po b/po/el.po
index 9f42cf36f..c012379f2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -167,7 +167,7 @@ msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -542,11 +542,11 @@ msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισ�
 msgid "Changelog for %s (%s)"
 msgstr "Changelog για %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1125,254 +1125,10 @@ msgstr "Η σύνδεση απέτυχε"
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Υπολογισμός της αναβάθμισης... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Ετοιμο"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "αλλά το %s είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "αλλά δεν είναι εγκαταστάσημο"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "αλλά είναι ένα εικονικό πακέτο"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "αλλά δεν είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " η"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (λόγω του %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
-"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu επανεγκατεστημένα,"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu υποβαθμισμένα, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Ν/ο]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[ν/Ο]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "σφάλμα μεταγλωτισμου - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Η εντολή update δεν παίρνει ορίσματα"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
@@ -1641,6 +1397,237 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " απέτυχε."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ετοιμο"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "αλλά το %s είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "αλλά δεν είναι εγκαταστάσημο"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "αλλά είναι ένα εικονικό πακέτο"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "αλλά δεν είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " η"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (λόγω του %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
+"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu επανεγκατεστημένα,"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu υποβαθμισμένα, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Ν/ο]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[ν/Ο]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "σφάλμα μεταγλωτισμου - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Η εντολή update δεν παίρνει ορίσματα"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1684,6 +1671,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Υπολογισμός της αναβάθμισης... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Ετοιμο"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Hit "
@@ -1723,8 +1723,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1732,9 +1732,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Αδύνατη η ανάγνωση του %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1977,11 +1977,6 @@ msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είν�
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2030,28 +2025,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2148,97 +2121,58 @@ msgstr "προαιρετικό"
 msgid "extra"
 msgstr "επιπλέον"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Ανάγνωση Λιστών Πακέτων"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Συλλογή Παροχών Αρχείου"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Αδύνατη η εγγραφή στο %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Υποψήφιες Εκδόσεις"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2321,6 +2255,73 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Ανάγνωση Λιστών Πακέτων"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Συλλογή Παροχών Αρχείου"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Αδύνατη η εγγραφή στο %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2366,6 +2367,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2512,31 +2518,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Υποψήφιες Εκδόσεις"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Παραγωγή Εξαρτήσεων"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2548,58 +2548,6 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
 msgid "Unable to parse package file %s (2)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Αδύνατη η εύρεση του πακέτου %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Αδύνατη η εύρεση του πακέτου %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2700,6 +2648,58 @@ msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Αδύνατη η εύρεση του πακέτου %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Αδύνατη η εύρεση του πακέτου %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2864,35 +2864,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Η επιλογή %s δε βρέθηκε"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3029,6 +3000,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Ολοκληρώθηκε"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Η επιλογή %s δε βρέθηκε"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
diff --git a/po/es.po b/po/es.po
index b091b3ceb..9cf4f2e3d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2011-01-24 11:47+0100\n"
 "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -212,7 +212,7 @@ msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -596,11 +596,11 @@ msgstr "No se pudieron procesar las dependencias de construcción"
 msgid "Changelog for %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1180,252 +1180,10 @@ msgstr "Fallo la conexión"
 msgid "Internal error"
 msgstr "Error interno"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando la actualización... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Error Interno, AllUpgrade rompió cosas"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Listo"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No se puede corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s está instalado"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s va a ser instalado"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "pero no es instalable"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "pero es un paquete virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "pero no está instalado"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "pero no va a instalarse"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes se ELIMINARÁN:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes se han retenido:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Se actualizarán los siguientes paquetes:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Se cambiarán los siguientes paquetes retenidos:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
-"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizados, %lu se instalarán, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizados, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para eliminar y %lu no actualizados.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instalados del todo o eliminados.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación de expresiones regulares - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "El comando de actualización no toma argumentos"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
@@ -1698,6 +1456,235 @@ msgstr "El paquete %s no está instalado, no se eliminará\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "El paquete %s no está instalado, no se eliminará\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No se puede corregir las dependencias"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Listo"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s está instalado"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s va a ser instalado"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "pero no es instalable"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "pero es un paquete virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "pero no está instalado"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "pero no va a instalarse"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Se instalarán los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes se ELIMINARÁN:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes se han retenido:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Se actualizarán los siguientes paquetes:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Se cambiarán los siguientes paquetes retenidos:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
+"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizados, %lu se instalarán, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizados, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para eliminar y %lu no actualizados.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instalados del todo o eliminados.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación de expresiones regulares - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "El comando de actualización no toma argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1745,6 +1732,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando la actualización... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Error Interno, AllUpgrade rompió cosas"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Listo"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Obj "
@@ -1784,8 +1784,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1793,9 +1793,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2039,11 +2039,6 @@ msgstr ""
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No se pudo leer %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2093,26 +2088,6 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "La suma hash difiere para: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No se pudo encontrar el método %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El método %s no se inició correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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 pulse Intro."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2209,98 +2184,56 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "No se da soporte para el tipo de archivo de índice «%s»"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tiene una versión incompatible de sistema de versiones"
+msgid "The method driver %s could not be found."
+msgstr "No se pudo encontrar el método %s."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Al procesar las dependencias de archivos no se encontró el paquete %s %s"
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leyendo lista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recogiendo archivos que proveen"
+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 pulse Intro."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "No se puede escribir en %s"
+msgid "Index file type '%s' is not supported"
+msgstr "No se da soporte para el tipo de archivo de índice «%s»"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Error de E/S guardando caché fuente"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leyendo la información de estado"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2389,6 +2322,74 @@ msgstr ""
 "Los archivos de índice de paquetes están dañados. No existe un campo "
 "«Filename:» para el paquete %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "La caché tiene una versión incompatible de sistema de versiones"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"Al procesar las dependencias de archivos no se encontró el paquete %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Leyendo lista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Recogiendo archivos que proveen"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No se puede escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Error de E/S guardando caché fuente"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2434,6 +2435,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No se pudo leer %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2586,31 +2592,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leyendo la información de estado"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2622,68 +2622,6 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "No se pudo tratar el archivo de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "No se encontró la Distribución «%s» para «%s»"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "No se encontró la versión «%s» para «%s»"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "No se pudo encontrar la tarea «%s»"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
-"puramente virtual"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"No se puede seleccionar una versión instalada o candidata para el paquete "
-"«%s» dado que éste no tiene ninguna de éstas"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"No se puede seleccionar la última versión del paquete «%s» dado que es "
-"puramente virtual"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"No se puede seleccionar una versión candidata del paquete %s dado que no "
-"tiene candidatos"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"No se puede seleccionar una versión instalada del paquete «%s» puesto que no "
-"está instalado"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2790,6 +2728,68 @@ msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "No se encontró la Distribución «%s» para «%s»"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "No se encontró la versión «%s» para «%s»"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "No se pudo encontrar la tarea «%s»"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
+"puramente virtual"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"No se puede seleccionar una versión instalada o candidata para el paquete "
+"«%s» dado que éste no tiene ninguna de éstas"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"No se puede seleccionar la última versión del paquete «%s» dado que es "
+"puramente virtual"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"No se puede seleccionar una versión candidata del paquete %s dado que no "
+"tiene candidatos"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"No se puede seleccionar una versión instalada del paquete «%s» puesto que no "
+"está instalado"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2971,35 +2971,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "No bloqueado"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin. %liseg."
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin. %liseg."
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin. %liseg."
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%liseg."
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selección %s no encontrada"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3133,6 +3104,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Hecho"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin. %liseg."
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin. %liseg."
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin. %liseg."
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liseg."
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selección %s no encontrada"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "No puedo hacer mmap de un fichero vacío"
diff --git a/po/eu.po b/po/eu.po
index 79ab65633..4293c0121 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -527,11 +527,11 @@ msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 msgid "Changelog for %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1110,252 +1110,10 @@ msgstr "Konexioak huts egin du"
 msgid "Internal error"
 msgstr "Barne errorea"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Berriketak kalkulatzen... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Eginda"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "baina %s instalatuta dago"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "baina %s instalatzeko dago"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "baina ez da instalagarria"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "baina pakete birtuala da"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "baina ez dago instalatuta"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "baina ez da instalatuko"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " edo"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Ondorengo paketeak KENDUKO dira:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Ondorengo paketeak mantendu egin dira:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (arrazoia: %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
-"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu berrinstalatuta, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu aurreko bertsiora itzulita, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ez erabat instalatuta edo kenduta.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[B/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[b/E]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Adierazpen erregularren konpilazio errorea - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
@@ -1622,6 +1380,235 @@ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " : huts egin du."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Eginda"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "baina %s instalatuta dago"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "baina %s instalatzeko dago"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "baina ez da instalagarria"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "baina pakete birtuala da"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "baina ez dago instalatuta"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "baina ez da instalatuko"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " edo"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Ondorengo paketeak KENDUKO dira:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Ondorengo paketeak mantendu egin dira:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Ondorengo paketeak bertsio-berrituko dira:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (arrazoia: %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
+"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu berrinstalatuta, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu aurreko bertsiora itzulita, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ez erabat instalatuta edo kenduta.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[B/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[b/E]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Adierazpen erregularren konpilazio errorea - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1665,6 +1652,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Berriketak kalkulatzen... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Eginda"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atzituta "
@@ -1704,8 +1704,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1713,9 +1713,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1956,11 +1956,6 @@ msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2010,26 +2005,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
@@ -2124,93 +2099,56 @@ msgstr "aukerakoa"
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Katxearen bertsio sistema ez da bateragarria"
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Pakete Zerrenda irakurtzen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Fitxategiaren erreferentziak biltzen"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s : ezin da idatzi"
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' motako indize fitxategirik ez da onartzen"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "S/I errorea iturburu katxea gordetzean"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Egoera argibideak irakurtzen"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2293,6 +2231,69 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Katxearen bertsio sistema ez da bateragarria"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Fitxategiaren erreferentziak biltzen"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s : ezin da idatzi"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "S/I errorea iturburu katxea gordetzean"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2338,6 +2339,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2482,31 +2488,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Hautagaien bertsioak"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependentzi Sormena"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Egoera argibideak irakurtzen"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2518,58 +2518,6 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ezin izan da %s zeregina aurkitu"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Ezin izan da %s paketea aurkitu"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Ezin izan da %s paketea aurkitu"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2670,6 +2618,58 @@ msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ezin izan da %s zeregina aurkitu"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2834,35 +2834,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s hautapena ez da aurkitu"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2999,6 +2970,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Eginda"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s hautapena ez da aurkitu"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Ezin da fitxategi huts baten mmap egin"
diff --git a/po/fi.po b/po/fi.po
index 43853e5f1..c1c08186b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -523,11 +523,11 @@ msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 msgid "Changelog for %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1102,252 +1102,10 @@ msgstr "Yhteys ei toiminut"
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Käsitellään päivitystä ... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Valmis"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Korjataan riippuvuuksia..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ei onnistunut."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Riippuvuuksien korjaus ei onnistu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Päivitysjoukon minimointi ei onnistu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Valmis"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "mutta %s on asennettu"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mutta %s on merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "mutta ei ole asennuskelpoinen"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "mutta on näennäispaketti"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "mutta ei ole asennettu"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "mutta ei ole merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " tai"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Seuraavat UUDET paketit asennetaan:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Seuraavat paketit POISTETAAN:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Nämä paketit on jätetty odottamaan:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Nämä paketit päivitetään:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nämä paketit VARHENNETAAN:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Seuraavat pysytetyt paketit muutetaan:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (syynä %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu päivitetty, %lu uutta asennusta, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu uudelleen asennettua, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu varhennettua, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[K/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "K"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Käännösvirhe lausekkeessa - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Komento update ei käytä parametreja"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
@@ -1614,6 +1372,235 @@ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Korjataan riippuvuuksia..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ei onnistunut."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Riippuvuuksien korjaus ei onnistu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Päivitysjoukon minimointi ei onnistu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Valmis"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "mutta %s on asennettu"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mutta %s on merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "mutta ei ole asennuskelpoinen"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "mutta on näennäispaketti"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "mutta ei ole asennettu"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "mutta ei ole merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " tai"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Seuraavat UUDET paketit asennetaan:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Seuraavat paketit POISTETAAN:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Nämä paketit on jätetty odottamaan:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Nämä paketit päivitetään:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nämä paketit VARHENNETAAN:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Seuraavat pysytetyt paketit muutetaan:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (syynä %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu päivitetty, %lu uutta asennusta, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu uudelleen asennettua, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu varhennettua, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[K/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "K"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Käännösvirhe lausekkeessa - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Komento update ei käytä parametreja"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1657,6 +1644,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Käsitellään päivitystä ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Valmis"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Löytyi "
@@ -1696,8 +1696,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1705,9 +1705,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1949,11 +1949,6 @@ msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2004,26 +1999,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Kohteen %s tarkistussumma ei täsmää"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Menetelmän ajuria %s ei löytynyt"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2119,94 +2094,56 @@ msgstr "valinnainen"
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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ä."
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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."
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Luetaan pakettiluetteloita"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kootaan tiedostojen tarjoamistietoja"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
+msgid "Index file type '%s' is not supported"
+msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Luetaan tilatiedot"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2289,6 +2226,70 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Luetaan pakettiluetteloita"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Kootaan tiedostojen tarjoamistietoja"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2334,6 +2335,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2476,31 +2482,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Mahdolliset versiot"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Luodaan riippuvuudet"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Luetaan tilatiedot"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2512,58 +2512,6 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Tehtävää %s ei löytynyt"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Pakettia %s ei löytynyt"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Pakettia %s ei löytynyt"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2664,6 +2612,58 @@ msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Tehtävää %s ei löytynyt"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Pakettia %s ei löytynyt"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Pakettia %s ei löytynyt"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2828,35 +2828,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valintaa %s ei löydy"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2990,6 +2961,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Valmis"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valintaa %s ei löydy"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
diff --git a/po/fr.po b/po/fr.po
index 5d448334f..3e9a87190 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2013-08-17 07:57+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgid "  Version table:"
 msgstr " Table de version :"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -557,11 +557,11 @@ msgstr "Impossible d'activer les dépendances de construction"
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1174,253 +1174,10 @@ msgstr "Échec de la connexion"
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calcul de la mise à jour... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Fait"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s est installé"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais %s devra être installé"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "mais il n'est pas installable"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "mais c'est un paquet virtuel"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "mais il n'est pas installé"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "mais ne sera pas installé"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Les NOUVEAUX paquets suivants seront installés :"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Les paquets suivants seront ENLEVÉS :"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Les paquets suivants ont été conservés :"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Les paquets suivants seront mis à jour :"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Les paquets retenus suivants seront changés :"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (en raison de %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
-"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
-"que vous êtes en train de faire."
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu mis à jour, %lu nouvellement installés, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu réinstallés, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu remis à une version inférieure, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu à enlever et %lu non mis à jour.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu partiellement installés ou enlevés.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[O/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[o/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erreur de compilation de l'expression rationnelle - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La commande de mise à jour ne prend pas de paramètre"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
@@ -1704,6 +1461,236 @@ msgstr ""
 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"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " a échoué."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fait"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installé]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s est installé"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais %s devra être installé"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "mais il n'est pas installable"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "mais c'est un paquet virtuel"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "mais il n'est pas installé"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "mais ne sera pas installé"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Les NOUVEAUX paquets suivants seront installés :"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Les paquets suivants seront ENLEVÉS :"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Les paquets suivants ont été conservés :"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Les paquets suivants seront mis à jour :"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Les paquets retenus suivants seront changés :"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (en raison de %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
+"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
+"que vous êtes en train de faire."
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu mis à jour, %lu nouvellement installés, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu réinstallés, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu remis à une version inférieure, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu à enlever et %lu non mis à jour.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu partiellement installés ou enlevés.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[O/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[o/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erreur de compilation de l'expression rationnelle - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La commande de mise à jour ne prend pas de paramètre"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1753,6 +1740,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calcul de la mise à jour... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Fait"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atteint "
@@ -1792,8 +1792,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1801,9 +1801,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2045,11 +2045,6 @@ msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2100,28 +2095,6 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
 msgid "Hash mismatch for: %s"
 msgstr "Somme de contrôle de hachage incohérente pour %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "La méthode %s n'a pas démarré correctement"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
-"touche Entrée."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2217,104 +2190,58 @@ msgstr "optionnel"
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Le type de fichier d'index « %s » n'est pas accepté"
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Le cache possède un système de version incompatible"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erreur apparue lors du traitement de %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
-"fichiers"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossible de localiser la liste des paquets sources %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lecture des listes de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Assemblage des fichiers listés dans les champs Provides"
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Impossible d'écrire sur %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Envoi du scénario au solveur"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lecture des informations d'état"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Exécu tion du solveur externe"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2408,6 +2335,80 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Le cache possède un système de version incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Erreur apparue lors du traitement de %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Impossible de localiser la liste des paquets sources %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lecture des listes de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Assemblage des fichiers listés dans les champs Provides"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossible d'écrire sur %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2453,6 +2454,11 @@ 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossible de localiser %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2609,31 +2615,25 @@ msgstr ""
 "Impossible de corriger les problèmes, des paquets défectueux sont en mode "
 "« garder en l'état »."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construction de l'arbre des dépendances"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions possibles"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Envoi du scénario au solveur"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Envoi d'une requête au solveur"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lecture des informations d'état"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Échec du solveur externe sans message d'erreur adapté"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Exécu tion du solveur externe"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2645,71 +2645,6 @@ msgstr "Impossible de traiter le fichier %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossible de traiter le fichier %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "La version  « %s » de « %s » est introuvable"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "La version « %s » de « %s » n'a pu être trouvée"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossible de trouver la tâche « %s »"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
-"virtuel"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Impossible de choisir une version installée ou candidate du paquet « %s » "
-"qui n'en n'a aucune"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
-"paquet virtuel"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
-"installé"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2822,6 +2757,71 @@ msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "La version  « %s » de « %s » est introuvable"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "La version « %s » de « %s » n'a pu être trouvée"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Impossible de trouver la tâche « %s »"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+"Impossible de trouver de paquet correspondant à l'expression rationnelle "
+"« %s »"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr ""
+"Impossible de trouver de paquet correspondant à l'expression rationnelle "
+"« %s »"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
+"virtuel"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Impossible de choisir une version installée ou candidate du paquet « %s » "
+"qui n'en n'a aucune"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
+"paquet virtuel"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
+"installé"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -3001,35 +3001,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non verrouillé"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "La sélection %s n'a pu être trouvée"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3171,6 +3142,35 @@ msgstr "…"
 msgid "%c%s... %u%%"
 msgstr "%c%s… %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "La sélection %s n'a pu être trouvée"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Impossible de mapper un fichier vide en mémoire"
diff --git a/po/gl.po b/po/gl.po
index 1c5e35ecb..5bd960c32 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -539,11 +539,11 @@ msgstr "Non se puideron procesar as dependencias de construción"
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1129,252 +1129,10 @@ msgstr "Produciuse un fallo na conexión"
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando a anovación... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Feito"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fallou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pode querer executar «apt-get -f install» para corrixilos."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumpridas. Probe a empregar -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s está instalado"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais vaise instalar %s"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "mais non é instalábel"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "mais é un paquete virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "mais non está instalado"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "mais non se vai a instalar"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Vanse RETIRAR os paquetes seguintes:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Consérvanse os seguintes paquetes:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Vanse anovar os paquetes seguintes:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Vanse REVERTER os seguintes paquetes :"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Vanse modificar os paquetes retidos seguintes:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por mor de %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
-"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu anovados, %lu instalados, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non instalados ou retirados de todo.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Produciuse un erro na compilación da expresión regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "A orde «update» non toma argumentos"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1646,6 +1404,235 @@ msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corrixindo as dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fallou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Non foi posíbel corrixir as dependencias."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pode querer executar «apt-get -f install» para corrixilos."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumpridas. Probe a empregar -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s está instalado"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais vaise instalar %s"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "mais non é instalábel"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "mais é un paquete virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "mais non está instalado"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "mais non se vai a instalar"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Vanse RETIRAR os paquetes seguintes:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Consérvanse os seguintes paquetes:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Vanse anovar os paquetes seguintes:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Vanse REVERTER os seguintes paquetes :"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Vanse modificar os paquetes retidos seguintes:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por mor de %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
+"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu anovados, %lu instalados, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non instalados ou retirados de todo.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Produciuse un erro na compilación da expresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "A orde «update» non toma argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1694,6 +1681,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando a anovación... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Feito"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Teño "
@@ -1733,8 +1733,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1742,9 +1742,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Non é posíbel ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1984,11 +1984,6 @@ msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Non é posíbel analizar %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2039,26 +2034,6 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Valor de hash non coincidente para: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Non foi posíbel atopar o controlador de métodos %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2155,96 +2130,56 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "O tipo de ficheiros de índices «%s» non está admitido"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "A caché ten un sistema de versionado incompatíbel"
+msgid "The method driver %s could not be found."
+msgstr "Non foi posíbel atopar o controlador de métodos %s."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vaites!, superou o número de versións que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
-"ficheiros"
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lendo as listas de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recollendo as provisións de ficheiros"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Non é posíbel escribir en %s"
+msgid "Index file type '%s' is not supported"
+msgstr "O tipo de ficheiros de índices «%s» non está admitido"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versións candidatas"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeración de dependencias"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo a información do estado"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2333,6 +2268,72 @@ msgstr ""
 "Os ficheiros de índices de paquetes están danados. Non hai un campo "
 "Filename: para o paquete %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "A caché ten un sistema de versionado incompatíbel"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Produciuse un erro ao procesar %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaites!, superou o número de versións que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
+"ficheiros"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lendo as listas de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Recollendo as provisións de ficheiros"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Non é posíbel escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2378,6 +2379,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Non é posíbel analizar %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2528,31 +2534,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo a árbore de dependencias"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versións candidatas"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lendo a información do estado"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2564,68 +2564,6 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Non se atopou a publicación «%s» de «%s»"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Non se atopou a versión «%s» de «%s»"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Non foi posíbel atopar a tarefa «%s»"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
-"puramente virtual"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
-"«%s» xa que non ten ningunha delas"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
-"puramente virtual"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
-"candidata"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
-"instalado"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2730,6 +2668,68 @@ msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Non se atopou a publicación «%s» de «%s»"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Non se atopou a versión «%s» de «%s»"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Non foi posíbel atopar a tarefa «%s»"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
+"puramente virtual"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
+"«%s» xa que non ten ningunha delas"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
+"puramente virtual"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
+"candidata"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
+"instalado"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2912,35 +2912,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non está bloqueado"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Non se atopou a selección %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3077,6 +3048,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Feito"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Non se atopou a selección %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro"
diff --git a/po/hu.po b/po/hu.po
index b5ce3f95f..9823108af 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt trunk\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-25 17:09+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -538,11 +538,11 @@ msgstr "Nem sikerült az építési függőségeket feldolgozni"
 msgid "Changelog for %s (%s)"
 msgstr "Változási napló ehhez: %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1144,252 +1144,10 @@ msgstr "Sikertelen kapcsolódás"
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Frissítés kiszámítása... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Belső hiba, az AllUpgrade megsértett valamit"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Kész"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Függőségek javítása..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " sikertelen."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nem lehet javítani a függőségeket"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Kész"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "de %s van telepítve"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "de csak %s telepíthető"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "de az nem telepíthető"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "de az egy virtuális csomag"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "de az nincs telepítve"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "de az nincs telepítésre megjelölve"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " vagy"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Az alábbi csomagok vissza lesznek tartva:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Az alábbi csomagok frissítve lesznek:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Az alábbi visszafogott csomagokat cserélem:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s miatt) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
-"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu frissített, %lu újonnan telepített, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu újratelepítendő, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu visszafejlesztendő, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[I/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[i/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex fordítási hiba - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Az update parancsnak nincsenek argumentumai"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
@@ -1654,6 +1412,235 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Függőségek javítása..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " sikertelen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nem lehet javítani a függőségeket"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Kész"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "de %s van telepítve"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "de csak %s telepíthető"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "de az nem telepíthető"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "de az egy virtuális csomag"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "de az nincs telepítve"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "de az nincs telepítésre megjelölve"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " vagy"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Az alábbi csomagok vissza lesznek tartva:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Az alábbi csomagok frissítve lesznek:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Az alábbi visszafogott csomagokat cserélem:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s miatt) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
+"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu frissített, %lu újonnan telepített, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu újratelepítendő, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu visszafejlesztendő, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu eltávolítandó és %lu nem frissített.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[I/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[i/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex fordítási hiba - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Az update parancsnak nincsenek argumentumai"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1701,6 +1688,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Frissítés kiszámítása... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Belső hiba, az AllUpgrade megsértett valamit"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Kész"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Találat "
@@ -1740,8 +1740,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1749,9 +1749,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1990,11 +1990,6 @@ msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s nem érhető el."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2043,28 +2038,6 @@ msgstr "%s hitelesítési rekordja nem található"
 msgid "Hash mismatch for: %s"
 msgstr "%s ellenőrzőösszege nem megfelelő"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "A(z) %s metódusvezérlő nem található."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "A(z) %s metódus nem indult el megfelelően"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
-"Entert."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2160,96 +2133,58 @@ msgstr "opcionális"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "A(z) „%s” indexfájltípus nem támogatott"
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Az APT által kezelhető csomagnevek száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Az APT által kezelhető csomagverziók száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Az APT által kezelhető csomagleírások száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Az APT által kezelhető függőségek száma túllépve."
+msgid "Method %s did not start correctly"
+msgstr "A(z) %s metódus nem indult el megfelelően"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
-"közben"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Csomaglisták olvasása"
-
-# FIXME
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "„Biztosítja” kapcsolatok összegyűjtése"
+"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
+"Entert."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nem lehet írni ebbe: %s"
+msgid "Index file type '%s' is not supported"
+msgstr "A(z) „%s” indexfájltípus nem támogatott"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO hiba a forrás-gyorsítótár mentésekor"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Függőségi fa építése"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "A helyzet elküldése a solvernek"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Lehetséges verziók"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Függőséggenerálás"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Állapotinformációk olvasása"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2337,6 +2272,72 @@ msgid ""
 msgstr ""
 "A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Az APT által kezelhető csomagnevek száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Az APT által kezelhető csomagverziók száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Az APT által kezelhető csomagleírások száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Az APT által kezelhető függőségek száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
+"közben"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Csomaglisták olvasása"
+
+# FIXME
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "„Biztosítja” kapcsolatok összegyűjtése"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nem lehet írni ebbe: %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO hiba a forrás-gyorsítótár mentésekor"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2381,6 +2382,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s nem érhető el."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2530,31 +2536,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Függőségi fa építése"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "A helyzet elküldése a solvernek"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Állapotinformációk olvasása"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2566,63 +2566,6 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "„%s” kiadás nem található ehhez: „%s”"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "„%s” verzió nem található ehhez: „%s”"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "„%s” feladat nem található"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
-"mert egyikkel sem rendelkezik"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"„%s” csomag telepített verziója nem választható ki, mert nincs telepítve"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2733,6 +2676,63 @@ msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "„%s” kiadás nem található ehhez: „%s”"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "„%s” verzió nem található ehhez: „%s”"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "„%s” feladat nem található"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
+"mert egyikkel sem rendelkezik"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"„%s” csomag telepített verziója nem választható ki, mert nincs telepítve"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2911,35 +2911,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nincs zárolva"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lin %lió %lip %limp"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lió %lip %limp"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%lip %limp"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%limp"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s kiválasztás nem található"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3078,6 +3049,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Kész"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lin %lió %lip %limp"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lió %lip %limp"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%lip %limp"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%limp"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s kiválasztás nem található"
+
 # FIXME
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
diff --git a/po/it.po b/po/it.po
index a476d3c6c..d1eebbf79 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabella versione:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -547,11 +547,11 @@ msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 msgid "Changelog for %s (%s)"
 msgstr "Changelog per %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1189,249 +1189,10 @@ msgstr "Connessione non riuscita"
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calcolo dell'aggiornamento... "
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Errore interno, Upgrade ha rovinato qualche cosa"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Eseguito"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr "Ordinamento"
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr "Elencazione"
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
-msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " non riuscita."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fatto"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dipendenze non trovate. Riprovare usando -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "sconosciuto"
-
-#: apt-private/private-output.cc:233
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[installato, aggiornabile a: %s]"
-
-#: apt-private/private-output.cc:237
-msgid "[installed,local]"
-msgstr "[installato, locale]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr "[installato, auto-rimovibile]"
-
-#: apt-private/private-output.cc:242
-msgid "[installed,automatic]"
-msgstr "[installato, automatico]"
-
-#: apt-private/private-output.cc:244
-msgid "[installed]"
-msgstr "[installato]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aggiornabile da: %s]"
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr "[configurazione residua]"
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ma la versione %s è installata"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ma la versione %s sta per essere installata"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ma non è installabile"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ma è un pacchetto virtuale"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ma non è installato"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ma non sta per essere installato"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " oppure"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "I seguenti pacchetti NUOVI saranno installati:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "I seguenti pacchetti saranno RIMOSSI:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "I seguenti pacchetti saranno aggiornati:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "I seguenti pacchetti saranno RETROCESSI:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (a causa di %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
-"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
-"si sta facendo."
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aggiornati, %lu installati, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstallati, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu retrocessi, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non completamente installati o rimossi.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Errore di compilazione dell'espressione regolare - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Il comando update non accetta argomenti"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo"
-msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "non un vero pacchetto (virtuale)"
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1710,6 +1471,233 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr "Elencazione"
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
+msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " non riuscita."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fatto"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dipendenze non trovate. Riprovare usando -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: apt-private/private-output.cc:233
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[installato, aggiornabile a: %s]"
+
+#: apt-private/private-output.cc:237
+msgid "[installed,local]"
+msgstr "[installato, locale]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr "[installato, auto-rimovibile]"
+
+#: apt-private/private-output.cc:242
+msgid "[installed,automatic]"
+msgstr "[installato, automatico]"
+
+#: apt-private/private-output.cc:244
+msgid "[installed]"
+msgstr "[installato]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aggiornabile da: %s]"
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr "[configurazione residua]"
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ma la versione %s è installata"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ma la versione %s sta per essere installata"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ma non è installabile"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ma è un pacchetto virtuale"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ma non è installato"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ma non sta per essere installato"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " oppure"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "I seguenti pacchetti saranno RIMOSSI:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "I seguenti pacchetti saranno aggiornati:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "I seguenti pacchetti bloccati saranno cambiati:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (a causa di %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
+"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
+"si sta facendo."
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aggiornati, %lu installati, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstallati, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu retrocessi, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu da rimuovere e %lu non aggiornati.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non completamente installati o rimossi.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Errore di compilazione dell'espressione regolare - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Il comando update non accetta argomenti"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo"
+msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "non un vero pacchetto (virtuale)"
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1758,6 +1746,18 @@ msgstr ""
 msgid "Full Text Search"
 msgstr "Ricerca sul testo"
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calcolo dell'aggiornamento... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Errore interno, Upgrade ha rovinato qualche cosa"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Eseguito"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Trovato "
@@ -1798,8 +1798,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1807,9 +1807,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2054,11 +2054,6 @@ msgstr "Checksum di tar non riuscito, archivio danneggiato"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossibile eseguire stat su %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2108,26 +2103,6 @@ msgstr "Impossibile trovare il record di autenticazione per %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash non corrispondente per %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Impossibile trovare un driver per il metodo %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Il pacchetto %s è installato?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non si è avviato correttamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2224,98 +2199,56 @@ msgstr "opzionale"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
+msgid "The method driver %s could not be found."
+msgstr "Impossibile trovare un driver per il metodo %s."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Il pacchetto %s è installato?"
 
-# (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lettura elenco dei pacchetti"
-
-# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Il file fornisce"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Impossibile scrivere in %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Errore di I/O nel salvare la cache sorgente"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Invia lo scenario al solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versioni candidate"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lettura informazioni sullo stato"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2406,6 +2339,74 @@ msgstr ""
 "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
 "per il pacchetto %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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."
+
+# (ndt) il primo è il nome del pacchetto, il secondo la versione
+#: apt-pkg/pkgcachegen.cc:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lettura elenco dei pacchetti"
+
+# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Il file fornisce"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossibile scrivere in %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Errore di I/O nel salvare la cache sorgente"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2452,6 +2453,11 @@ 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossibile eseguire stat su %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2607,31 +2613,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versioni candidate"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Invia lo scenario al solver"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lettura informazioni sullo stato"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Esecuzione solver esterno"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2643,70 +2643,6 @@ 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)"
 
-# (ndt) dovrebbe essere inteso il file Release
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release \"%s\" per \"%s\" non trovato."
-
-# (ndt) dovrebbe essere inteso il Version
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version \"%s\" per \"%s\" non trovato"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossibile trovare il task \"%s\""
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-
-#: apt-pkg/cacheset.cc:615
-#, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\""
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Impossibile selezionare la versione installata o la candidata dal pacchetto "
-"\"%s\" poiché non sono presenti"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
-"è virtuale"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
-"alcun candidato"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
-"installato"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2818,6 +2754,70 @@ msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 "Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
 
+# (ndt) dovrebbe essere inteso il file Release
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release \"%s\" per \"%s\" non trovato."
+
+# (ndt) dovrebbe essere inteso il Version
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version \"%s\" per \"%s\" non trovato"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Impossibile trovare il task \"%s\""
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
+
+#: apt-pkg/cacheset.cc:615
+#, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\""
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Impossibile selezionare la versione installata o la candidata dal pacchetto "
+"\"%s\" poiché non sono presenti"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
+"è virtuale"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
+"alcun candidato"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
+"installato"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -3000,35 +3000,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloccato"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, 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:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selezione %s non trovata"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3168,6 +3139,35 @@ msgstr "..."
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selezione %s non trovata"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Impossibile eseguire mmap su un file vuoto"
diff --git a/po/ja.po b/po/ja.po
index f3b1866d2..718f42757 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.16.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-03-21 19:53+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -542,11 +542,11 @@ msgstr "ビルド依存関係の処理に失敗しました"
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) の変更履歴"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1178,249 +1178,10 @@ msgstr "接続失敗"
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "アップグレードパッケージを検出しています ... "
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部エラー、アップグレードで何か壊れました"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "完了"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr "ソート中"
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr "一覧表示"
-
-#: apt-private/private-list.cc:164
-#, fuzzy, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "依存関係を解決しています ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失敗しました。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "依存関係を訂正できません"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "アップグレードセットを最小化できません"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完了"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "未解決の依存関係があります。-f オプションを試してください。"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "不明"
-
-#: apt-private/private-output.cc:233
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[インストール済み、%s にアップグレード可]"
-
-#: apt-private/private-output.cc:237
-msgid "[installed,local]"
-msgstr "[インストール済み、ローカル]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr "[インストール済み、自動削除可]"
-
-#: apt-private/private-output.cc:242
-msgid "[installed,automatic]"
-msgstr "[インストール済み、自動]"
-
-#: apt-private/private-output.cc:244
-msgid "[installed]"
-msgstr "[インストール済み]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[%s からアップグレード可]"
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr "[設定未完了]"
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "以下のパッケージには満たせない依存関係があります:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "しかし、%s はインストールされています"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "しかし、%s はインストールされようとしています"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "しかし、インストールすることができません"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "しかし、これは仮想パッケージです"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "しかし、インストールされていません"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "しかし、インストールされようとしていません"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " または"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "以下のパッケージが新たにインストールされます:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "以下のパッケージは「削除」されます:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "以下のパッケージは保留されます:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "以下のパッケージはアップグレードされます:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "以下のパッケージは「ダウングレード」されます:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "以下の変更禁止パッケージは変更されます:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s のため) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"警告: 以下の不可欠パッケージが削除されます。\n"
-"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "再インストール: %lu 個、"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ダウングレード: %lu 個、"
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "削除: %lu 個、保留: %lu 個。\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "正規表現の展開エラー - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update コマンドは引数をとりません"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "実際のパッケージではありません (仮想)"
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
@@ -1680,6 +1441,233 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr "一覧表示"
+
+#: apt-private/private-list.cc:164
+#, fuzzy, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "依存関係を解決しています ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗しました。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "依存関係を訂正できません"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "アップグレードセットを最小化できません"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完了"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "未解決の依存関係があります。-f オプションを試してください。"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "不明"
+
+#: apt-private/private-output.cc:233
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[インストール済み、%s にアップグレード可]"
+
+#: apt-private/private-output.cc:237
+msgid "[installed,local]"
+msgstr "[インストール済み、ローカル]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr "[インストール済み、自動削除可]"
+
+#: apt-private/private-output.cc:242
+msgid "[installed,automatic]"
+msgstr "[インストール済み、自動]"
+
+#: apt-private/private-output.cc:244
+msgid "[installed]"
+msgstr "[インストール済み]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[%s からアップグレード可]"
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr "[設定未完了]"
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "しかし、%s はインストールされています"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "しかし、%s はインストールされようとしています"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "しかし、インストールすることができません"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "しかし、これは仮想パッケージです"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "しかし、インストールされていません"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "しかし、インストールされようとしていません"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " または"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "以下のパッケージが新たにインストールされます:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "以下のパッケージは「削除」されます:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "以下のパッケージは保留されます:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "以下のパッケージはアップグレードされます:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "以下のパッケージは「ダウングレード」されます:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "以下の変更禁止パッケージは変更されます:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s のため) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"警告: 以下の不可欠パッケージが削除されます。\n"
+"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "再インストール: %lu 個、"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ダウングレード: %lu 個、"
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "削除: %lu 個、保留: %lu 個。\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "正規表現の展開エラー - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update コマンドは引数をとりません"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "実際のパッケージではありません (仮想)"
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1728,6 +1716,18 @@ msgstr ""
 msgid "Full Text Search"
 msgstr "全文検索"
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "アップグレードパッケージを検出しています ... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "内部エラー、アップグレードで何か壊れました"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "完了"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "ヒット "
@@ -1767,8 +1767,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1776,9 +1776,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s を読み込むことができません"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2016,11 +2016,6 @@ msgstr "tar チェックサム検証が失敗しました。アーカイブが�
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s の状態を取得できません。"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2071,28 +2066,6 @@ msgstr "認証レコードが見つかりません: %s"
 msgid "Hash mismatch for: %s"
 msgstr "ハッシュサムが適合しません: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "メソッドドライバ %s が見つかりません。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "パッケージ %s はインストールされていますか?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "メソッド %s が正常に開始しませんでした"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
-"さい。"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2190,93 +2163,58 @@ msgstr "任意"
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "キャッシュに非互換なバージョニングシステムがあります"
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライバ %s が見つかりません。"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処理中にエラーが発生しました (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "この APT が対応している以上の数のパッケージが指定されました。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "この APT が対応している以上の数のバージョンが要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "この APT が対応している以上の数の説明が要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s はインストールされていますか?"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s が正常に開始しませんでした"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ソースパッケージリスト %s の状態を取得できません"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "パッケージリストを読み込んでいます"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ファイル提供情報を収集しています"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
+"さい。"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s に書き込めません"
+msgid "Index file type '%s' is not supported"
+msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "依存関係ツリーを作成しています"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "ソルバにシナリオを送信"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候補バージョン"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "依存関係の生成"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "状態情報を読み取っています"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s のオープンに失敗しました"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s の書き込みに失敗しました"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2366,6 +2304,69 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "キャッシュに非互換なバージョニングシステムがあります"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s を処理中にエラーが発生しました (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "この APT が対応している以上の数の説明が要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "パッケージリストを読み込んでいます"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ファイル提供情報を収集しています"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s に書き込めません"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2410,6 +2411,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s の状態を取得できません。"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2562,31 +2568,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "依存関係ツリーを作成しています"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候補バージョン"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "ソルバにシナリオを送信"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "依存関係の生成"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "状態情報を読み取っています"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "解決を受け取る準備"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s のオープンに失敗しました"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s の書き込みに失敗しました"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "外部ソルバを実行"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2598,63 +2598,6 @@ msgstr "パッケージファイル %s を解釈することができません (
 msgid "Unable to parse package file %s (2)"
 msgstr "パッケージファイル %s を解釈することができません (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "タスク '%s' が見つかりません"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
-
-#: apt-pkg/cacheset.cc:615
-#, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "'%s' に一致するパッケージは見つかりませんでした"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
-"ので選べません"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"インストールされていないので、パッケージ %s のインストール済みバージョンを選"
-"べません。"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2759,6 +2702,63 @@ msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "タスク '%s' が見つかりません"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
+
+#: apt-pkg/cacheset.cc:615
+#, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "'%s' に一致するパッケージは見つかりませんでした"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
+"ので選べません"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"インストールされていないので、パッケージ %s のインストール済みバージョンを選"
+"べません。"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2938,35 +2938,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "ロックされていません"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li日 %li時間 %li分 %li秒"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li時間 %li分 %li秒"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "選択された %s が見つかりません"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3103,6 +3074,35 @@ msgstr "..."
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li日 %li時間 %li分 %li秒"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li時間 %li分 %li秒"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "選択された %s が見つかりません"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "空のファイルを mmap できません"
diff --git a/po/km.po b/po/km.po
index 90a4b0740..037fc90cd 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -522,11 +522,11 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណ
 msgid "Changelog for %s (%s)"
 msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1095,252 +1095,10 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "ធ្វើរួច​"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " បាន​បរាជ័យ ។"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " ធ្វើ​រួច"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ឬ"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (ដោយ​សារតែ​ %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
-"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex កំហុស​ការចងក្រង​ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
@@ -1595,6 +1353,235 @@ msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " បាន​បរាជ័យ ។"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ឬ"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (ដោយ​សារតែ​ %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
+"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu ​ត្រូវបានបន្ទាប់ "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex កំហុស​ការចងក្រង​ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1639,6 +1626,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "ធ្វើរួច​"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "វាយ​"
@@ -1678,8 +1678,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1687,9 +1687,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1928,11 +1928,6 @@ msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណ�
 msgid "Unknown TAR header type %u, member %s"
 msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR  %u ដែលជា​សមាជិក​ %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1981,26 +1976,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
@@ -2095,94 +2070,57 @@ msgstr "ស្រេចចិត្ត"
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+msgid "Is the package %s installed?"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "មិន​អាច​សរសេរ​ទៅ %s"
+msgid "Index file type '%s' is not supported"
+msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2264,6 +2202,70 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "មិន​អាច​សរសេរ​ទៅ %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2308,6 +2310,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2449,32 +2456,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង​"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2486,58 +2486,6 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
 msgid "Unable to parse package file %s (2)"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2638,6 +2586,58 @@ msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើប
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2802,35 +2802,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2964,6 +2935,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... ធ្វើរួច​"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
diff --git a/po/ko.po b/po/ko.po
index 5b6ee0c84..ec4f5f302 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -153,7 +153,7 @@ msgid "  Version table:"
 msgstr "  버전 테이블:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -526,11 +526,11 @@ msgstr "빌드 의존성을 처리하는데 실패했습니다"
 msgid "Changelog for %s (%s)"
 msgstr "%s(%s)에 연결하는 중입니다"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1103,250 +1103,10 @@ msgstr "연결이 실패했습니다"
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "업그레이드를 계산하는 중입니다... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "완료"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "의존성을 바로잡는 중입니다..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 실패."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "의존성을 바로잡을 수 없습니다"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "업그레이드 집합을 최소화할 수 없습니다"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 완료"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "하지만 %s 패키지를 설치했습니다"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "하지만 %s 패키지를 설치할 것입니다"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "하지만 설치할 수 없습니다"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "하지만 가상 패키지입니다"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "하지만 설치하지 않았습니다"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " 혹은"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "다음 새 패키지를 설치할 것입니다:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "다음 패키지를 지울 것입니다:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "다음 패키지를 업그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "다음 패키지를 다운그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s때문에) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
-"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu개 다시 설치, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu개 업그레이드, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "정규식 컴파일 오류 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 명령은 인수를 받지 않습니다"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
@@ -1606,6 +1366,233 @@ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "의존성을 바로잡는 중입니다..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 실패."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "의존성을 바로잡을 수 없습니다"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "업그레이드 집합을 최소화할 수 없습니다"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 완료"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "다음 패키지의 의존성이 맞지 않습니다:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "하지만 %s 패키지를 설치했습니다"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "하지만 %s 패키지를 설치할 것입니다"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "하지만 설치할 수 없습니다"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "하지만 가상 패키지입니다"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "하지만 설치하지 않았습니다"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " 혹은"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "다음 새 패키지를 설치할 것입니다:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "다음 패키지를 지울 것입니다:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "다음 패키지를 과거 버전으로 유지합니다:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "다음 패키지를 업그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "다음 패키지를 다운그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s때문에) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
+"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu개 업그레이드, %lu개 새로 설치, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu개 다시 설치, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu개 업그레이드, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "정규식 컴파일 오류 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 명령은 인수를 받지 않습니다"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1653,6 +1640,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "업그레이드를 계산하는 중입니다... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "완료"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "기존 "
@@ -1692,8 +1692,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1701,9 +1701,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s을(를) 읽을 수 없습니다"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1941,11 +1941,6 @@ msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s의 정보를 읽을 수 없습니다."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1994,27 +1989,6 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
 msgid "Hash mismatch for: %s"
 msgstr "다음의 해시가 다릅니다: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
@@ -2109,93 +2083,57 @@ msgstr "옵션"
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "캐시의 버전 시스템이 호환되지 않습니다"
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "패키지 목록을 읽는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "파일에서 제공하는 것을 모으는 중입니다"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s에 쓸 수 없습니다"
+msgid "Index file type '%s' is not supported"
+msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "의존성 트리를 만드는 중입니다"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "후보 버전"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "의존성 만들기"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "상태 정보를 읽는 중입니다"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "상태파일 %s 여는데 실패했습니다"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2279,6 +2217,69 @@ msgid ""
 msgstr ""
 "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "캐시의 버전 시스템이 호환되지 않습니다"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "패키지 목록을 읽는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "파일에서 제공하는 것을 모으는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s에 쓸 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2324,6 +2325,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s의 정보를 읽을 수 없습니다."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2469,31 +2475,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "의존성 트리를 만드는 중입니다"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "후보 버전"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "의존성 만들기"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "상태 정보를 읽는 중입니다"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는데 실패했습니다"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2505,60 +2505,6 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "'%s' 작업을 찾을 수 없습니다"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
-"다."
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2660,6 +2606,60 @@ msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "'%s' 작업을 찾을 수 없습니다"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
+"다."
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2833,35 +2833,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "잠기지 않음"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li일 %li시간 %li분 %li초"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li시간 %li분 %li초"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li분 %li초"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li초"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "선택한 %s이(가) 없습니다"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2995,6 +2966,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... 완료"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li일 %li시간 %li분 %li초"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li시간 %li분 %li초"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li분 %li초"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li초"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "선택한 %s이(가) 없습니다"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "빈 파일에 메모리 매핑할 수 없습니다"
diff --git a/po/ku.po b/po/ku.po
index 66665ad04..a5fbbbd89 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -483,11 +483,11 @@ msgstr ""
 msgid "Changelog for %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1016,250 +1016,10 @@ msgstr "Girêdan pêk nehatiye"
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Bilindkirin tê hesibandin..."
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Temam"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " neserketî."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Temam"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "lê %s sazkirî ye"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "lê %s dê were sazkirin"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "lê sazkirina wê ne gengaz e"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "lê paketeke farazî ye"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "lê ne sazkirî ye"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "lê dê neyê sazkirin"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " û"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Ev pakêt dê werine RAKIRIN:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Ev paket dê werine bilindkirin:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (ji ber %s)"
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ji nû ve sazkirî,"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu hatine nizmkirin."
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-#, fuzzy
-msgid "[Y/n]"
-msgstr "[E/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1502,6 +1262,234 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " neserketî."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Temam"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "lê %s sazkirî ye"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "lê %s dê were sazkirin"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "lê sazkirina wê ne gengaz e"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "lê paketeke farazî ye"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "lê ne sazkirî ye"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "lê dê neyê sazkirin"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " û"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Ev pakêt dê werine RAKIRIN:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Ev paket dê werine bilindkirin:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (ji ber %s)"
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ji nû ve sazkirî,"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu hatine nizmkirin."
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+#, fuzzy
+msgid "[Y/n]"
+msgstr "[E/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1545,6 +1533,18 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Bilindkirin tê hesibandin..."
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr ""
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Temam"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
@@ -1581,8 +1581,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1590,9 +1590,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1832,11 +1832,6 @@ msgstr ""
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
-#, fuzzy, c-format
-msgid "Unable to stat %s."
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1885,26 +1880,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, fuzzy, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -1998,93 +1973,56 @@ msgstr "opsiyonel"
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lîsteya pakêtan tê xwendin"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr ""
+#: apt-pkg/acquire-worker.cc:455
+#, fuzzy, c-format
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2162,6 +2100,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lîsteya pakêtan tê xwendin"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2204,6 +2205,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
+#: apt-pkg/clean.cc:61
+#, fuzzy, c-format
+msgid "Unable to stat %s."
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2339,31 +2345,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, fuzzy, c-format
@@ -2375,58 +2375,6 @@ msgstr "Pakêt nehate dîtin %s"
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Peywira %s nehate dîtin"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nikarî pakêta %s bibîne"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nikarî pakêta %s bibîne"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2527,6 +2475,58 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Peywira %s nehate dîtin"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2691,35 +2691,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Hilbijartina %s nehatiye dîtin"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2853,6 +2824,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Çêbû"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Hilbijartina %s nehatiye dîtin"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 75f67ece4..75ad93793 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -487,11 +487,11 @@ msgstr ""
 msgid "Changelog for %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1017,253 +1017,10 @@ msgstr "Prisijungti nepavyko"
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Skaičiuojami atnaujinimai... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Įvykdyta"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Taisomos priklausomybės..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nepavyko."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nepavyko patenkinti priklausomybių"
-
-#: apt-private/private-cachefile.cc:102
-#, fuzzy
-msgid "Unable to minimize the upgrade set"
-msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Įvykdyta"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "bet %s yra įdiegtas"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "bet %s bus įdiegtas"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "tačiau jis negali būti įdiegtas"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "bet tai yra virtualus paketas"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "bet jis nėra įdiegtas"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "bet jis nebus įdiegtas"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " arba"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Bus įdiegti šie NAUJI paketai:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Bus PAŠALINTI šie paketai:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Šių paketų atnaujinimas sulaikomas:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Bus atnaujinti šie paketai:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Bus pakeisti šie sulaikyti paketai:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (dėl %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
-"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu įdiegti iš naujo, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu pasendinti, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[t/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Atnaujinimo komandai argumentų nereikia"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1520,6 +1277,236 @@ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Taisomos priklausomybės..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nepavyko."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nepavyko patenkinti priklausomybių"
+
+#: apt-private/private-cachefile.cc:102
+#, fuzzy
+msgid "Unable to minimize the upgrade set"
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Įvykdyta"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Šie paketai turi neįdiegtų priklausomybių:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "bet %s yra įdiegtas"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "bet %s bus įdiegtas"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "tačiau jis negali būti įdiegtas"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "bet tai yra virtualus paketas"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "bet jis nėra įdiegtas"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "bet jis nebus įdiegtas"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " arba"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Bus įdiegti šie NAUJI paketai:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Bus PAŠALINTI šie paketai:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Šių paketų atnaujinimas sulaikomas:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Bus atnaujinti šie paketai:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Bus pakeisti šie sulaikyti paketai:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (dėl %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
+"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu atnaujinti, %lu naujai įdiegti, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu įdiegti iš naujo, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu pasendinti, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[t/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Atnaujinimo komandai argumentų nereikia"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1563,6 +1550,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Skaičiuojami atnaujinimai... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Įvykdyta"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Imamas "
@@ -1602,8 +1602,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1611,9 +1611,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1856,11 +1856,6 @@ msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1909,26 +1904,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 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."
@@ -2024,92 +1999,55 @@ msgstr "nebūtinas"
 msgid "extra"
 msgstr "papildomas"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nepavyko įrašyti į %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Galimos versijos"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Skaitoma būsenos informacija"
+
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
@@ -2189,6 +2127,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nepavyko įrašyti į %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2234,6 +2235,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2369,30 +2375,24 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Konstruojamas priklausomybių medis"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Galimos versijos"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Priklausomybių generavimas"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Skaitoma būsenos informacija"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/tagfile.cc:140
@@ -2405,58 +2405,6 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nepavyko rasti užduoties %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nepavyko rasti paketo %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nepavyko rasti paketo %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2557,6 +2505,58 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nepavyko rasti užduoties %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2721,35 +2721,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2883,6 +2854,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Baigta"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr ""
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 82b3dd825..e646856f6 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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 "
@@ -156,7 +156,7 @@ msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -516,11 +516,11 @@ msgstr "बांधणी-डिपेंडन्सीज क्रिया
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1093,252 +1093,10 @@ msgstr "जोडणी अयशस्वी"
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "झाले"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "अयशस्वी/चूकीचे झाले."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "झाले"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "पण %s संस्थापित झाले"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "पण %s संस्थापित करायचे आहे"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "पण ते संस्थापित करण्याजोगे नाही"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "पण ते आभासी पॅकेज आहे"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "पण ते संस्थापित केले नाही"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "पण ते संस्थापित होणार नाही"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr "किंवा"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (च्या मुळे %s)"
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
-"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुनर्संस्थापित केले,"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu मागील आवृत्तीकृत केले,"
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "होय"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
@@ -1599,6 +1357,235 @@ msgstr "%s पॅकेज संस्थापित केलेले ना
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "अयशस्वी/चूकीचे झाले."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "झाले"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "पण %s संस्थापित झाले"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "पण %s संस्थापित करायचे आहे"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "पण ते संस्थापित करण्याजोगे नाही"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "पण ते आभासी पॅकेज आहे"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "पण ते संस्थापित केले नाही"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "पण ते संस्थापित होणार नाही"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr "किंवा"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "खालील पॅकेजेस परत ठेवली गेली:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (च्या मुळे %s)"
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
+"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुनर्संस्थापित केले,"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu मागील आवृत्तीकृत केले,"
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "होय"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1643,6 +1630,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "झाले"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "दाबा"
@@ -1682,8 +1682,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1691,9 +1691,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s वाचण्यास असमर्थ"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1933,11 +1933,6 @@ msgstr "टार(टेपअर्काईव्ह) चेकसम चु�
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्टॅट करण्यात असमर्थ. "
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1986,26 +1981,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
@@ -2100,98 +2075,56 @@ msgstr "एच्छिक"
 msgid "extra"
 msgstr "अधिक"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
+msgid "The method driver %s could not be found."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
-"आहे."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
-"ओलांडली आहे."
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
+msgid "Method %s did not start correctly"
+msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "पॅकेज याद्या वाचत आहोत"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s मध्ये लिहिण्यास असमर्थ "
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "कंॅडिडेट आवृत्त्या"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "स्थिती माहिती वाचत आहे"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2274,6 +2207,74 @@ msgstr ""
 "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
 "ठिकाण %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
+"आहे."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
+"ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "पॅकेज याद्या वाचत आहोत"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s मध्ये लिहिण्यास असमर्थ "
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2319,6 +2320,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्टॅट करण्यात असमर्थ. "
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2462,31 +2468,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "स्थिती माहिती वाचत आहे"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2498,58 +2498,6 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या�
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s कार्य सापडू शकले नाही"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2650,6 +2598,58 @@ msgstr "%s स्त्रोत सुचीमध्ये %u रेषेव�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "%s कार्य सापडू शकले नाही"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2814,35 +2814,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s निवडक भाग सापडत नाही"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2976,6 +2947,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... झाले"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s निवडक भाग सापडत नाही"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "रिकामी फाईल mmap करता येणार नाही"
diff --git a/po/nb.po b/po/nb.po
index d24372a14..b7674c187 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -529,11 +529,11 @@ msgstr "Klarte ikke å behandle forutsetningene for bygging"
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1111,252 +1111,10 @@ msgstr "Forbindelsen mislykkes"
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Beregner oppgradering... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil - «AllUpgrade» ødela noe"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Utført"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislyktes."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Utført"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installeres"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "men lar seg ikke installere"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "men er en virtuell pakke"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "men er ikke installert"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "men skal ikke installeres"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil bli installert:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil bli FJERNET:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er holdt tilbake:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil bli oppgradert:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil bli NEDGRADERT:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Følgende pakker vil bli endret:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (pga. %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nylig installerte, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installert på nytt, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Kompileringsfeil i regulært uttrykk - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
@@ -1624,6 +1382,235 @@ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installeres"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "men lar seg ikke installere"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "men er en virtuell pakke"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "men er ikke installert"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "men skal ikke installeres"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil bli installert:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil bli FJERNET:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er holdt tilbake:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil bli oppgradert:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil bli NEDGRADERT:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Følgende pakker vil bli endret:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (pga. %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nylig installerte, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installert på nytt, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Kompileringsfeil i regulært uttrykk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdaterings-kommandoen tar ingen argumenter"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1671,6 +1658,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Beregner oppgradering... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern feil - «AllUpgrade» ødela noe"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Utført"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Funnet "
@@ -1710,8 +1710,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1719,9 +1719,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1961,11 +1961,6 @@ msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjent TAR-hode: type %u, medlem %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2014,26 +2009,6 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsummen stemmer ikke for: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finner ikke metode-driveren %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startet ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
@@ -2129,93 +2104,56 @@ msgstr "valgfri"
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Lageret har et uoverensstemmende versjonssystem"
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leser pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler inn filtilbud"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kan ikke skrive til %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Oversiktsfil av typen «%s» støttes ikke"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO-feil ved lagring av kildekode-lager"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leser tilstandsinformasjon"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2299,6 +2237,69 @@ 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/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Lageret har et uoverensstemmende versjonssystem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil oppsto under behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Leser pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler inn filtilbud"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO-feil ved lagring av kildekode-lager"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2345,6 +2346,11 @@ 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2492,31 +2498,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Skaper oversikt over avhengighetsforhold"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versjons-kandidater"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Oppretter avhengighetsforhold"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leser tilstandsinformasjon"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2528,65 +2528,6 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Utgave «%s» av «%s» ble ikke funnet"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versjon «%s» av «%s» ble ikke funnet"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Klarte ikke å finne oppgave «%s»"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Klarte ikke finne noen pakken med regex «%s»"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Klarte ikke finne noen pakken med regex «%s»"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
-"har ingen av dem"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
-"kandidat"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
-"installert"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2687,6 +2628,65 @@ msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Utgave «%s» av «%s» ble ikke funnet"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versjon «%s» av «%s» ble ikke funnet"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Klarte ikke å finne oppgave «%s»"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
+"har ingen av dem"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
+"kandidat"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
+"installert"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2862,35 +2862,6 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
 msgid "Not locked"
 msgstr "Ikke låst"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lit %lim %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lit %lim %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%lim %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fant ikke utvalget %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3024,6 +2995,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s ... Ferdig"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lit %lim %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lit %lim %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%lim %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fant ikke utvalget %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan ikke utføre mmap på en tom fil"
diff --git a/po/ne.po b/po/ne.po
index b69db6abe..34d653b48 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -520,11 +520,11 @@ msgstr "निर्माण निर्भरताहरू प्रक्�
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1094,252 +1094,10 @@ msgstr "जडान असफल भयो"
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "स्तर वृद्धि गणना गरिदैछ..."
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "काम भयो"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "निर्भरताहरू सुधार गरिदैछ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "असफल भयो ।"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "काम भयो"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "तर %s स्थापना भयो"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "तर %s स्थापना हुनुपर्यो"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "तर यो स्थापनायोग्य छैन"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "तर यो अवास्तविक प्याकेज होइन"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "तर यो स्थापना भएन"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "तर यो स्थापना हुन गइरहेको छैन"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr "वा"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s कारणले) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
-"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुन: स्थापना गरियो, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu स्तर कम गरियो, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
@@ -1596,6 +1354,235 @@ msgstr "प्याकेज %s स्थापना भएन, त्यस�
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "निर्भरताहरू सुधार गरिदैछ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "तर %s स्थापना भयो"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "तर यो स्थापनायोग्य छैन"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "तर यो अवास्तविक प्याकेज होइन"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "तर यो स्थापना भएन"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "तर यो स्थापना हुन गइरहेको छैन"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr "वा"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s कारणले) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
+"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुन: स्थापना गरियो, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu स्तर कम गरियो, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1640,6 +1627,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "स्तर वृद्धि गणना गरिदैछ..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "काम भयो"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "हान्नुहोस्"
@@ -1679,8 +1679,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1688,9 +1688,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1931,11 +1931,6 @@ msgstr "टार चेकसम असफल भयो, संग्रह द
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्थिर गर्न असक्षम भयो ।"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1984,26 +1979,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही रुपले सुरू हुन सकेन"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
@@ -2098,94 +2073,57 @@ msgstr "वैकल्पिक"
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
+msgid "The method driver %s could not be found."
+msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+msgid "Is the package %s installed?"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "प्याकेज सूचिहरू पढिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr " %s मा लेख्न असक्षम"
+msgid "Index file type '%s' is not supported"
+msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2267,6 +2205,70 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "प्याकेज सूचिहरू पढिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेख्न असक्षम"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2312,6 +2314,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्थिर गर्न असक्षम भयो ।"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2453,32 +2460,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "निर्भरता ट्री निर्माण गरिदैछ"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "उमेद्वार संस्करणहरू"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "निर्भरता सिर्जना"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब्ध सूचना गाँभिदैछ"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s खोल्न असफल"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2490,58 +2490,6 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न �
 msgid "Unable to parse package file %s (2)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "प्याकेज फेला पार्न सकिएन  %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "प्याकेज फेला पार्न सकिएन  %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "प्याकेज फेला पार्न सकिएन  %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2642,6 +2590,58 @@ msgstr "स्रोत सूची %s भित्र %u लाइनमा �
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "प्याकेज फेला पार्न सकिएन  %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "प्याकेज फेला पार्न सकिएन  %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "प्याकेज फेला पार्न सकिएन  %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2806,35 +2806,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "चयन %s फेला पार्न सकिएन"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2968,6 +2939,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... गरियो"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पार्न सकिएन"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
diff --git a/po/nl.po b/po/nl.po
index 0cad8e6c8..fc558973d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2011-12-05 17:10+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  Versietabel:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -541,11 +541,11 @@ msgstr "Verwerken van de bouwvereisten is mislukt"
 msgid "Changelog for %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1130,252 +1130,10 @@ msgstr "Verbinding mislukt"
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Opwaardering wordt doorgerekend... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Klaar"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "maar %s is geïnstalleerd"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "maar %s zal geïnstalleerd worden"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "maar het is niet installeerbaar"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "maar het is een virtueel pakket"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "maar het is niet geïnstalleerd"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "maar het zal niet geïnstalleerd worden"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " of"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "De volgende pakketten zijn achtergehouden:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (vanwege %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
-"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu opnieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu gedegradeerd, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-compilatiefout - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "De opdracht 'update' aanvaard geen argumenten"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
@@ -1647,6 +1405,235 @@ msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukt."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Klaar"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Geïnstalleerd]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane vereisten:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "maar %s is geïnstalleerd"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "maar %s zal geïnstalleerd worden"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "maar het is niet installeerbaar"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "maar het is een virtueel pakket"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "maar het is niet geïnstalleerd"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "maar het zal niet geïnstalleerd worden"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " of"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "De volgende pakketten zullen VERWIJDERD worden:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "De volgende pakketten zijn achtergehouden:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "De volgende pakketten zullen opgewaardeerd worden:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (vanwege %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
+"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu opnieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu gedegradeerd, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-compilatiefout - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "De opdracht 'update' aanvaard geen argumenten"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1695,6 +1682,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Opwaardering wordt doorgerekend... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Klaar"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Geraakt "
@@ -1734,8 +1734,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1743,9 +1743,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1989,11 +1989,6 @@ msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kan de status van %s niet opvragen."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2044,28 +2039,6 @@ msgstr "Kan geen authenticatierecord vinden voor: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s startte niet op de juiste manier"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
-"'enter' te drukken."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2163,97 +2136,58 @@ msgstr "optioneel"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexbestand van type '%s' wordt niet ondersteund"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fout tijdens verwerken van %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan."
+msgid "Is the package %s installed?"
+msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Pakketlijsten worden ingelezen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Voorziene bestanden worden verzameld"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
+"'enter' te drukken."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kan niet naar %s schrijven"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexbestand van type '%s' wordt niet ondersteund"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generatie vereisten"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "De status informatie wordt gelezen"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2340,6 +2274,73 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fout tijdens verwerken van %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Pakketlijsten worden ingelezen"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Voorziene bestanden worden verzameld"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan niet naar %s schrijven"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2387,6 +2388,11 @@ msgstr ""
 "Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
 "bevatten"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kan de status van %s niet opvragen."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2537,31 +2543,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Boom van vereisten wordt opgebouwd"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generatie vereisten"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "De status informatie wordt gelezen"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2573,67 +2573,6 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kon pakketbestand %s niet ontleden (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' voor '%s' is niet gevonden"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versie '%s' voor '%s' is niet gevonden"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kon taak '%s' niet vinden"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-
-#: apt-pkg/cacheset.cc:626
-#, fuzzy, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
-"selecteren omdat deze geen van beide heeft"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
-"virtueel is"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
-"kandidaat heeft"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze "
-"niet geïnstalleerd is"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2735,6 +2674,67 @@ msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' voor '%s' is niet gevonden"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versie '%s' voor '%s' is niet gevonden"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Kon taak '%s' niet vinden"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+
+#: apt-pkg/cacheset.cc:626
+#, fuzzy, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
+"selecteren omdat deze geen van beide heeft"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
+"virtueel is"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
+"kandidaat heeft"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze "
+"niet geïnstalleerd is"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2915,35 +2915,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Niet vergrendeld"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %liu %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liu %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selectie %s niet gevonden"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3080,6 +3051,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Klaar"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %liu %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liu %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selectie %s niet gevonden"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan een leeg bestand niet mmappen"
diff --git a/po/nn.po b/po/nn.po
index ba63e8836..f39b5d47b 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -526,11 +526,11 @@ msgstr "Klarte ikkje behandla byggjekrava"
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "St�tta modular:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1103,254 +1103,10 @@ msgstr "Sambandet mislukkast"
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Reknar ut oppgradering ... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil. AllUpgrade �ydelagde noko"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Ferdig"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Rettar p� krav ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukkast."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Klarte ikkje retta p� krav"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarte ikkje minimera oppgraderingsmengda"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ferdig"
-
-#: apt-private/private-cachefile.cc:108
-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�."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nokre krav er ikkje oppfylte. Pr�v med �-f�."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "F�lgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installerast"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "men l�t seg ikkje installera"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "men er ein virtuell pakke"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "men er ikkje installert"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "men skal ikkje installerast"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Dei f�lgjande pakkane er haldne tilbake:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (fordi %s) "
-
-#: apt-private/private-output.cc:663
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nyleg installerte, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installerte p� nytt, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-kompileringsfeil - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdateringskommandoen tek ingen argument"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1612,6 +1368,237 @@ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Rettar p� krav ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukkast."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarte ikkje retta p� krav"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarte ikkje minimera oppgraderingsmengda"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ferdig"
+
+#: apt-private/private-cachefile.cc:108
+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�."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nokre krav er ikkje oppfylte. Pr�v med �-f�."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "F�lgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installerast"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "men l�t seg ikkje installera"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "men er ein virtuell pakke"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "men er ikkje installert"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "men skal ikkje installerast"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Dei f�lgjande pakkane er haldne tilbake:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (fordi %s) "
+
+#: apt-private/private-output.cc:663
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nyleg installerte, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installerte p� nytt, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-kompileringsfeil - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tek ingen argument"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1655,6 +1642,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Reknar ut oppgradering ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern feil. AllUpgrade �ydelagde noko"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Ferdig"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Treff "
@@ -1694,8 +1694,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1703,9 +1703,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1944,11 +1944,6 @@ msgstr "Tar-sjekksummen mislukkast, arkivet er �ydelagt"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje f� status p� %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1997,29 +1992,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
-
-#: apt-pkg/acquire-worker.cc:455
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" �%s�\n"
-"i stasjonen �%s� og trykk Enter.\n"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
@@ -2115,94 +2087,60 @@ msgstr "valfri"
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiltypen �%s� er ikkje st�tta"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-#, 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:266
-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."
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
+msgid "Is the package %s installed?"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Les pakkelister"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
+#: apt-pkg/acquire-worker.cc:455
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" �%s�\n"
+"i stasjonen �%s� og trykk Enter.\n"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Klarte ikkje skriva til %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiltypen �%s� er ikkje st�tta"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IU-feil ved lagring av kjeldelager"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2285,6 +2223,70 @@ msgid ""
 msgstr ""
 "Pakkeindeksfilene er �ydelagde. Feltet �Filename:� manglar for pakken %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+#, 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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Klarte ikkje skriva til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IU-feil ved lagring av kjeldelager"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2330,6 +2332,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarte ikkje f� status p� %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2472,32 +2479,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre �ydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genererer kravforhold"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Flettar informasjon om tilgjengelege pakkar"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2509,58 +2509,6 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Fann ikkje utg�va �%s� av �%s�"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Fann ikkje versjonen �%s� av �%s�"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2661,6 +2609,58 @@ msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Fann ikkje utg�va �%s� av �%s�"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Fann ikkje versjonen �%s� av �%s�"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2825,35 +2825,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fann ikkje utvalet %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2987,6 +2958,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s ... Ferdig"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fann ikkje utvalet %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan ikkje utf�ra mmap p� ei tom fil"
diff --git a/po/pl.po b/po/pl.po
index adec14493..844d9b1e0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-07-28 21:53+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -163,7 +163,7 @@ msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -546,11 +546,11 @@ msgstr "Nie udało się przetworzyć zależności dla budowania"
 msgid "Changelog for %s (%s)"
 msgstr "Dziennik zmian %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1155,255 +1155,10 @@ msgstr "Połączenie nie powiodło się"
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Obliczanie aktualizacji..."
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Gotowe"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nie udało się."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Następujące pakiety mają niespełnione zależności:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s jest zainstalowany"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s ma zostać zainstalowany"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ale nie da się go zainstalować"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ale jest pakietem wirtualnym"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ale nie jest zainstalowany"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ale nie zostanie zainstalowany"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " lub"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Następujące pakiety zostaną USUNIĘTE:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Następujące pakiety zostały zatrzymane:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Następujące pakiety zostaną zaktualizowane:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (z powodu %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
-"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ponownie instalowanych, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu cofniętych wersji, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[t/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Błąd kompilacji wyrażenia regularnego - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Polecenie update nie wymaga żadnych argumentów"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
@@ -1689,6 +1444,238 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nie udało się."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nie udało się naprawić zależności"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Gotowe"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Następujące pakiety mają niespełnione zależności:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s jest zainstalowany"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s ma zostać zainstalowany"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ale nie da się go zainstalować"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ale jest pakietem wirtualnym"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ale nie jest zainstalowany"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ale nie zostanie zainstalowany"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " lub"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Następujące pakiety zostaną USUNIĘTE:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Następujące pakiety zostały zatrzymane:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Następujące pakiety zostaną zaktualizowane:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (z powodu %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
+"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ponownie instalowanych, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu cofniętych wersji, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[t/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Błąd kompilacji wyrażenia regularnego - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Polecenie update nie wymaga żadnych argumentów"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1736,6 +1723,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Obliczanie aktualizacji..."
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Gotowe"
+
 # Ujednolicono z aptitude
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
@@ -1778,8 +1778,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1787,9 +1787,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2031,11 +2031,6 @@ msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie udało się wykonać operacji stat na pliku %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2084,26 +2079,6 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Błędna suma kontrolna dla: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nie udało się odnaleźć sterownika metody %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 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."
@@ -2197,96 +2172,56 @@ msgstr "opcjonalny"
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Magazyn podręczny ma niezgodny system wersji"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Czytanie list pakietów"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Zbieranie zapewnień plików"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nie udało się pisać do %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Odczyt informacji o stanie"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
-"prawidłowego komunikatu o błędzie"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2374,6 +2309,70 @@ msgid ""
 msgstr ""
 "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Magazyn podręczny ma niezgodny system wersji"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Czytanie list pakietów"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Zbieranie zapewnień plików"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nie udało się pisać do %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2418,6 +2417,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie udało się wykonać operacji stat na pliku %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2570,31 +2574,27 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Budowanie drzewa zależności"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generowanie zależności"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Odczyt informacji o stanie"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
+"prawidłowego komunikatu o błędzie"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2606,70 +2606,6 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nie udało się odnaleźć zadania \"%s\""
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr ""
-"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
-"wirtualny"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
-"ponieważ nie ma żadnej z nich"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
-"czysto wirtualny"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
-"kandydata"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
-"zainstalowany"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2772,6 +2708,70 @@ msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nie udało się odnaleźć zadania \"%s\""
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr ""
+"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
+"wirtualny"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
+"ponieważ nie ma żadnej z nich"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
+"czysto wirtualny"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
+"kandydata"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
+"zainstalowany"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2953,35 +2953,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Niezablokowany"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lidni %lig %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lig %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Nie odnaleziono wyboru %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3120,6 +3091,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Gotowe"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lidni %lig %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lig %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Nie odnaleziono wyboru %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nie można wykonać mmap na pustym pliku"
diff --git a/po/pt.po b/po/pt.po
index 98555056b..4c53b49ef 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -540,11 +540,11 @@ msgstr "Falhou processar as dependências de compilação"
 msgid "Changelog for %s (%s)"
 msgstr "Changlog para %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1145,252 +1145,10 @@ msgstr "A ligação falhou"
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "A calcular a actualização... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erro Interno, AllUpgrade estragou algo"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Pronto"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências não satisfeitas. Tente utilizar -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "mas não vai ser instalado"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Serão instalados os seguintes NOVOS pacotes:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Serão REMOVIDOS os seguintes pacotes:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Serão actualizados os seguintes pacotes:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (devido a %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu a que foi feito o downgrade, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a remover e %lu não actualizados.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
@@ -1659,6 +1417,235 @@ msgstr ""
 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"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Não foi possível minimizar o conjunto de actualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências não satisfeitas. Tente utilizar -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "mas não vai ser instalado"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Serão instalados os seguintes NOVOS pacotes:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Serão REMOVIDOS os seguintes pacotes:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Serão actualizados os seguintes pacotes:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (devido a %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu a que foi feito o downgrade, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a remover e %lu não actualizados.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1706,6 +1693,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "A calcular a actualização... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Erro Interno, AllUpgrade estragou algo"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Pronto"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Hit "
@@ -1745,8 +1745,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1754,9 +1754,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1999,11 +1999,6 @@ msgstr "A soma de controlo do tar falhou, arquivo corrompido"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Não foi possível fazer stat %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2055,27 +2050,6 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash não coincide para: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pôde ser encontrado."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2171,99 +2145,57 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo do ficheiro de índice '%s' não é suportado"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pôde ser encontrado."
 
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "A cache possui um sistema de versões incompatível"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Ocorreu um erro ao processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "A ler as listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "A obter File Provides"
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Não conseguiu escrever para %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo do ficheiro de índice '%s' não é suportado"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Erro de I/O ao gravar a cache de código fonte"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Enviar cenário a resolver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependências"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "A ler a informação de estado"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2356,6 +2288,75 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "A cache possui um sistema de versões incompatível"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Ocorreu um erro ao processar %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "A ler as listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "A obter File Provides"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Não conseguiu escrever para %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Erro de I/O ao gravar a cache de código fonte"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2400,6 +2401,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Não foi possível fazer stat %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2553,31 +2559,25 @@ msgstr ""
 "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
 "estragados."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "A construir árvore de dependências"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Enviar cenário a resolver"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependências"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "A ler a informação de estado"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Executar resolvedor externo"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2589,67 +2589,6 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Não foi encontrado o Release '%s' para '%s'"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Não foi encontrada a versão '%s' para '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Não foi possível encontrar a tarefa '%s'"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
-"'%s' pois não tem nenhuma destas"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
-"já que é puramente virtual"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Não é possível seleccionar a versão candidata do pacote %s já que não tem "
-"candidato"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Não é possível seleccionar a versão instalada do pacote %s pois não está "
-"instalado"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2753,6 +2692,67 @@ msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Não foi encontrado o Release '%s' para '%s'"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Não foi encontrada a versão '%s' para '%s'"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Não foi possível encontrar a tarefa '%s'"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
+"'%s' pois não tem nenhuma destas"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
+"já que é puramente virtual"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Não é possível seleccionar a versão candidata do pacote %s já que não tem "
+"candidato"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Não é possível seleccionar a versão instalada do pacote %s pois não está "
+"instalado"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2934,35 +2934,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Sem acesso exclusivo"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "A selecção %s não foi encontrada"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3104,6 +3075,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Pronto"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "A selecção %s não foi encontrada"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Não é possível fazer mmap a um ficheiro vazio"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8e6fc88d5..82bc3a2f1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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."
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -534,11 +534,11 @@ msgstr "Falhou ao processar as dependências de construção"
 msgid "Changelog for %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1117,253 +1117,10 @@ msgstr "Conexão falhou"
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando atualização... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Erro interno, AllUpgrade quebrou coisas"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Pronto"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Corrigindo dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossível minimizar o conjunto de atualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Pronto"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências desencontradas. Tente usar -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências desencontradas:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "mas não será instalado"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Os NOVOS pacotes a seguir serão instalados:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Os pacotes a seguir serão REMOVIDOS:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Os pacotes a seguir serão atualizados:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Os pacotes a seguir serão REVERTIDOS:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por causa de %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
-"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
-"fazendo!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a serem removidos e %lu não atualizados.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
@@ -1631,6 +1388,236 @@ msgstr "O pacote %s não está instalado, então não será removido\n"
 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"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corrigindo dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossível minimizar o conjunto de atualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Pronto"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências desencontradas. Tente usar -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências desencontradas:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "mas não será instalado"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Os NOVOS pacotes a seguir serão instalados:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Os pacotes a seguir serão REMOVIDOS:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Os pacotes a seguir serão atualizados:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Os pacotes a seguir serão REVERTIDOS:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por causa de %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
+"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
+"fazendo!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a serem removidos e %lu não atualizados.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1674,6 +1661,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculando atualização... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Erro interno, AllUpgrade quebrou coisas"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Pronto"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atingido "
@@ -1713,8 +1713,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1722,9 +1722,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1969,11 +1969,6 @@ msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossível executar \"stat\" %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2024,27 +2019,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pode ser encontrado."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2141,99 +2115,57 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo de arquivo de índice '%s' não é suportado"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "O cache possui um sistema de versões incompatível"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pode ser encontrado."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lendo listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Coletando Arquivo \"Provides\""
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Impossível escrever para %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo de arquivo de índice '%s' não é suportado"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Erro de E/S ao gravar cache fonte"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependência"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo informação de estado"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2317,6 +2249,75 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "O cache possui um sistema de versões incompatível"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lendo listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Coletando Arquivo \"Provides\""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossível escrever para %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Erro de E/S ao gravar cache fonte"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2362,6 +2363,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossível executar \"stat\" %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2507,31 +2513,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo árvore de dependências"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependência"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lendo informação de estado"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2543,58 +2543,6 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossível analisar arquivo de pacote %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' para '%s' não foi encontrada"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versão '%s' para '%s' não foi encontrada"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossível achar tarefa %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Impossível achar pacote %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Impossível achar pacote %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2700,6 +2648,58 @@ msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' para '%s' não foi encontrada"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versão '%s' para '%s' não foi encontrada"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Impossível achar tarefa %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Impossível achar pacote %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Impossível achar pacote %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2864,35 +2864,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Seleção %s não encontrada"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3026,6 +2997,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Pronto"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Seleção %s não encontrada"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
diff --git a/po/ro.po b/po/ro.po
index 1ce07f594..712ba11de 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -532,11 +532,11 @@ msgstr "Eșec la prelucrarea dependențelor de compilare"
 msgid "Changelog for %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1119,255 +1119,10 @@ msgstr "Conectare eșuată"
 msgid "Internal error"
 msgstr "Eroare internă"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculez înnoirea... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Terminat"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Următoarele pachete au dependențe neîndeplinite:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "dar %s este instalat"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "dar %s este pe cale de a fi instalat"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "dar nu este instalabil"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "dar este un pachet virtual"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "dar nu este instalat"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "dar nu este pe cale să fie instalat"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " sau"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Următoarele pachete NOI vor fi instalate:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Următoarele pachete vor fi ȘTERSE:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Următoarele pachete au fost reținute:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Următoarele pachete vor fi ÎNNOITE:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Următoarele pachete vor fi DE-GRADATE:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Următoarele pachete ținute vor fi schimbate:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (datorită %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu înnoite, %lu nou instalate, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalate, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu de-gradate, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu de șters și %lu neînnoite.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalate sau șterse incomplet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Eroare de compilare expresie regulată - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Comanda de actualizare nu are argumente"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
@@ -1639,6 +1394,238 @@ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " eșec."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Terminat"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Următoarele pachete au dependențe neîndeplinite:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "dar %s este instalat"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "dar %s este pe cale de a fi instalat"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "dar nu este instalabil"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "dar este un pachet virtual"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "dar nu este instalat"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "dar nu este pe cale să fie instalat"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " sau"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Următoarele pachete NOI vor fi instalate:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Următoarele pachete vor fi ȘTERSE:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Următoarele pachete au fost reținute:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Următoarele pachete vor fi ÎNNOITE:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Următoarele pachete vor fi DE-GRADATE:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Următoarele pachete ținute vor fi schimbate:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (datorită %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu înnoite, %lu nou instalate, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalate, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu de-gradate, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu de șters și %lu neînnoite.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalate sau șterse incomplet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Eroare de compilare expresie regulată - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Comanda de actualizare nu are argumente"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1682,6 +1669,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Calculez înnoirea... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Terminat"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atins "
@@ -1721,8 +1721,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1730,9 +1730,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1977,11 +1977,6 @@ msgstr ""
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tip antet TAR %u necunoscut, membrul %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nu pot determina starea %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2031,27 +2026,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoda driver %s nu poate fi găsită."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2149,99 +2123,57 @@ msgstr "opțional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipul de fișier index '%s' nu este suportat"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache are un versioning system incompatibil"
+msgid "The method driver %s could not be found."
+msgstr "Metoda driver %s nu poate fi găsită."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nu pot determina starea listei surse de pachete %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Citire liste de pachete"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Colectare furnizori fișier"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nu s-a putut scrie în %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipul de fișier index '%s' nu este suportat"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Eroare IO în timpul salvării sursei cache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Se citesc informațiile de stare"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2326,6 +2258,75 @@ msgstr ""
 "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
 "pachetul %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache are un versioning system incompatibil"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nu pot determina starea listei surse de pachete %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Citire liste de pachete"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Colectare furnizori fișier"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nu s-a putut scrie în %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Eroare IO în timpul salvării sursei cache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2371,6 +2372,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nu pot determina starea %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2516,31 +2522,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generare dependențe"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Se citesc informațiile de stare"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2552,58 +2552,6 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' pentru '%s' n-a fost găsită"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nu s-a putut găsi sarcina %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nu pot găsi pachetul %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nu pot găsi pachetul %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2704,6 +2652,58 @@ msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' pentru '%s' n-a fost găsită"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nu s-a putut găsi sarcina %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nu pot găsi pachetul %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nu pot găsi pachetul %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2868,35 +2868,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selecția %s nu a fost găsită"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3030,6 +3001,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Terminat"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selecția %s nu a fost găsită"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
diff --git a/po/ru.po b/po/ru.po
index 5aabe0610..dc6359288 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt rev2227.1.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-30 08:47+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -164,7 +164,7 @@ msgid "  Version table:"
 msgstr "  Таблица версий:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -541,11 +541,11 @@ msgstr "Обработка зависимостей для сборки заве
 msgid "Changelog for %s (%s)"
 msgstr "Changelog для %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1153,258 +1153,10 @@ msgstr "Соединение разорвано"
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Расчёт обновлений…"
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Готово"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "но %s уже установлен"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но %s будет установлен"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "но он не может быть установлен"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "но это виртуальный пакет"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "но он не установлен"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "но он не будет установлен"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "НОВЫЕ пакеты, которые будут установлены:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Пакеты, которые будут обновлены:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr ""
-"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (вследствие %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
-"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "обновлено %lu, установлено %lu новых пакетов, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "переустановлено %lu переустановлено, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu пакетов заменены на старые версии, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не установлено до конца или удалено %lu пакетов.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Д/н]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "д"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "н"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Ошибка компиляции регулярного выражения — %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Команде update не нужны аргументы"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1683,6 +1435,241 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " не удалось."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Невозможно скорректировать зависимости"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Невозможно минимизировать набор обновлений"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "но %s уже установлен"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но %s будет установлен"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "но он не может быть установлен"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "но это виртуальный пакет"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "но он не установлен"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "но он не будет установлен"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "НОВЫЕ пакеты, которые будут установлены:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Пакеты, которые будут УДАЛЕНЫ:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Пакеты, которые будут оставлены в неизменном виде:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Пакеты, которые будут обновлены:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (вследствие %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
+"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "обновлено %lu, установлено %lu новых пакетов, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "переустановлено %lu переустановлено, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu пакетов заменены на старые версии, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не установлено до конца или удалено %lu пакетов.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Д/н]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "д"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "н"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Ошибка компиляции регулярного выражения — %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команде update не нужны аргументы"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1730,6 +1717,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Расчёт обновлений…"
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Готово"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "В кэше "
@@ -1769,8 +1769,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1778,9 +1778,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Невозможно прочитать %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2021,11 +2021,6 @@ msgstr "Неправильная контрольная сумма Tar, архи
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Невозможно получить атрибуты %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2076,26 +2071,6 @@ msgstr "Не удалось найти аутентификационную за
 msgid "Hash mismatch for: %s"
 msgstr "Не совпадает хеш сумма для: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не найден."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s запустился не корректно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
@@ -2189,99 +2164,56 @@ msgstr "необязательный"
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Не поддерживается индексный файл типа «%s»"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Кэш имеет несовместимую систему версий"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Произошла ошибка во время обработки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Превышено допустимое количество имён пакетов, которое способен обработать "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество версий, которое способен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество описаний, которое способен обработать APT."
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не найден."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Превышено допустимое количество зависимостей, которое способен обработать "
-"APT."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запустился не корректно"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Чтение списков пакетов"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Сбор информации о Provides"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Невозможно записать в %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Не поддерживается индексный файл типа «%s»"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Построение дерева зависимостей"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Отправка сценария решателю"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии-кандидаты"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генерирование зависимостей"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Чтение информации о состоянии"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2368,6 +2300,75 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Кэш имеет несовместимую систему версий"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Произошла ошибка во время обработки %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Превышено допустимое количество имён пакетов, которое способен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Превышено допустимое количество версий, которое способен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Превышено допустимое количество описаний, которое способен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Превышено допустимое количество зависимостей, которое способен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Чтение списков пакетов"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Сбор информации о Provides"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Невозможно записать в %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2412,6 +2413,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Невозможно получить атрибуты %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2563,31 +2569,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Построение дерева зависимостей"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Отправка сценария решателю"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2599,67 +2599,6 @@ msgstr "Невозможно разобрать содержимое пакет�
 msgid "Unable to parse package file %s (2)"
 msgstr "Невозможно разобрать содержимое пакета %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Выпуск «%s» для «%s» не найден"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Версия «%s» для «%s» не найдена"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Не удалось найти задачу «%s»"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
-"как в нём нет ни той, ни другой"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
-"виртуальный"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
-"кандидатов"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Не удалось выбрать установленную версию из пакета %s, так как он не "
-"установлен"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2764,6 +2703,67 @@ msgstr "Неизвестный тип «%s» в строке %u в списке
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Выпуск «%s» для «%s» не найден"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Версия «%s» для «%s» не найдена"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Не удалось найти задачу «%s»"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Не удалось найти пакет по регулярному выражению «%s»"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Не удалось найти пакет по регулярному выражению «%s»"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
+"как в нём нет ни той, ни другой"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
+"виртуальный"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
+"кандидатов"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Не удалось выбрать установленную версию из пакета %s, так как он не "
+"установлен"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2945,35 +2945,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Не заблокирован"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liч %liмин %liс"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liмин %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%liмин %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Не найдено: %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3115,6 +3086,35 @@ msgstr "…"
 msgid "%c%s... %u%%"
 msgstr "%c%s… %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liмин %liс"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liмин %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liмин %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Не найдено: %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Невозможно отобразить в память пустой файл"
diff --git a/po/sk.po b/po/sk.po
index 6e9f85197..205c11d75 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -534,11 +534,11 @@ msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 msgid "Changelog for %s (%s)"
 msgstr "Záznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1132,255 +1132,10 @@ msgstr "Spojenie zlyhalo"
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Prepočítava sa aktualizácia... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Hotovo"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " zlyhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplnené závislosti. Skúste použiť -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Nasledovné balíky majú nesplnené závislosti:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ale nainštalovaný je %s"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale inštalovať sa bude %s"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ale sa nedá nainštalovať"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ale je to virtuálny balík"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ale nie je nainštalovaný"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ale sa nebude inštalovať"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " alebo"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Nasledovné balíky sa aktualizujú:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Nasledovné pridržané balíky sa zmenia:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (kvôli %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
-"Ak presne neviete, čo robíte, tak to NEROBTE!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinštalovaných, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradovaných, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba pri preklade regulárneho výrazu - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Príkaz update neprijíma žiadne argumenty"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
@@ -1656,6 +1411,238 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " zlyhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Závislosti sa nedajú opraviť"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplnené závislosti. Skúste použiť -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Nasledovné balíky majú nesplnené závislosti:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ale nainštalovaný je %s"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale inštalovať sa bude %s"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ale sa nedá nainštalovať"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ale je to virtuálny balík"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ale nie je nainštalovaný"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ale sa nebude inštalovať"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " alebo"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Nasledovné balíky sa ODSTRÁNIA:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Nasledovné balíky sa aktualizujú:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nasledovné balíky sa DEGRADUJÚ:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Nasledovné pridržané balíky sa zmenia:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvôli %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
+"Ak presne neviete, čo robíte, tak to NEROBTE!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinštalovaných, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradovaných, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba pri preklade regulárneho výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Príkaz update neprijíma žiadne argumenty"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1703,6 +1690,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Prepočítava sa aktualizácia... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Hotovo"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Už existuje "
@@ -1742,8 +1742,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1751,9 +1751,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Nedá sa načítať %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1992,11 +1992,6 @@ msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznáma TAR hlavička typu %u, člen %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2045,26 +2040,6 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Nezhoda kontrolných haš súčtov: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nedá sa nájsť ovládač spôsobu %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 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ť."
@@ -2158,95 +2133,56 @@ msgstr "voliteľný"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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ť."
+msgid "The method driver %s could not be found."
+msgstr "Nedá sa nájsť ovládač spôsobu %s."
 
-#: apt-pkg/pkgcachegen.cc:266
-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/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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"
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový súbor typu „%s“ nie je podporovaný"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Poslať scénár riešiteľovi"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Načítavajú sa stavové informácie"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2333,6 +2269,71 @@ 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/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Do %s sa nedá zapisovať"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2377,6 +2378,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2525,31 +2531,25 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Poslať scénár riešiteľovi"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Načítavajú sa stavové informácie"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Pripraviť sa na prijatie riešenia"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Spustiť externého riešiteľa"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2561,65 +2561,6 @@ 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/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nebolo možné nájsť úlohu „%s“"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
-"pretože nemá žiadnu z nich"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
-"virtuálny"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
-"nainštalovaný"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2721,6 +2662,65 @@ msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nebola nájdená verzia „%s“ pre „%s“"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nebolo možné nájsť úlohu „%s“"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
+"pretože nemá žiadnu z nich"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
+"virtuálny"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
+"nainštalovaný"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2895,35 +2895,6 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s�
 msgid "Not locked"
 msgstr "Nie je zamknuté"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, 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:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Voľba %s nenájdená"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3058,6 +3029,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Hotovo"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, 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:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Voľba %s nenájdená"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nedá sa vykonať mmap prázdneho súboru"
diff --git a/po/sl.po b/po/sl.po
index eec59f42f..f2fccd7d0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Preglednica različic:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -531,11 +531,11 @@ msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 msgid "Changelog for %s (%s)"
 msgstr "Dnevnik sprememb za %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1128,258 +1128,10 @@ msgstr "Povezava ni uspela"
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Preračunavanje nadgradnje ... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Notranja napaka zaradi AllUpgrade."
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Opravljeno"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "vendar je paket %s nameščen"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "vendar bo paket %s nameščen"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "vendar se ga ne da namestiti"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "vendar je navidezen paket"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "vendar ni nameščen"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "vendar ne bo nameščen"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ali"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Naslednji NOVI paketi bodo nameščeni:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Naslednji paketi so bili zadržani:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Naslednji paketi bodo nadgrajeni:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Naslednji paketi bodo POSTARANI:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (zaradi %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
-"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu posodobljenih, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu postaranih, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Napaka med prevajanjem logičnega izraza - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Ukaz update ne sprejema argumentov"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
@@ -1657,6 +1409,241 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " spodletelo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Opravljeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "vendar je paket %s nameščen"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "vendar bo paket %s nameščen"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "vendar se ga ne da namestiti"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "vendar je navidezen paket"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "vendar ni nameščen"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "vendar ne bo nameščen"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ali"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Naslednji NOVI paketi bodo nameščeni:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Naslednji paketi so bili zadržani:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Naslednji paketi bodo nadgrajeni:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Naslednji paketi bodo POSTARANI:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Naslednji zadržani paketi bodo spremenjeni:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (zaradi %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
+"Tega NE storite, razen če ne veste natanko kaj počenjate!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu posodobljenih, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu postaranih, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Napaka med prevajanjem logičnega izraza - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ukaz update ne sprejema argumentov"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1704,6 +1691,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Preračunavanje nadgradnje ... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Notranja napaka zaradi AllUpgrade."
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Opravljeno"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Zadetek "
@@ -1743,8 +1743,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1752,9 +1752,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Ni mogoče brati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1994,11 +1994,6 @@ msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznana vrsta glave TAR %u, član %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni mogoče določiti %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2049,26 +2044,6 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Neujemanje razpršila za: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Gonilnika načinov %s ni mogoče najti."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Način %s se ni začel pravilno"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
-
 #: apt-pkg/cachefile.cc:94
 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."
@@ -2162,93 +2137,56 @@ msgstr "izbirno"
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Predpomnilnik ima neustrezen sistem različic"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika načinov %s ni mogoče najti."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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 datotek"
+msgid "Method %s did not start correctly"
+msgstr "Način %s se ni začel pravilno"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ni mogoče določiti seznama izvornih paketov %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Branje seznama paketov"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Zbiranje dobaviteljev datotek"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Ni mogoče pisati na %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Pošlji scenarij reševalniku"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Različice kandidatov"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Branje podatkov o stanju"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2337,6 +2275,69 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
 "%s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Predpomnilnik ima neustrezen sistem različic"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, 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 datotek"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Ni mogoče določiti seznama izvornih paketov %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Branje seznama paketov"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Zbiranje dobaviteljev datotek"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni mogoče pisati na %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2381,6 +2382,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni mogoče določiti %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2529,31 +2535,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradnja drevesa odvisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Pošlji scenarij reševalniku"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Branje podatkov o stanju"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Izvedi zunanji reševalnik"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2565,62 +2565,6 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Izdaje '%s' za '%s' ni mogoče najti"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Različice '%s' za '%s' ni mogoče najti"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ni mogoče najti naloge '%s'"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
-"'%s', saj nima nobenega od njiju"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
-"navidezen"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2727,6 +2671,62 @@ msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Izdaje '%s' za '%s' ni mogoče najti"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Različice '%s' za '%s' ni mogoče najti"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ni mogoče najti naloge '%s'"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
+"'%s', saj nima nobenega od njiju"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
+"navidezen"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2903,35 +2903,6 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
 msgid "Not locked"
 msgstr "Ni zaklenjeno"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Izbire %s ni mogoče najti"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3066,6 +3037,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s ... Narejeno"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Izbire %s ni mogoče najti"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "mmap prazne datoteke ni mogoč"
diff --git a/po/sv.po b/po/sv.po
index a66c9ec08..8bd1d0f20 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2010-08-24 21:18+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Versionstabell:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -533,11 +533,11 @@ msgstr "Misslyckades med att behandla byggberoenden"
 msgid "Changelog for %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1119,252 +1119,10 @@ msgstr "Anslutningen misslyckades"
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Beräknar uppgradering... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Internt fel, AllUpgrade förstörde något"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Färdig"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Otillfredsställda beroenden. Prova med -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s är installerat"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s kommer att installeras"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "men det kan inte installeras"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "men det är ett virtuellt paket"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "men det är inte installerat"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "men det kommer inte att installeras"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Följande NYA paket kommer att installeras:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Följande paket kommer att TAS BORT:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Följande paket har hållits tillbaka:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Följande paket kommer att uppgraderas:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Följande paket kommer att NEDGRADERAS:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Följande tillbakahållna paket kommer att ändras:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (på grund av %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu att uppgradera, %lu att nyinstallera, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu att installera om, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu att nedgradera, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu är inte helt installerade eller borttagna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fel vid kompilering av reguljärt uttryck - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Uppdateringskommandot tar inga argument"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
@@ -1636,6 +1394,235 @@ msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " misslyckades."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Färdig"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Otillfredsställda beroenden. Prova med -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s är installerat"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s kommer att installeras"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "men det kan inte installeras"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "men det är ett virtuellt paket"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "men det är inte installerat"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "men det kommer inte att installeras"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Följande NYA paket kommer att installeras:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Följande paket kommer att TAS BORT:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Följande paket har hållits tillbaka:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Följande paket kommer att uppgraderas:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Följande paket kommer att NEDGRADERAS:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Följande tillbakahållna paket kommer att ändras:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (på grund av %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu att uppgradera, %lu att nyinstallera, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu att installera om, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu att nedgradera, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu är inte helt installerade eller borttagna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fel vid kompilering av reguljärt uttryck - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Uppdateringskommandot tar inga argument"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1683,6 +1670,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Beräknar uppgradering... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Internt fel, AllUpgrade förstörde något"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Färdig"
+
 # Måste vara tre bokstäver(?)
 # "Hit" = aktuell version är fortfarande giltig
 #: apt-private/acqprogress.cc:66
@@ -1727,8 +1727,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1737,9 +1737,9 @@ msgid "Unable to read %s"
 msgstr "Kunde inte läsa %s"
 
 # Felmeddelande för misslyckad chdir
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1980,11 +1980,6 @@ msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Okänd TAR-rubriktyp %u, del %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2034,27 +2029,6 @@ msgstr "Kan inte hitta autentiseringspost för: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-kontrollsumman stämmer inte för: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoddrivrutinen %s kunde inte hittas."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
@@ -2152,95 +2126,57 @@ msgstr "valfri"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexfiler av typ \"%s\" stöds inte"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cachen har ett inkompatibelt versionssystem"
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
 
-# NewPackage etc. är funktionsnamn
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
+msgid "Is the package %s installed?"
+msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunde inte ta status på källkodspaketlistan %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Läser paketlistor"
-
-# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar filtillhandahållningar"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kunde inte skriva till %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexfiler av typ \"%s\" stöds inte"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "In-/utfel vid lagring av källcache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandiderande versioner"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Beroendegenerering"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Läser tillståndsinformation"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2324,6 +2260,71 @@ 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/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Cachen har ett inkompatibelt versionssystem"
+
+# NewPackage etc. är funktionsnamn
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fel uppstod vid hantering av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kunde inte ta status på källkodspaketlistan %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Läser paketlistor"
+
+# Bättre ord?
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar filtillhandahållningar"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunde inte skriva till %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "In-/utfel vid lagring av källcache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2369,6 +2370,11 @@ msgstr ""
 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/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2518,31 +2524,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bygger beroendeträd"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandiderande versioner"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Beroendegenerering"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Läser tillståndsinformation"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2554,67 +2554,6 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunde inte tolka paketfilen %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version \"%s\" för \"%s\" hittades inte"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kunde inte hitta funktionen \"%s\""
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
-"eftersom det inte har någon av dem"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Kan inte välja senaste version från paketet \"%s\" eftersom det är helt "
-"virtuellt"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
-"kandidat"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Kan inte välja installerad version från paketet %s eftersom det inte är "
-"installerat"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2715,6 +2654,67 @@ msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version \"%s\" för \"%s\" hittades inte"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Kunde inte hitta funktionen \"%s\""
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
+"eftersom det inte har någon av dem"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Kan inte välja senaste version från paketet \"%s\" eftersom det är helt "
+"virtuellt"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
+"kandidat"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Kan inte välja installerad version från paketet %s eftersom det inte är "
+"installerat"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2892,35 +2892,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Inte låst"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valet %s hittades inte"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3054,6 +3025,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Färdig"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valet %s hittades inte"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan inte utföra mmap på en tom fil"
diff --git a/po/th.po b/po/th.po
index 7d86b0746..e87209561 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-20 09:38+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -156,7 +156,7 @@ msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -522,11 +522,11 @@ msgstr "ติดตั้งสิ่งที่จำเป็นสำหร
 msgid "Changelog for %s (%s)"
 msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1144,245 +1144,10 @@ msgstr "เชื่อมต่อไม่สำเร็จ"
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "กำลังคำนวณการปรับรุ่น... "
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "เกิดข้อผิดพลาดภายใน: การปรับรุ่นทำความเสียหาย"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "เสร็จแล้ว"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr "กำลังเรียงลำดับ"
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr "กำลังแสดงรายชื่อ"
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ล้มเหลว"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " เสร็จแล้ว"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "ไม่ทราบ"
-
-#: apt-private/private-output.cc:233
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
-
-#: apt-private/private-output.cc:237
-msgid "[installed,local]"
-msgstr "[ติดตั้งอยู่,ในเครื่อง]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
-
-#: apt-private/private-output.cc:242
-msgid "[installed,automatic]"
-msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
-
-#: apt-private/private-output.cc:244
-msgid "[installed]"
-msgstr "[ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[สามารถปรับรุ่นจาก: %s]"
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr "[ค่าตั้งตกค้าง]"
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "แต่ไม่สามารถติดตั้งได้"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "แต่ได้ติดตั้งไว้"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " หรือ"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (เนื่องจาก %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
-"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "ติดตั้งซ้ำ %lu, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ปรับรุ่นลง %lu, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
@@ -1634,6 +1399,229 @@ msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr "กำลังแสดงรายชื่อ"
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "ไม่ทราบ"
+
+#: apt-private/private-output.cc:233
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
+
+#: apt-private/private-output.cc:237
+msgid "[installed,local]"
+msgstr "[ติดตั้งอยู่,ในเครื่อง]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
+
+#: apt-private/private-output.cc:242
+msgid "[installed,automatic]"
+msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
+
+#: apt-private/private-output.cc:244
+msgid "[installed]"
+msgstr "[ติดตั้งอยู่]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[สามารถปรับรุ่นจาก: %s]"
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr "[ค่าตั้งตกค้าง]"
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "แต่ไม่สามารถติดตั้งได้"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "แต่ได้ติดตั้งไว้"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " หรือ"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (เนื่องจาก %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
+"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "ติดตั้งซ้ำ %lu, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ปรับรุ่นลง %lu, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1681,6 +1669,18 @@ msgstr "แฟ้ม '%s' ของคุณมีการเปลี่ยน
 msgid "Full Text Search"
 msgstr "ค้นทั่วทั้งเนื้อความ"
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "กำลังคำนวณการปรับรุ่น... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "เกิดข้อผิดพลาดภายใน: การปรับรุ่นทำความเสียหาย"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "เสร็จแล้ว"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "เจอ "
@@ -1720,8 +1720,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1729,9 +1729,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1968,11 +1968,6 @@ msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจ
 msgid "Unknown TAR header type %u, member %s"
 msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "ไม่สามารถ stat %s"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2021,26 +2016,6 @@ msgstr "ไม่พบระเบียนยืนยันความแท
 msgid "Hash mismatch for: %s"
 msgstr "แฮชไม่ตรงกันสำหรับ: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
@@ -2134,93 +2109,56 @@ msgstr "ตัวเลือก"
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "กำลังอ่านรายชื่อแพกเกจ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2304,6 +2242,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "กำลังอ่านรายชื่อแพกเกจ"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2346,6 +2347,11 @@ msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "ไม่สามารถ stat %s"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2491,31 +2497,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "รุ่นแพกเกจที่มี"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "สร้างลำดับความสัมพันธ์"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "กำลังอ่านข้อมูลสถานะ"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2527,59 +2527,6 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
 msgid "Unable to parse package file %s (2)"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "ไม่พบรุ่น '%s' ของ '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "ไม่พบงานติดตั้ง '%s'"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
-
-#: apt-pkg/cacheset.cc:615
-#, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2680,6 +2627,59 @@ msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "ไม่พบรุ่น '%s' ของ '%s'"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "ไม่พบงานติดตั้ง '%s'"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
+
+#: apt-pkg/cacheset.cc:615
+#, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2847,35 +2847,6 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
 msgid "Not locked"
 msgstr "ไม่ได้ล็อคอยู่"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liวัน %liชม. %liนาที %liวิ"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liชม. %liนาที %liวิ"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%liนาที %liวิ"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%liวิ"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "ไม่พบรายการเลือก %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3009,6 +2980,35 @@ msgstr "..."
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liวัน %liชม. %liนาที %liวิ"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liชม. %liนาที %liวิ"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liนาที %liวิ"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liวิ"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "ไม่พบรายการเลือก %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
diff --git a/po/tl.po b/po/tl.po
index d3ffb6603..5735cc957 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -533,11 +533,11 @@ msgstr "Bigo sa pagproseso ng build dependencies"
 msgid "Changelog for %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1112,252 +1112,10 @@ msgstr "Bigo ang koneksyon"
 msgid "Internal error"
 msgstr "Internal na error"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Sinusuri ang pag-upgrade... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Tapos"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Inaayos ang mga dependensiya..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ay bigo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Hindi maayos ang mga dependensiya"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Hindi mai-minimize ang upgrade set"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tapos"
-
-#: apt-private/private-cachefile.cc:108
-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."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ngunit ang %s ay nakaluklok"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ngunit ang %s ay iluluklok"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ngunit hindi ito maaaring iluklok"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ngunit ito ay birtwal na pakete"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ngunit ito ay hindi nakaluklok"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ngunit ito ay hindi iluluklok"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (dahil sa %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
-"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu iniluklok muli, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nai-downgrade, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[O/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[o/H]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error sa pag-compile ng regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1620,6 +1378,235 @@ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Inaayos ang mga dependensiya..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ay bigo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Hindi maayos ang mga dependensiya"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Hindi mai-minimize ang upgrade set"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tapos"
+
+#: apt-private/private-cachefile.cc:108
+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."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ngunit ang %s ay nakaluklok"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ngunit ang %s ay iluluklok"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ngunit hindi ito maaaring iluklok"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ngunit ito ay birtwal na pakete"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ngunit ito ay hindi nakaluklok"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ngunit ito ay hindi iluluklok"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Ang susunod na mga pakete ay iu-upgrade:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (dahil sa %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
+"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu iniluklok muli, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nai-downgrade, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[O/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[o/H]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error sa pag-compile ng regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1665,6 +1652,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Sinusuri ang pag-upgrade... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Tapos"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Tumama "
@@ -1704,8 +1704,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1713,9 +1713,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1957,11 +1957,6 @@ msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Hindi ma-stat ang %s"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2012,27 +2007,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ang driver ng paraang %s ay hindi mahanap."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-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/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2130,96 +2104,58 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Hindi akma ang versioning system ng cache"
+msgid "The method driver %s could not be found."
+msgstr "Ang driver ng paraang %s ay hindi mahanap."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-#, 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:266
-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."
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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."
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Binabasa ang Listahan ng mga Pakete"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kinukuha ang Talaksang Provides"
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Hindi makapagsulat sa %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO Error sa pag-imbak ng source cache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2303,6 +2239,72 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Hindi akma ang versioning system ng cache"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+#, 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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Binabasa ang Listahan ng mga Pakete"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Kinukuha ang Talaksang Provides"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Hindi makapagsulat sa %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO Error sa pag-imbak ng source cache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2348,6 +2350,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Hindi ma-stat ang %s"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2494,32 +2501,25 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Ginagawa ang puno ng mga dependensiya"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Pinagsasama ang magagamit na impormasyon"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2531,58 +2531,6 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
@@ -2683,6 +2631,58 @@ msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' para sa '%s' ay hindi nahanap"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
 msgid "Installing %s"
@@ -2847,35 +2847,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Piniling %s ay hindi nahanap"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3012,6 +2983,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Tapos"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Piniling %s ay hindi nahanap"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Hindi mai-mmap ang talaksang walang laman"
diff --git a/po/tr.po b/po/tr.po
index 6c4f64593..82462de74 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2013-02-18 03:41+0200\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian l10n Turkish\n"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Sürüm çizelgesi:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -534,11 +534,11 @@ msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) paketinin değişim günlüğü"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Desteklenen birimler:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1132,254 +1132,10 @@ msgstr "Bağlantı başarısız"
 msgid "Internal error"
 msgstr "İç hata"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Yükseltme hesaplanıyor... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Bitti"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Kuruldu]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "ama %s kurulu"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ama %s kurulacak"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "ama kurulabilir değil"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "ama o bir sanal paket"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "ama kurulu değil"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "ama kurulmayacak"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " ya da"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Aşağıdaki YENİ paketler kurulacak:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Aşağıdaki paketler KALDIRILACAK:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Aşağıdaki paketler yükseltilecek:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s nedeniyle) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
-"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu paket yeniden kurulacak, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu paketin sürümü düşürülecek, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[E/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[e/H]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex derleme hatası - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "'update' komutu bağımsız değişken almamaktadır"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
@@ -1653,6 +1409,237 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " başarısız oldu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Bağımlılıklar düzeltilemedi"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Yükseltme kümesi küçültülemiyor"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tamamlandı"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
+"gerekebilir."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Kuruldu]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "ama %s kurulu"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ama %s kurulacak"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "ama kurulabilir değil"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "ama o bir sanal paket"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "ama kurulu değil"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "ama kurulmayacak"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " ya da"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Aşağıdaki YENİ paketler kurulacak:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Aşağıdaki paketler KALDIRILACAK:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Aşağıdaki paketler yükseltilecek:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s nedeniyle) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
+"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu paket yeniden kurulacak, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu paketin sürümü düşürülecek, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[E/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[e/H]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex derleme hatası - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "'update' komutu bağımsız değişken almamaktadır"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1700,6 +1687,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Yükseltme hesaplanıyor... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Bitti"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Bağlandı  "
@@ -1739,8 +1739,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1748,9 +1748,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "%s okunamıyor"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1992,11 +1992,6 @@ msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s için dosya bilgisi alınamadı."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2045,28 +2040,6 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı."
 msgid "Hash mismatch for: %s"
 msgstr "Sağlama yapılamadı: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Yöntem sürücüsü %s bulunamadı."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s yöntemi düzgün şekilde başlamadı"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
-"(enter) tuşuna basın."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılamadı."
@@ -2161,93 +2134,58 @@ msgstr "seçimlik"
 msgid "extra"
 msgstr "ilave"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "İndeks dosyası türü '%s' desteklenmiyor"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı"
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Paket listeleri okunuyor"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Dosya Sağlananları Toplanıyor"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
+"(enter) tuşuna basın."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s dosyasına yazılamıyor"
+msgid "Index file type '%s' is not supported"
+msgstr "İndeks dosyası türü '%s' desteklenmiyor"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Çözücüye senaryo gönder"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Aday sürümler"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Durum bilgisi okunuyor"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı."
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2335,6 +2273,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Paket listeleri okunuyor"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Dosya Sağlananları Toplanıyor"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s dosyasına yazılamıyor"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2379,6 +2380,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız."
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s için dosya bilgisi alınamadı."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2530,31 +2536,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bağımlılık ağacı oluşturuluyor"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Aday sürümler"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Çözücüye senaryo gönder"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Durum bilgisi okunuyor"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı."
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Harici çözücüyü çalıştır"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2566,60 +2566,6 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Paket dosyası %s ayrıştırılamadı (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "'%s' görevi bulunamadı"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
-"seçilemiyor"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2732,6 +2678,60 @@ msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "'%s' görevi bulunamadı"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
+"seçilemiyor"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2909,35 +2909,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Kilitlenmemiş"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li gün %li saat %li dk. %li sn."
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li saat %li dk. %li sn."
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li dk. %li sn."
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li sn."
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s seçimi bulunamadı"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3075,6 +3046,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Bitti"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li gün %li saat %li dk. %li sn."
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li saat %li dk. %li sn."
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li dk. %li sn."
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li sn."
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s seçimi bulunamadı"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Boş dosya mmap yapılamıyor"
diff --git a/po/uk.po b/po/uk.po
index 922da3120..c25379895 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -165,7 +165,7 @@ msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -542,11 +542,11 @@ msgstr "Обробка залежностей для побудови закін
 msgid "Changelog for %s (%s)"
 msgstr "Журнал змін для %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1150,256 +1150,10 @@ msgstr "З'єднання не вдалося"
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Обчислення оновлень... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Внутрішня помилка, AllUpgrade щось поламав"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Виконано"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Незадоволені залежності. Спробуйте використати -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежності:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "але %s вже встановлений"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "але %s буде встановлений"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "але він не може бути встановлений"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "але це віртуальний пакунок"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "але він не встановлений"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "але він не буде встановлений"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " чи"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "НОВІ пакунки, які будуть встановлені:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Пакунки, які залишені в незмінному стані:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (внаслідок %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
-"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "оновлено %lu, встановлено %lu нових, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu перевстановлено, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu замінено на старіші версії, "
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Помилка компіляції регулярного виразу - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Команді update не потрібні аргументи"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1677,6 +1431,239 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " невдача."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неможливо скоригувати залежності"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неможливо мінімізувати набір оновлень"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Виконано"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Незадоволені залежності. Спробуйте використати -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежності:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "але %s вже встановлений"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "але %s буде встановлений"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "але він не може бути встановлений"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "але це віртуальний пакунок"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "але він не встановлений"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "але він не буде встановлений"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " чи"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "НОВІ пакунки, які будуть встановлені:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Пакунки, які залишені в незмінному стані:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (внаслідок %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
+"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "оновлено %lu, встановлено %lu нових, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu перевстановлено, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu замінено на старіші версії, "
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Помилка компіляції регулярного виразу - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команді update не потрібні аргументи"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1724,6 +1711,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Обчислення оновлень... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Внутрішня помилка, AllUpgrade щось поламав"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Виконано"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "В кеші "
@@ -1763,8 +1763,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1772,9 +1772,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Неможливо прочитати %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2020,11 +2020,6 @@ msgstr "Контрольна сума tar архіва невірна, архі�
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Невідомий тип заголовку TAR - %u, член %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неможливо прочитати атрибути %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2073,27 +2068,6 @@ msgstr "Неможливо знайти аутентифікаційний за�
 msgid "Hash mismatch for: %s"
 msgstr "Невідповідність хешу для: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не знайдено."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s стартував некоректно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
@@ -2187,100 +2161,57 @@ msgstr "необов'язкові (optional)"
 msgid "extra"
 msgstr "додаткові (extra)"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Тип '%s' індексного файлу не підтримується"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Кеш має несумісну систему призначення версій"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Виникла помилка під час обробки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не знайдено."
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s стартував некоректно"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Зчитування переліків пакунків"
-
-#: apt-pkg/pkgcachegen.cc:1316
-#, fuzzy
-msgid "Collecting File Provides"
-msgstr "Збирання інформації про 'File Provides'"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Неможливо записати в %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Тип '%s' індексного файлу не підтримується"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Помилка IO під час збереження кешу вихідних текстів"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежностей"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-#, fuzzy
-msgid "Send scenario to solver"
-msgstr "Відправити сценарій розв'язувачу"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версії кандидатів"
 
-#: apt-pkg/edsp.cc:234
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ґенерація залежностей"
 
-#: apt-pkg/edsp.cc:313
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Зчитування інформації про стан"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2368,6 +2299,70 @@ msgid ""
 msgstr ""
 "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "Кеш має несумісну систему призначення версій"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Виникла помилка під час обробки %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Зчитування переліків пакунків"
+
+#: apt-pkg/pkgcachegen.cc:1316
+#, fuzzy
+msgid "Collecting File Provides"
+msgstr "Збирання інформації про 'File Provides'"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Неможливо записати в %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Помилка IO під час збереження кешу вихідних текстів"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2412,6 +2407,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неможливо прочитати атрибути %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2562,31 +2562,31 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+#, fuzzy
+msgid "Send scenario to solver"
+msgstr "Відправити сценарій розв'язувачу"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
+#: apt-pkg/edsp.cc:234
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
+#: apt-pkg/edsp.cc:313
+#, fuzzy
+msgid "Prepare for receiving solution"
+msgstr "Пригодуватися до отримання розв'язку"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+#, fuzzy
+msgid "Execute external solver"
+msgstr "Виконати зовнішній розв'язувач"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2598,64 +2598,6 @@ msgstr "Неможливо проаналізувати файл пакунку
 msgid "Unable to parse package file %s (2)"
 msgstr "Неможливо проаналізувати файл пакунку %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Випуск '%s' для '%s' не знайдено"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Версія '%s' для '%s' не знайдена"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Неможливо знайти завдання '%s'"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
-"так як вони відсутні"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто "
-"віртуальним"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
-"встановлено"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2758,6 +2700,64 @@ msgstr "Невідомий тип '%s' на рядку %u в переліку д
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Випуск '%s' для '%s' не знайдено"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Версія '%s' для '%s' не знайдена"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Неможливо знайти завдання '%s'"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
+"так як вони відсутні"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто "
+"віртуальним"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
+"встановлено"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2939,35 +2939,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Не заблоковано"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liг %liхв %liс"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liг %liхв %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%liхв %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Вибір %s не знайдено"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3106,6 +3077,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... Виконано"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liг %liхв %liс"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liг %liхв %liс"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%liхв %liс"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Вибір %s не знайдено"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл"
diff --git a/po/vi.po b/po/vi.po
index a612bae4b..69a9ca5e7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2014-04-28 09:24+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -547,11 +547,11 @@ msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
 msgid "Changelog for %s (%s)"
 msgstr "Changelog cho %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "Hỗ trợ các mô-đun:"
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1190,245 +1190,10 @@ msgstr "Kết nối bị lỗi"
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Đang tính toán nâng cấp... "
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Lỗi nội bộ: Lệnh nâng cấp đã làm hỏng thứ gì đó"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Xong"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr "Đang sắp xếp"
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr "Đang liệt kê"
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Đang sửa chữa quan hệ phụ thuộc..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " gặp lỗi."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Không thể sửa phần phụ thuộc"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Xong"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "không hiểu"
-
-#: apt-private/private-output.cc:233
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[đã cài, có thể nâng cấp thành: %s]"
-
-#: apt-private/private-output.cc:237
-msgid "[installed,local]"
-msgstr "[đã cài đặt,nội bộ]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr "[đã cài,có thể tự động gỡ bỏ]"
-
-#: apt-private/private-output.cc:242
-msgid "[installed,automatic]"
-msgstr "[đã cài đặt,tự động]"
-
-#: apt-private/private-output.cc:244
-msgid "[installed]"
-msgstr "[đã cài đặt]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[có thể nâng cấp từ: %s]"
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr "[residual-config]"
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "nhưng mà %s đã được cài đặt"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "nhưng mà %s sẽ được cài đặt"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "nhưng mà nó không có khả năng cài đặt"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "nhưng mà nó là gói ảo"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "nhưng mà nó không được cài đặt"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "nhưng mà nó sẽ không được cài đặt"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " hay"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "Những gói sau sẽ bị GỠ BỎ:"
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "Những gói sau đây được giữ lại:"
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (bởi vì %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
-"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu được cài đặt lại, "
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu bị hạ cấp, "
-
-#: apt-private/private-output.cc:702
-#, 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"
-
-#: apt-private/private-output.cc:706
-#, 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"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr "[C/k]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr "[c/K]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr "C"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr "K"
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Lỗi biên dịch biểu thức chính quy - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Lệnh cập nhật không chấp nhận đối số"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "không là gói thật (ảo)"
-
 #: apt-private/private-install.cc:81
 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!"
@@ -1689,6 +1454,229 @@ msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr "Đang liệt kê"
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Đang sửa chữa quan hệ phụ thuộc..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " gặp lỗi."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa phần phụ thuộc"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Xong"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "không hiểu"
+
+#: apt-private/private-output.cc:233
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[đã cài, có thể nâng cấp thành: %s]"
+
+#: apt-private/private-output.cc:237
+msgid "[installed,local]"
+msgstr "[đã cài đặt,nội bộ]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr "[đã cài,có thể tự động gỡ bỏ]"
+
+#: apt-private/private-output.cc:242
+msgid "[installed,automatic]"
+msgstr "[đã cài đặt,tự động]"
+
+#: apt-private/private-output.cc:244
+msgid "[installed]"
+msgstr "[đã cài đặt]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[có thể nâng cấp từ: %s]"
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr "[residual-config]"
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "nhưng mà %s đã được cài đặt"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà %s sẽ được cài đặt"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "nhưng mà nó không có khả năng cài đặt"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "nhưng mà nó là gói ảo"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "nhưng mà nó không được cài đặt"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "nhưng mà nó sẽ không được cài đặt"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " hay"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "Những gói sau sẽ bị GỠ BỎ:"
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "Những gói sau đây được giữ lại:"
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (bởi vì %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
+"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nâng cấp, %lu được cài đặt mới, "
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu được cài đặt lại, "
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu bị hạ cấp, "
+
+#: apt-private/private-output.cc:702
+#, 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"
+
+#: apt-private/private-output.cc:706
+#, 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"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr "[C/k]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr "[c/K]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr "C"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr "K"
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Lỗi biên dịch biểu thức chính quy - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Lệnh cập nhật không chấp nhận đối số"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "không là gói thật (ảo)"
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1736,6 +1724,18 @@ msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “a
 msgid "Full Text Search"
 msgstr "Tìm kiếm toàn văn"
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Đang tính toán nâng cấp... "
+
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Lỗi nội bộ: Lệnh nâng cấp đã làm hỏng thứ gì đó"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Xong"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Tìm thấy "
@@ -1775,8 +1775,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1784,9 +1784,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "Không thể đọc %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -2025,11 +2025,6 @@ msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Không thể lấy trạng thái về %s."
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -2080,26 +2075,6 @@ msgstr "Không tìm thấy bản ghi xác thực cho: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Sai khớp chuỗi duy nhất cho: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Không tìm thấy trình điều khiển phương thức %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Gói “%s” đã được cài đặt chưa?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Phương thức %s đã không khởi chạy đúng đắn."
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
-
 #: apt-pkg/cachefile.cc:94
 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."
@@ -2195,93 +2170,56 @@ msgstr "tùy chọn"
 msgid "extra"
 msgstr "bổ sung"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
-
-#: apt-pkg/pkgcachegen.cc:93
-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"
+msgid "The method driver %s could not be found."
+msgstr "Không tìm thấy trình điều khiển phương thức %s."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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ý."
+msgid "Is the package %s installed?"
+msgstr "Gói “%s” đã được cài đặt chưa?"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, 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ý quan hệ phụ thuộc của tập tin"
+msgid "Method %s did not start correctly"
+msgstr "Phương thức %s đã không khởi chạy đúng đắn."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Đang đọc các danh sách gói"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Không thể ghi vào %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Đang xây dựng cây quan hệ phụ thuộc"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr "Gửi kịch bản đến bộ phân giải"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Tạo ra quan hệ phụ thuộc"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Đang đọc thông tin về tình trạng"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2370,6 +2308,69 @@ 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/pkgcachegen.cc:93
+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"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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ý quan hệ phụ thuộc của tập tin"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Đang đọc các danh sách gói"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Không thể ghi vào %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2415,6 +2416,11 @@ 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)"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Không thể lấy trạng thái về %s."
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2564,31 +2570,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Đang xây dựng cây quan hệ phụ thuộc"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Phiên bản ứng cử"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr "Gửi kịch bản đến bộ phân giải"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Tạo ra quan hệ phụ thuộc"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr "Gửi yêu cầu đến bộ phân giải"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Đang đọc thông tin về tình trạng"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr "Thi hành bộ phân giải từ bên ngoài"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2600,62 +2600,6 @@ msgstr "Không thể phân tích tập tin gói %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Không thể phân tích tập tin gói %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, 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”"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Không tìm thấy phiên bản “%s” cho “%s”"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Không tìm thấy tác vụ “%s”"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
-
-#: apt-pkg/cacheset.cc:615
-#, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Không tìm thấy gói nào theo đường dẫn “%s”"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” "
-"mà không có trong nó"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài "
-"đặt"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2768,6 +2712,62 @@ msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
 
+#: apt-pkg/cacheset.cc:489
+#, 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”"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Không tìm thấy phiên bản “%s” cho “%s”"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Không tìm thấy tác vụ “%s”"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
+
+#: apt-pkg/cacheset.cc:615
+#, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Không tìm thấy gói nào theo đường dẫn “%s”"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” "
+"mà không có trong nó"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài "
+"đặt"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2945,35 +2945,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Chưa được khoá"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li ngày %li giờ %li phút %li giây"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li giờ %li phút %li giây"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li phút %li giây"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li giây"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "Không tìm thấy vùng chọn %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -3111,6 +3082,35 @@ msgstr "..."
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li ngày %li giờ %li phút %li giây"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li giờ %li phút %li giây"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li phút %li giây"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li giây"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng chọn %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4e6c51bd5..e7e1b3cfe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+0200\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -157,7 +157,7 @@ msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -522,11 +522,11 @@ msgstr "无法处理构建依赖关系"
 msgid "Changelog for %s (%s)"
 msgstr "正在连接 %s (%s)"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "支持的模块："
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1097,249 +1097,10 @@ msgstr "连接失败"
 msgid "Internal error"
 msgstr "内部错误"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "内部错误，全部升级工具坏事了"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "完成"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失败。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系："
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr " 或"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装："
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】："
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变："
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级："
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】："
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变："
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"【警告】：下列基础软件包将被卸载。\n"
-"请勿尝试，除非您确实知道您在做什么！"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包，"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包，"
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
@@ -1588,6 +1349,232 @@ msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr " [已安装]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系："
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "但无法安装它"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr " 或"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装："
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】："
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变："
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级："
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】："
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变："
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (是由于 %s) "
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"【警告】：下列基础软件包将被卸载。\n"
+"请勿尝试，除非您确实知道您在做什么！"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1634,6 +1621,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "正在对升级进行计算... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "内部错误，全部升级工具坏事了"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "完成"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "命中 "
@@ -1673,8 +1673,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1682,9 +1682,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1921,11 +1921,6 @@ msgstr "Tar 的校验和不符，文件已损坏"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1974,26 +1969,6 @@ msgstr "无法找到认证记录：%s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
@@ -2088,93 +2063,56 @@ msgstr "可选"
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (FindPkg)时出错"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "无法读取或写入软件源缓存"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2256,6 +2194,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (FindPkg)时出错"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "无法获取源软件包列表 %s 的状态"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集文件所提供的软件包"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2300,6 +2301,11 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2448,31 +2454,25 @@ msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候选版本"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2484,58 +2484,6 @@ msgstr "无法解析软件包文件 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "无法找到任务 %s"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "因为软件包 %s 没有候选版本，无法进行选择"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2636,6 +2584,58 @@ msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”发布版本"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”版本"
+
+#: apt-pkg/cacheset.cc:603
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"
+
+#: apt-pkg/cacheset.cc:609
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2801,35 +2801,6 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 msgid "Not locked"
 msgstr "未锁定"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2963,6 +2934,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... 完成"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 68dbb1f48..7fd5c6176 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-11 14:52+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."
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1589 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43
 #: cmdline/apt-sortpkgs.cc:147
@@ -517,11 +517,11 @@ msgstr "無法處理編譯相依關係"
 msgid "Changelog for %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1594
 msgid "Supported modules:"
 msgstr "已支援模組："
 
-#: cmdline/apt-get.cc:1632
+#: cmdline/apt-get.cc:1635
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1090,252 +1090,10 @@ msgstr "連線失敗"
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "籌備升級中... "
-
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "內部錯誤，AllUpgrade 造成了損壞"
-
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "完成"
-
 #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
 msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "正在修正相依關係..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失敗。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "無法修正相依關係"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "無法將升級計劃最小化"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
-
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "未能滿足相依關係。試試 -f 選項。"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:233
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:237
-#, fuzzy
-msgid "[installed,local]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:240
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:242
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:244
-#, fuzzy
-msgid "[installed]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:248
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:252
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:352
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有未滿足的相依關係："
-
-#: apt-private/private-output.cc:442
-#, c-format
-msgid "but %s is installed"
-msgstr "但 %s 卻已安裝"
-
-#: apt-private/private-output.cc:444
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但 %s 卻將被安裝"
-
-#: apt-private/private-output.cc:451
-msgid "but it is not installable"
-msgstr "但它卻無法安裝"
-
-#: apt-private/private-output.cc:453
-msgid "but it is a virtual package"
-msgstr "但它是虛擬套件"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not installed"
-msgstr "但它卻尚未安裝"
-
-#: apt-private/private-output.cc:456
-msgid "but it is not going to be installed"
-msgstr "但它卻將不會被安裝"
-
-#: apt-private/private-output.cc:461
-msgid " or"
-msgstr "或"
-
-#: apt-private/private-output.cc:490
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】套件將會被安裝："
-
-#: apt-private/private-output.cc:516
-msgid "The following packages will be REMOVED:"
-msgstr "下列套件將會被【移除】："
-
-#: apt-private/private-output.cc:538
-msgid "The following packages have been kept back:"
-msgstr "下列套件將會維持其原有版本："
-
-#: apt-private/private-output.cc:559
-msgid "The following packages will be upgraded:"
-msgstr "下列套件將會被升級："
-
-#: apt-private/private-output.cc:580
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列套件將會被【降級】："
-
-#: apt-private/private-output.cc:600
-msgid "The following held packages will be changed:"
-msgstr "下列被保留 (hold) 的套件將會被更改："
-
-#: apt-private/private-output.cc:655
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s（因為 %s）"
-
-#: apt-private/private-output.cc:663
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"【警告】：下列的基本套件都將被移除。\n"
-"除非您很清楚您在做什麼，否則請勿輕易嘗試！"
-
-#: apt-private/private-output.cc:694
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升級 %lu 個，新安裝 %lu 個，"
-
-#: apt-private/private-output.cc:698
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安裝 %lu 個，"
-
-#: apt-private/private-output.cc:700
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降級 %lu 個，"
-
-#: apt-private/private-output.cc:702
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
-
-#: apt-private/private-output.cc:706
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個沒有完整得安裝或移除。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:728
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:734
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:745
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:751
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "編譯正規表示式時發生錯誤 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 指令不需任何參數"
-
-#: apt-private/private-update.cc:90
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
@@ -1591,6 +1349,235 @@ msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 
+#: apt-private/private-list.cc:131
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:164
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "正在修正相依關係..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "無法修正相依關係"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "無法將升級計劃最小化"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
+
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
+msgstr "未能滿足相依關係。試試 -f 選項。"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:352
+msgid "The following packages have unmet dependencies:"
+msgstr "下列的套件有未滿足的相依關係："
+
+#: apt-private/private-output.cc:442
+#, c-format
+msgid "but %s is installed"
+msgstr "但 %s 卻已安裝"
+
+#: apt-private/private-output.cc:444
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但 %s 卻將被安裝"
+
+#: apt-private/private-output.cc:451
+msgid "but it is not installable"
+msgstr "但它卻無法安裝"
+
+#: apt-private/private-output.cc:453
+msgid "but it is a virtual package"
+msgstr "但它是虛擬套件"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not installed"
+msgstr "但它卻尚未安裝"
+
+#: apt-private/private-output.cc:456
+msgid "but it is not going to be installed"
+msgstr "但它卻將不會被安裝"
+
+#: apt-private/private-output.cc:461
+msgid " or"
+msgstr "或"
+
+#: apt-private/private-output.cc:490
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】套件將會被安裝："
+
+#: apt-private/private-output.cc:516
+msgid "The following packages will be REMOVED:"
+msgstr "下列套件將會被【移除】："
+
+#: apt-private/private-output.cc:538
+msgid "The following packages have been kept back:"
+msgstr "下列套件將會維持其原有版本："
+
+#: apt-private/private-output.cc:559
+msgid "The following packages will be upgraded:"
+msgstr "下列套件將會被升級："
+
+#: apt-private/private-output.cc:580
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列套件將會被【降級】："
+
+#: apt-private/private-output.cc:600
+msgid "The following held packages will be changed:"
+msgstr "下列被保留 (hold) 的套件將會被更改："
+
+#: apt-private/private-output.cc:655
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s（因為 %s）"
+
+#: apt-private/private-output.cc:663
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"【警告】：下列的基本套件都將被移除。\n"
+"除非您很清楚您在做什麼，否則請勿輕易嘗試！"
+
+#: apt-private/private-output.cc:694
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升級 %lu 個，新安裝 %lu 個，"
+
+#: apt-private/private-output.cc:698
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安裝 %lu 個，"
+
+#: apt-private/private-output.cc:700
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降級 %lu 個，"
+
+#: apt-private/private-output.cc:702
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
+
+#: apt-private/private-output.cc:706
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個沒有完整得安裝或移除。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:728
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:734
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:745
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:751
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "編譯正規表示式時發生錯誤 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 指令不需任何參數"
+
+#: apt-private/private-update.cc:90
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
 #: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
@@ -1634,6 +1621,19 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "籌備升級中... "
+
+#: apt-private/private-upgrade.cc:30
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "內部錯誤，AllUpgrade 造成了損壞"
+
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "完成"
+
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "已有 "
@@ -1673,8 +1673,8 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/clean.cc:40
-#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:491 apt-pkg/clean.cc:40
 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
@@ -1682,9 +1682,9 @@ msgstr ""
 msgid "Unable to read %s"
 msgstr "無法讀取 %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:46
-#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1923,11 +1923,6 @@ msgstr "Tar checksum 失敗，套件檔已損毀"
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 標頭類型 %u，成員 %s"
 
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr "無法取得 %s 的狀態。"
-
 #: apt-pkg/install-progress.cc:57
 #, c-format
 msgid "Progress: [%3i%%]"
@@ -1976,26 +1971,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式的驅動程式 %s。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "安裝方式 %s 沒有正確啟動"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
-
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "無法分析或開啟套件清單或狀況檔。"
@@ -2090,93 +2065,56 @@ msgstr "次要"
 msgid "extra"
 msgstr "額外"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不被支援的索引檔類型 '%s'"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "快取使用的是不相容的版本系統"
+msgid "The method driver %s could not be found."
+msgstr "找不到安裝方式的驅動程式 %s。"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
+msgid "Is the package %s installed?"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "在計算檔案相依性時找不到套件 %s %s"
+msgid "Method %s did not start correctly"
+msgstr "安裝方式 %s 沒有正確啟動"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "無法取得來源套件列表 %s 的狀態"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在讀取套件清單"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集檔案提供者"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "無法寫入 %s"
+msgid "Index file type '%s' is not supported"
+msgstr "不被支援的索引檔類型 '%s'"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "在儲存來源快取時 IO 錯誤"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在重建相依關係"
 
-#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候選版本"
 
-#: apt-pkg/edsp.cc:234
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "建立相依關係"
 
-#: apt-pkg/edsp.cc:313
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在讀取狀態資料"
 
-#: apt-pkg/edsp.cc:320
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
 
-#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2257,6 +2195,69 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "快取使用的是不相容的版本系統"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "在計算檔案相依性時找不到套件 %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "無法取得來源套件列表 %s 的狀態"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "正在讀取套件清單"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集檔案提供者"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "在儲存來源快取時 IO 錯誤"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2300,6 +2301,11 @@ msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"
 
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "無法取得 %s 的狀態。"
+
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2439,31 +2445,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在重建相依關係"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候選版本"
+#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "建立相依關係"
+#: apt-pkg/edsp.cc:234
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在讀取狀態資料"
+#: apt-pkg/edsp.cc:313
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
+#: apt-pkg/edsp.cc:320
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
+#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2475,58 +2475,6 @@ msgstr "無法辨識套件檔 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件檔 %s (2)"
 
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "找不到 '%s' 版的 '%s'"
-
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "無法找到主題 %s"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "無法找到套件 %s"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "無法找到套件 %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "Unable to parse Release file %s"
@@ -2627,6 +2575,58 @@ msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
 
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
+
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "找不到 '%s' 版的 '%s'"
+
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "無法找到主題 %s"
+
+#: apt-pkg/cacheset.cc:609
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "無法找到套件 %s"
+
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "無法找到套件 %s"
+
+#: apt-pkg/cacheset.cc:626
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:647
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:655
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:663
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
 #: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Installing %s"
@@ -2791,35 +2791,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr "選項 %s 找不到"
-
 #: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2953,6 +2924,35 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s... 完成"
 
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1236
+#, c-format
+msgid "Selection %s not found"
+msgstr "選項 %s 找不到"
+
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "不能 mmap 空白檔案"