cachefile.cc: Do not ignore return value of pkgDepCache::Init()

[apt.git] / po / apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 664965900bb78928cccde3a088dcb5ffb43a1d7f..4a70213f406dd757f1e14f01aca9985ee485377b 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt 1.0.8\n"
+"Project-Id-Version: apt 1.0.9.7\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2014-09-09 20:35+0200\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -21,148 +21,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320

 msgid "Total package names: "
 msgstr ""
 
 msgid "Total package names: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322

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

-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362

 msgid "  Normal packages: "
 msgstr ""
 
 msgid "  Normal packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363

 msgid "  Pure virtual packages: "
 msgstr ""
 
 msgid "  Pure virtual packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364

 msgid "  Single virtual packages: "
 msgstr ""
 
 msgid "  Single virtual packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365

 msgid "  Mixed virtual packages: "
 msgstr ""
 
 msgid "  Mixed virtual packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366

 msgid "  Missing: "
 msgstr ""
 
 msgid "  Missing: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368

 msgid "Total distinct versions: "
 msgstr ""
 
 msgid "Total distinct versions: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370

 msgid "Total distinct descriptions: "
 msgstr ""
 
 msgid "Total distinct descriptions: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372

 msgid "Total dependencies: "
 msgstr ""
 
 msgid "Total dependencies: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375

 msgid "Total ver/file relations: "
 msgstr ""
 
 msgid "Total ver/file relations: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377

 msgid "Total Desc/File relations: "
 msgstr ""
 
 msgid "Total Desc/File relations: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379

 msgid "Total Provides mappings: "
 msgstr ""
 
 msgid "Total Provides mappings: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433

 msgid "Total globbed strings: "
 msgstr ""
 
 msgid "Total globbed strings: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439

 msgid "Total slack space: "
 msgstr ""
 
 msgid "Total slack space: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454

 msgid "Total space accounted for: "
 msgstr ""
 
 msgid "Total space accounted for: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239

 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 

-#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229

 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr ""
 
 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41

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

-#: cmdline/apt-cache.cc:1421
+#: cmdline/apt-cache.cc:1505

 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 

-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653

 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630

 msgid "Package files:"
 msgstr ""
 
 msgid "Package files:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1567
+#: cmdline/apt-cache.cc:1651

 msgid "Pinned packages:"
 msgstr ""
 
 msgid "Pinned packages:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708

 msgid "(not found)"
 msgstr ""
 
 msgid "(not found)"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671

 msgid "  Installed: "
 msgstr ""
 
 msgid "  Installed: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672

 msgid "  Candidate: "
 msgstr ""
 
 msgid "  Candidate: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705

 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714

 msgid "  Version table:"
 msgstr ""
 
 msgid "  Version table:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1750
+#: cmdline/apt-cache.cc:1834

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"


@@ -199,20 +195,20 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77

 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:91
-msgid "Please insert a Disc in the drive and press enter"
+#: cmdline/apt-cdrom.cc:92
+msgid "Please insert a Disc in the drive and press [Enter]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140

 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179

 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point.\n"
 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point.\n"


@@ -220,7 +216,7 @@ msgid ""
 "mount point."
 msgstr ""
 
 "mount point."
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 


@@ -244,78 +240,78 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224

 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311

 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314

 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358

 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414

 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445

 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:863

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80

 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124

 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 

-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598

 msgid "Unable to lock the download directory"
 msgstr ""
 
 msgid "Unable to lock the download directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 

-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:780

 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785

 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"


@@ -323,151 +319,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:843
+#: cmdline/apt-get.cc:833

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: 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
 #. 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:891
+#: cmdline/apt-get.cc:863

 #, 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
 #, 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:896
+#: cmdline/apt-get.cc:868

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:902
+#: cmdline/apt-get.cc:874

 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:920
+#: cmdline/apt-get.cc:899

 msgid "Failed to fetch some archives."
 msgstr ""
 
 msgid "Failed to fetch some archives."
 msgstr ""
 

-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289

 msgid "Download complete and in download only mode"
 msgstr ""
 
 msgid "Download complete and in download only mode"
 msgstr ""
 

-#: cmdline/apt-get.cc:950
+#: cmdline/apt-get.cc:929

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:942

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:964
+#: cmdline/apt-get.cc:943

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:971

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:990

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1009

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:1055
+#: cmdline/apt-get.cc:1030

 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 

-#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1102
+#: cmdline/apt-get.cc:1109

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1272
+#: cmdline/apt-get.cc:1279

 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 

-#: cmdline/apt-get.cc:1290
+#: cmdline/apt-get.cc:1297

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1320

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:1352
+#: cmdline/apt-get.cc:1359

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
 #, 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:1358
+#: cmdline/apt-get.cc:1365

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 

-#: cmdline/apt-get.cc:1381
+#: cmdline/apt-get.cc:1388

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1403

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1408

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516

 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 

-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1615

 msgid "Supported modules:"
 msgstr ""
 
 msgid "Supported modules:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1633
+#: cmdline/apt-get.cc:1656

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


@@ -521,11 +516,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 

-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79

 msgid "Download Failed"
 msgstr ""
 
 msgid "Download Failed"
 msgstr ""
 

-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:93

 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"


@@ -539,53 +534,53 @@ msgid ""
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65

 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71

 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73

 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238

 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240

 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1272
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
+#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 

-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380

 #, c-format
 msgid "%s set on hold.\n"
 msgstr ""
 
 #, c-format
 msgid "%s set on hold.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385

 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr ""
 
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403

 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 

-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450

 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"


@@ -658,16 +653,16 @@ msgstr ""
 msgid "Disk not found."
 msgstr ""
 
 msgid "Disk not found."
 msgstr ""
 

-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281

 msgid "File not found"
 msgstr ""
 
 msgid "File not found"
 msgstr ""
 

-#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598

 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 

-#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605

 msgid "Failed to set modification time"
 msgstr ""
 
 msgid "Failed to set modification time"
 msgstr ""
 


@@ -676,156 +671,156 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:177
+#: methods/ftp.cc:178

 msgid "Logging in"
 msgstr ""
 
 msgid "Logging in"
 msgstr ""
 

-#: methods/ftp.cc:183
+#: methods/ftp.cc:184

 msgid "Unable to determine the peer name"
 msgstr ""
 
 msgid "Unable to determine the peer name"
 msgstr ""
 

-#: methods/ftp.cc:188
+#: methods/ftp.cc:189

 msgid "Unable to determine the local name"
 msgstr ""
 
 msgid "Unable to determine the local name"
 msgstr ""
 

-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248

 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 

-#: methods/ftp.cc:225
+#: methods/ftp.cc:226

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:232
+#: methods/ftp.cc:233

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:252
+#: methods/ftp.cc:253

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 

-#: methods/ftp.cc:280
+#: methods/ftp.cc:281

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:306
+#: methods/ftp.cc:307

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243

 msgid "Connection timeout"
 msgstr ""
 
 msgid "Connection timeout"
 msgstr ""
 

-#: methods/ftp.cc:350
+#: methods/ftp.cc:351

 msgid "Server closed the connection"
 msgstr ""
 
 msgid "Server closed the connection"
 msgstr ""
 

-#: 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
+#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
+#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
+#: apt-pkg/contrib/fileutl.cc:1531

 msgid "Read error"
 msgstr ""
 
 msgid "Read error"
 msgstr ""
 

-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209

 msgid "A response overflowed the buffer."
 msgstr ""
 
 msgid "A response overflowed the buffer."
 msgstr ""
 

-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390

 msgid "Protocol corruption"
 msgstr ""
 
 msgid "Protocol corruption"
 msgstr ""
 

-#: 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
+#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
+#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
+#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
+#: apt-pkg/contrib/fileutl.cc:1678

 msgid "Write error"
 msgstr ""
 
 msgid "Write error"
 msgstr ""
 

-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743

 msgid "Could not create a socket"
 msgstr ""
 
 msgid "Could not create a socket"
 msgstr ""
 

-#: methods/ftp.cc:712
+#: methods/ftp.cc:713

 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 

-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116

 msgid "Failed"
 msgstr ""
 
 msgid "Failed"
 msgstr ""
 

-#: methods/ftp.cc:718
+#: methods/ftp.cc:719

 msgid "Could not connect passive socket."
 msgstr ""
 
 msgid "Could not connect passive socket."
 msgstr ""
 

-#: methods/ftp.cc:735
+#: methods/ftp.cc:736

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 

-#: methods/ftp.cc:749
+#: methods/ftp.cc:750

 msgid "Could not bind a socket"
 msgstr ""
 
 msgid "Could not bind a socket"
 msgstr ""
 

-#: methods/ftp.cc:753
+#: methods/ftp.cc:754

 msgid "Could not listen on the socket"
 msgstr ""
 
 msgid "Could not listen on the socket"
 msgstr ""
 

-#: methods/ftp.cc:760
+#: methods/ftp.cc:761

 msgid "Could not determine the socket's name"
 msgstr ""
 
 msgid "Could not determine the socket's name"
 msgstr ""
 

-#: methods/ftp.cc:792
+#: methods/ftp.cc:793

 msgid "Unable to send PORT command"
 msgstr ""
 
 msgid "Unable to send PORT command"
 msgstr ""
 

-#: methods/ftp.cc:802
+#: methods/ftp.cc:803

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 

-#: methods/ftp.cc:811
+#: methods/ftp.cc:812

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:831
+#: methods/ftp.cc:832

 msgid "Data socket connect timed out"
 msgstr ""
 
 msgid "Data socket connect timed out"
 msgstr ""
 

-#: methods/ftp.cc:838
+#: methods/ftp.cc:839

 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 

-#: methods/ftp.cc:890
+#: methods/ftp.cc:892

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 

-#: methods/ftp.cc:905 methods/rsh.cc:335
+#: methods/ftp.cc:907 methods/rsh.cc:338

 msgid "Data socket timed out"
 msgstr ""
 
 msgid "Data socket timed out"
 msgstr ""
 

-#: methods/ftp.cc:935
+#: methods/ftp.cc:944

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information

-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027

 msgid "Query"
 msgstr ""
 
 msgid "Query"
 msgstr ""
 

-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141

 msgid "Unable to invoke "
 msgstr ""
 
 msgid "Unable to invoke "
 msgstr ""
 


@@ -861,7 +856,7 @@ msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:154 methods/rsh.cc:439
+#: methods/connect.cc:154 methods/rsh.cc:442

 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 #, c-format
 msgid "Connecting to %s"
 msgstr ""


@@ -891,70 +886,70 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 

-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164

 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'

-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170

 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 

-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174

 msgid "Unknown error executing apt-key"
 msgstr ""
 
 msgid "Unknown error executing apt-key"
 msgstr ""
 

-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214

 msgid "The following signatures were invalid:\n"
 msgstr ""
 
 msgid "The following signatures were invalid:\n"
 msgstr ""
 

-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 

-#: methods/gzip.cc:69
+#: methods/gzip.cc:79

 msgid "Empty files can't be valid archives"
 msgstr ""
 
 msgid "Empty files can't be valid archives"
 msgstr ""
 

-#: methods/http.cc:511
+#: methods/http.cc:517

 msgid "Error writing to the file"
 msgstr ""
 
 msgid "Error writing to the file"
 msgstr ""
 

-#: methods/http.cc:525
+#: methods/http.cc:531

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 

-#: methods/http.cc:527
+#: methods/http.cc:533

 msgid "Error reading from server"
 msgstr ""
 
 msgid "Error reading from server"
 msgstr ""
 

-#: methods/http.cc:563
+#: methods/http.cc:569

 msgid "Error writing to file"
 msgstr ""
 
 msgid "Error writing to file"
 msgstr ""
 

-#: methods/http.cc:623
+#: methods/http.cc:629

 msgid "Select failed"
 msgstr ""
 
 msgid "Select failed"
 msgstr ""
 

-#: methods/http.cc:628
+#: methods/http.cc:634

 msgid "Connection timed out"
 msgstr ""
 
 msgid "Connection timed out"
 msgstr ""
 

-#: methods/http.cc:651
+#: methods/http.cc:657

 msgid "Error writing to output file"
 msgstr ""
 
 msgid "Error writing to output file"
 msgstr ""
 


@@ -962,193 +957,348 @@ msgstr ""
 msgid "Waiting for headers"
 msgstr ""
 
 msgid "Waiting for headers"
 msgstr ""
 

-#: methods/server.cc:110
+#: methods/server.cc:111

 msgid "Bad header line"
 msgstr ""
 
 msgid "Bad header line"
 msgstr ""
 

-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143

 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/server.cc:172
+#: methods/server.cc:173

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 

-#: methods/server.cc:195
+#: methods/server.cc:193

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 

-#: methods/server.cc:197
+#: methods/server.cc:195

 msgid "This HTTP server has broken range support"
 msgstr ""
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 

-#: methods/server.cc:221
+#: methods/server.cc:219

 msgid "Unknown date format"
 msgstr ""
 
 msgid "Unknown date format"
 msgstr ""
 

-#: methods/server.cc:490
+#: methods/server.cc:506

 msgid "Bad header data"
 msgstr ""
 
 msgid "Bad header data"
 msgstr ""
 

-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:523 methods/server.cc:617

 msgid "Connection failed"
 msgstr ""
 
 msgid "Connection failed"
 msgstr ""
 

-#: methods/server.cc:655
+#: methods/server.cc:589
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""
+
+#: methods/server.cc:712

 msgid "Internal error"
 msgstr ""
 
 msgid "Internal error"
 msgstr ""
 

-#: apt-private/acqprogress.cc:66
-msgid "Hit "
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, 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:95
+msgid "Correcting dependencies..."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:113
+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:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:90
-msgid "Get:"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:121
-msgid "Ign "
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:125
-msgid "Err "
+#: apt-private/private-output.cc:274
+msgid "[installed]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:146
+#: apt-private/private-output.cc:277

 #, c-format
 #, c-format

-msgid "Fetched %sB in %s (%sB/s)\n"
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:236
+#: apt-private/private-output.cc:455

 #, c-format
 #, c-format

-msgid " [Working]"
+msgid "but %s is installed"
+msgstr ""
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr ""
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr ""
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr ""
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr ""
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr ""
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr ""
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr ""
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:297
+#: apt-private/private-output.cc:688

 #, c-format
 #, c-format

+msgid "%s (due to %s)"
+msgstr ""
+
+#: apt-private/private-output.cc:696

 msgid ""
 msgid ""

-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:96
-msgid " failed."
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:104
-msgid " Done"
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
+#. 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:761
+msgid "[Y/n]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
+#. 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:767
+msgid "[y/N]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: apt-private/private-update.cc:95
+#, 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-update.cc:99
+msgid "All packages are up to date."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
-msgid "There are problems and -y was used without --force-yes"
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-show.cc:156

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
+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"
+"      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 ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:82
+#: apt-private/private-install.cc:81

 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 

-#: apt-private/private-install.cc:91
+#: apt-private/private-install.cc:90

 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 

-#: apt-private/private-install.cc:110
+#: apt-private/private-install.cc:109

 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 

-#: apt-private/private-install.cc:148
+#: apt-private/private-install.cc:147

 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 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
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 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

-#: apt-private/private-install.cc:155
+#: apt-private/private-install.cc:154

 #, c-format
 msgid "Need to get %sB/%sB of 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
 #, c-format
 msgid "Need to get %sB/%sB of 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

-#: apt-private/private-install.cc:160
+#: apt-private/private-install.cc:159

 #, c-format
 msgid "Need to get %sB of 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
 #, c-format
 msgid "Need to get %sB of 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

-#: apt-private/private-install.cc:167
+#: apt-private/private-install.cc:166

 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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

-#: apt-private/private-install.cc:172
+#: apt-private/private-install.cc:171

 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 

-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213

 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)

-#: apt-private/private-install.cc:220
+#: apt-private/private-install.cc:195

 msgid "Yes, do as I say!"
 msgstr ""
 
 msgid "Yes, do as I say!"
 msgstr ""
 

-#: apt-private/private-install.cc:222
+#: apt-private/private-install.cc:197

 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"


@@ -1156,37 +1306,37 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221

 msgid "Abort."
 msgstr ""
 
 msgid "Abort."
 msgstr ""
 

-#: apt-private/private-install.cc:243
+#: apt-private/private-install.cc:218

 msgid "Do you want to continue?"
 msgstr ""
 
 msgid "Do you want to continue?"
 msgstr ""
 

-#: apt-private/private-install.cc:313
+#: apt-private/private-install.cc:288

 msgid "Some files failed to download"
 msgstr ""
 
 msgid "Some files failed to download"
 msgstr ""
 

-#: apt-private/private-install.cc:320
+#: apt-private/private-install.cc:295

 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 

-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:299

 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 

-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:304

 msgid "Unable to correct missing packages."
 msgstr ""
 
 msgid "Unable to correct missing packages."
 msgstr ""
 

-#: apt-private/private-install.cc:330
+#: apt-private/private-install.cc:305

 msgid "Aborting install."
 msgstr ""
 
 msgid "Aborting install."
 msgstr ""
 

-#: apt-private/private-install.cc:366
+#: apt-private/private-install.cc:341

 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"


@@ -1196,15 +1346,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-install.cc:370
+#: apt-private/private-install.cc:345

 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 

-#: apt-private/private-install.cc:391
+#: apt-private/private-install.cc:366

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: apt-private/private-install.cc:499
+#: apt-private/private-install.cc:474

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1220,15 +1370,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
 #. "that package should be filed.") << std::endl;
 #. }
 #.

-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 

-#: apt-private/private-install.cc:506
+#: apt-private/private-install.cc:481

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 

-#: apt-private/private-install.cc:513
+#: apt-private/private-install.cc:488

 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""


@@ -1237,7 +1387,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492

 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""


@@ -1245,23 +1395,23 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:494

 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587

 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 

-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 

-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612

 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"
 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"


@@ -1269,307 +1419,167 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633

 msgid "Broken packages"
 msgstr ""
 
 msgid "Broken packages"
 msgstr ""
 

-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710

 msgid "The following extra packages will be installed:"
 msgstr ""
 
 msgid "The following extra packages will be installed:"
 msgstr ""
 

-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800

 msgid "Suggested packages:"
 msgstr ""
 
 msgid "Suggested packages:"
 msgstr ""
 

-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801

 msgid "Recommended packages:"
 msgstr ""
 
 msgid "Recommended packages:"
 msgstr ""
 

-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 

-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827

 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 

-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 

-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844

 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 

-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892

 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 

-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897

 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #, 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:941
+#: apt-private/private-install.cc:939

 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 

-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945

 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 

-#: apt-private/private-list.cc:129
-msgid "Listing"
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-list.cc:159
-#, 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-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+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-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr ""
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr ""
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:455
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77

 #, c-format
 #, c-format

-msgid "but %s is installed"
+msgid "Failed to fetch %s  %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:457
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174

 #, c-format
 #, c-format

-msgid "but %s is to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr ""
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr ""
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr ""
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr ""
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr ""
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr ""
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
+msgid "Couldn't determine free space in %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:688
+#: apt-private/private-download.cc:188

 #, c-format
 #, c-format

-msgid "%s (due to %s) "
-msgstr ""
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+msgid "You don't have enough free space in %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:727
+#: apt-private/private-sources.cc:58

 #, c-format
 #, c-format

-msgid "%lu upgraded, %lu newly installed, "
+msgid "Failed to parse %s. Edit again? "

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:731
+#: apt-private/private-sources.cc:70

 #, c-format
 #, c-format

-msgid "%lu reinstalled, "
+msgid "Your '%s' file changed, please run 'apt-get update'."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:735
+#: apt-private/acqprogress.cc:66

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
+msgid "Hit:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:739
+#: apt-private/acqprogress.cc:88

 #, c-format
 #, 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:761
-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:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
+msgid "Get:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/acqprogress.cc:119

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+msgid "Ign:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-show.cc:156
+#: apt-private/acqprogress.cc:126

 #, c-format
 #, 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)"
+msgid "Err:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-sources.cc:58
+#: apt-private/acqprogress.cc:150

 #, c-format
 #, c-format

-msgid "Failed to parse %s. Edit again? "
+msgid "Fetched %sB in %s (%sB/s)\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-sources.cc:70
+#: apt-private/acqprogress.cc:240

 #, c-format
 #, c-format

-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
+msgid " [Working]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-update.cc:90
+#: apt-private/acqprogress.cc:301

 #, c-format
 #, 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-update.cc:94
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr ""
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
+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.
 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:494
-#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
-#: 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:368
-#: apt-pkg/contrib/fileutl.cc:481
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471

 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 

-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201

 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"


@@ -1603,7 +1613,7 @@ msgstr ""
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 

-#: methods/rsh.cc:343
+#: methods/rsh.cc:346

 msgid "Connection closed prematurely"
 msgstr ""
 
 msgid "Connection closed prematurely"
 msgstr ""
 


@@ -1613,7 +1623,7 @@ msgstr ""
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45

-msgid "Press enter to continue."
+msgid "Press [Enter] to continue."

 msgstr ""
 
 #: dselect/install:92
 msgstr ""
 
 #: dselect/install:92


@@ -1641,7 +1651,7 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
 msgid "Merging available information"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:224
+#: cmdline/apt-extracttemplates.cc:229

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"


@@ -1655,45 +1665,46 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:254
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092

 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097

 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:300
+#: cmdline/apt-extracttemplates.cc:305

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370

 msgid "Package extension list is too long"
 msgstr ""
 
 msgid "Package extension list is too long"
 msgstr ""
 

-#: 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
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318

 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 
 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280

 msgid "Source extension list is too long"
 msgstr ""
 
 msgid "Source extension list is too long"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400

 msgid "Error writing header to contents file"
 msgstr ""
 
 msgid "Error writing header to contents file"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430

 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -1735,135 +1746,135 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821

 msgid "No selections matched"
 msgstr ""
 
 msgid "No selections matched"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906

 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 

-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:67

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 

-#: ftparchive/cachedb.cc:83
+#: ftparchive/cachedb.cc:85

 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 

-#: ftparchive/cachedb.cc:94
+#: ftparchive/cachedb.cc:96

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

-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:101

 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr ""
 

-#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199

 #: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
 #: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 

-#: ftparchive/cachedb.cc:332
+#: ftparchive/cachedb.cc:326

 msgid "Failed to read .dsc"
 msgstr ""
 
 msgid "Failed to read .dsc"
 msgstr ""
 

-#: ftparchive/cachedb.cc:365
+#: ftparchive/cachedb.cc:359

 msgid "Archive has no control record"
 msgstr ""
 
 msgid "Archive has no control record"
 msgstr ""
 

-#: ftparchive/cachedb.cc:594
+#: ftparchive/cachedb.cc:526

 msgid "Unable to get a cursor"
 msgstr ""
 
 msgid "Unable to get a cursor"
 msgstr ""
 

-#: ftparchive/writer.cc:91
+#: ftparchive/writer.cc:104

 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 

-#: ftparchive/writer.cc:96
+#: ftparchive/writer.cc:109

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 

-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:165

 msgid "E: "
 msgstr ""
 
 msgid "E: "
 msgstr ""
 

-#: ftparchive/writer.cc:154
+#: ftparchive/writer.cc:167

 msgid "W: "
 msgstr ""
 
 msgid "W: "
 msgstr ""
 

-#: ftparchive/writer.cc:161
+#: ftparchive/writer.cc:174

 msgid "E: Errors apply to file "
 msgstr ""
 
 msgid "E: Errors apply to file "
 msgstr ""
 

-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224

 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 

-#: ftparchive/writer.cc:192
+#: ftparchive/writer.cc:205

 msgid "Tree walking failed"
 msgstr ""
 
 msgid "Tree walking failed"
 msgstr ""
 

-#: ftparchive/writer.cc:219
+#: ftparchive/writer.cc:232

 #, c-format
 msgid "Failed to open %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to open %s"
 msgstr ""
 

-#: ftparchive/writer.cc:278
+#: ftparchive/writer.cc:291

 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 

-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:299

 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 

-#: ftparchive/writer.cc:290
+#: ftparchive/writer.cc:303

 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 

-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:311

 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 

-#: ftparchive/writer.cc:308
+#: ftparchive/writer.cc:321

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 

-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:427

 msgid "Archive had no package field"
 msgstr ""
 
 msgid "Archive had no package field"
 msgstr ""
 

-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698

 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 

-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 

-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:712

 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 

-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:716

 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""


@@ -1949,7 +1960,7 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
 msgid "Failed to rename %s to %s"
 msgstr ""
 

-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51

 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"


@@ -1963,11 +1974,11 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91

 msgid "Unknown package record!"
 msgstr ""
 
 msgid "Unknown package record!"
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155

 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"


@@ -1981,1179 +1992,1187 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-pkg/install-progress.cc:59

 #, c-format
 #, c-format

-msgid "Failed to write file %s"
+msgid "Progress: [%3i%%]"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: apt-pkg/init.cc:156

 #, c-format
 #, c-format

-msgid "The path %s is too long"
+msgid "Packaging system '%s' is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:132
+#: apt-pkg/init.cc:172
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
+msgid "Wrote %i records.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:142
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
+msgid "Wrote %i records with %i missing files.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:152
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Wrote %i records with %i mismatched files\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:249
+#: apt-pkg/indexcopy.cc:515

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
+msgid "Can't find authentication record for: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:293
-msgid "The path is too long"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:421
+#: apt-pkg/acquire-worker.cc:135

 #, c-format
 #, c-format

-msgid "Overwrite package match with no version for %s"
+msgid "Is the package %s installed?"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:438
+#: apt-pkg/acquire-worker.cc:186

 #, c-format
 #, c-format

-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Method %s did not start correctly"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:498
+#: apt-pkg/acquire-worker.cc:485

 #, c-format
 #, c-format

-msgid "Unable to stat %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: apt-pkg/pkgcache.cc:154
+msgid "Empty package cache"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+msgid "The package cache file is corrupted"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
+#: apt-pkg/pkgcache.cc:165
+msgid "The package cache file is an incompatible version"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: apt-pkg/pkgcache.cc:168
+msgid "The package cache file is corrupted, it is too small"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: apt-pkg/pkgcache.cc:175
+#, c-format
+msgid "This APT does not support the versioning system '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:96
+#: apt-pkg/pkgcache.cc:185

 #, c-format
 #, c-format

-msgid "Invalid archive member header %s"
+msgid "The package cache was built for different architectures: %s vs %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: apt-pkg/pkgcache.cc:322
+msgid "Depends"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
+#: apt-pkg/pkgcache.cc:322
+msgid "PreDepends"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: apt-pkg/pkgcache.cc:322
+msgid "Suggests"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: apt-pkg/pkgcache.cc:323
+msgid "Recommends"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
+#: apt-pkg/pkgcache.cc:323
+msgid "Conflicts"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: apt-pkg/pkgcache.cc:323
+msgid "Replaces"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: apt-pkg/pkgcache.cc:324
+msgid "Obsoletes"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
+#: apt-pkg/pkgcache.cc:324
+msgid "Breaks"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+#: apt-pkg/pkgcache.cc:324
+msgid "Enhances"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:132
-#, c-format
-msgid "Internal error, could not locate member %s"
+#: apt-pkg/pkgcache.cc:335
+msgid "important"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: apt-pkg/pkgcache.cc:335
+msgid "required"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
+#: apt-pkg/pkgcache.cc:335
+msgid "standard"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Archives directory %spartial is missing."
+#: apt-pkg/pkgcache.cc:336
+msgid "optional"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:99
-#, c-format
-msgid "Unable to lock directory %s"
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
-#, c-format
-msgid "Clean of %s is not supported"
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"

 msgstr ""
 
 msgstr ""
 

-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/pkgrecords.cc:38

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Index file type '%s' is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:904
+#: apt-pkg/sourcelist.cc:127

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li"
+msgid "Malformed stanza %u in source list %s (URI parse)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:170

 #, c-format
 #, c-format

-msgid "rename failed, %s (%s -> %s)."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1573
+#: apt-pkg/sourcelist.cc:184

 #, c-format
 #, c-format

-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1589
+#: apt-pkg/sourcelist.cc:190

 #, c-format
 #, c-format

-msgid "Unable to find hash sum for '%s' in Release file"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1631
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1669
+#: apt-pkg/sourcelist.cc:206

 #, c-format
 #, c-format

-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (URI)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1691
+#: apt-pkg/sourcelist.cc:208

 #, c-format
 #, c-format

-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1721
+#: apt-pkg/sourcelist.cc:211

 #, c-format
 #, c-format

-msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgid "Malformed line %lu in source list %s (URI parse)"

 msgstr ""
 
 msgstr ""
 

-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1859
+#: apt-pkg/sourcelist.cc:224

 #, c-format
 #, 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)"
+msgid "Malformed line %lu in source list %s (dist parse)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1925
+#: apt-pkg/sourcelist.cc:335

 #, c-format
 #, c-format

-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Opening %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1983
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497

 #, c-format
 #, c-format

-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Line %u too long in source list %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/sourcelist.cc:371

 #, c-format
 #, c-format

-msgid "The method driver %s could not be found."
+msgid "Malformed line %u in source list %s (type)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/sourcelist.cc:375

 #, c-format
 #, c-format

-msgid "Is the package %s installed?"
+msgid "Type '%s' is not known on line %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:416

 #, c-format
 #, c-format

-msgid "Method %s did not start correctly"
+msgid "Type '%s' is not known on stanza %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553

 #, c-format
 #, c-format

-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Clean of %s is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/clean.cc:64

 #, c-format
 #, c-format

-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Unable to stat %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 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:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/pkgcachegen.cc:591

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
+msgid "Package %s %s was not found while processing file dependencies"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/pkgcachegen.cc:1196

 #, c-format
 #, c-format

-msgid "Couldn't find task '%s'"
+msgid "Couldn't stat source package list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:615
-#, c-format
-msgid "Couldn't find any package by glob '%s'"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"

 msgstr ""
 
 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:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"

 msgstr ""
 
 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:244
+msgid "Send request to solver"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:571
-msgid "Unmounting CD-ROM...\n"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:586
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108

 #, c-format
 #, c-format

-msgid "Using CD-ROM mount point %s\n"
+msgid "rename failed, %s (%s -> %s)."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:599
-msgid "Waiting for disc...\n"
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:609
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:620
-msgid "Identifying... "
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:662
-#, c-format
-msgid "Stored label: %s\n"
+#: apt-pkg/acquire-item.cc:255
+msgid "Signature error"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:680
-msgid "Scanning disc for index files...\n"
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:734
+#: apt-pkg/acquire-item.cc:1584

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:744
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/acquire-item.cc:1707

 #, c-format
 #, c-format

-msgid "Found label '%s'\n"
+msgid "The repository '%s' is no longer signed."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:800
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:817
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"This disc is called: \n"
-"'%s'\n"
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:819
-msgid "Copying package lists..."
+#: apt-pkg/acquire-item.cc:1956
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:863
-msgid "Writing new source list\n"
+#: apt-pkg/acquire-item.cc:1975
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:874
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/acquire-item.cc:1999
+msgid "There is no public key available for the following key IDs:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-item.cc:2037

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/acquire-item.cc:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/acquire-item.cc:2078
+#, c-format
+msgid ""
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/acquire-item.cc:2249
+#, 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 ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:250
+#: apt-pkg/acquire-item.cc:2315

 #, c-format
 #, c-format

-msgid "Failed to open StateFile %s"
+msgid "Can't find a source to download version '%s' of '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:256
+#: apt-pkg/acquire-item.cc:2351

 #, c-format
 #, c-format

-msgid "Failed to write temporary StateFile %s"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
+#: apt-pkg/vendorlist.cc:83
+#, c-format
+msgid "Vendor block %s contains no fingerprint"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
+#, c-format
+msgid "List directory %spartial is missing."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#, c-format
+msgid "Archives directory %spartial is missing."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:981
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/acquire.cc:983

 #, c-format
 #, c-format

-msgid "Wrote %i records.\n"
+msgid "Retrieving file %li of %li"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/policy.cc:83

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i mismatched files\n"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-pkg/policy.cc:422

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Invalid record in the preferences file %s, no Package header"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/policy.cc:444

 #, c-format
 #, c-format

-msgid "Can't find authentication record for: %s"
+msgid "Did not understand pin type %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:521
-#, c-format
-msgid "Hash mismatch for: %s"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984

 #, c-format
 #, c-format

-msgid "Unable to parse Release file %s"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593

 #, c-format
 #, c-format

-msgid "No sections in Release file %s"
+msgid "Could not configure '%s'. "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/packagemanager.cc:643

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
+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 ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+#: 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 ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/init.cc:146
+#: apt-pkg/cdrom.cc:586

 #, c-format
 #, c-format

-msgid "Packaging system '%s' is not supported"
+msgid "Using CD-ROM mount point %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/cdrom.cc:599
+msgid "Waiting for disc...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: apt-pkg/cdrom.cc:662

 #, c-format
 #, c-format

-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Stored label: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
-#, c-format
-msgid "Could not configure '%s'. "
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/cdrom.cc:734

 #, c-format
 msgid ""
 #, 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."
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/cdrom.cc:771
+#, c-format
+msgid "Found label '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/cdrom.cc:817

 #, c-format
 #, c-format

-msgid "This APT does not support the versioning system '%s'"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/cdrom.cc:819
+msgid "Copying package lists..."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
+#: apt-pkg/cdrom.cc:866
+msgid "Writing new source list\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
+#: apt-pkg/cdrom.cc:877
+msgid "Source list entries for this disc are:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
+#: apt-pkg/algorithms.cc:265
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
+#: apt-pkg/algorithms.cc:1090
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
+#: apt-pkg/algorithms.cc:1092
+msgid "Unable to correct problems, you have held broken packages."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
-msgid "important"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
-msgid "required"
+#: apt-pkg/depcache.cc:258
+#, c-format
+msgid "Failed to write temporary StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
+#: apt-pkg/cacheset.cc:501
+#, c-format
+msgid "Release '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
+#: apt-pkg/cacheset.cc:504
+#, c-format
+msgid "Version '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/cacheset.cc:629
+#, c-format
+msgid "Couldn't find task '%s'"

 msgstr ""
 
 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/cacheset.cc:635

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (%s%d)"
+msgid "Couldn't find any package by regex '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/cacheset.cc:641
+#, c-format
+msgid "Couldn't find any package by glob '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/cacheset.cc:680
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/cacheset.cc:719
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/cacheset.cc:727
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/cacheset.cc:735

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Can't select installed version from package %s as it is not installed"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"

 msgstr ""
 
 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/indexrecords.cc:83
+#, c-format
+msgid "Unable to parse Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: apt-pkg/indexrecords.cc:91
+#, c-format
+msgid "No sections in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/indexrecords.cc:132
+#, c-format
+msgid "No Hash entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/indexrecords.cc:145

 #, c-format
 #, c-format

-msgid "Index file type '%s' is not supported"
+msgid "Invalid 'Valid-Until' entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:83
+#: apt-pkg/indexrecords.cc:164

 #, c-format
 #, c-format

-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+msgid "Invalid 'Date' entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "%lid %lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:444
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432

 #, c-format
 #, c-format

-msgid "Did not understand pin type %s"
+msgid "%lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
+#, c-format
+msgid "%limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:127
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444

 #, c-format
 #, c-format

-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "%lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/contrib/strutl.cc:1290

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "Selection %s not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/contrib/fileutl.cc:196

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Not using locking for read only lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/contrib/fileutl.cc:201

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "Could not open lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/contrib/fileutl.cc:224

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid "Not using locking for nfs mounted lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/contrib/fileutl.cc:229

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Could not get lock %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
+msgid "List of files can't be created as '%s' is not a directory"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/contrib/fileutl.cc:400

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/contrib/fileutl.cc:418

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/contrib/fileutl.cc:427

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/contrib/fileutl.cc:846

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Sub-process %s received a segmentation fault."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/contrib/fileutl.cc:848

 #, c-format
 #, c-format

-msgid "Opening %s"
+msgid "Sub-process %s received signal %u."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
+msgid "Sub-process %s returned an error code (%u)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Sub-process %s exited unexpectedly"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/contrib/fileutl.cc:952

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Problem closing the gzip file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/contrib/fileutl.cc:1140
+#, c-format
+msgid "Could not open file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (1)"
+msgid "Could not open file descriptor %d"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/tagfile.cc:237
-#, c-format
-msgid "Unable to parse package file %s (2)"
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+msgid "Failed to create subprocess IPC"

 msgstr ""
 
 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/fileutl.cc:1412
+msgid "Failed to exec compressor "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/contrib/fileutl.cc:1553

 #, c-format
 #, c-format

-msgid "Vendor block %s contains no fingerprint"
+msgid "read, still have %llu to read but none left"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:65
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688

 #, c-format
 #, c-format

-msgid "Unable to stat the mount point %s"
+msgid "write, still have %llu to write but couldn't"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
+#: apt-pkg/contrib/fileutl.cc:1954
+#, c-format
+msgid "Problem closing the file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/contrib/fileutl.cc:1965

 #, c-format
 #, c-format

-msgid "Command line option '%c' [from %s] is not known."
+msgid "Problem renaming the file %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/contrib/fileutl.cc:1976

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
+msgid "Problem unlinking the file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
+#: apt-pkg/contrib/fileutl.cc:1989
+msgid "Problem syncing the file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/contrib/progress.cc:148

 #, c-format
 #, c-format

-msgid "Option %s requires an argument."
+msgid "%c%s... Error!"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#: apt-pkg/contrib/progress.cc:150

 #, c-format
 #, c-format

-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "%c%s... Done"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:278
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:309
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197

 #, c-format
 #, c-format

-msgid "Option '%s' is too long"
+msgid "%c%s... %u%%"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:341
-#, c-format
-msgid "Sense %s is not understood, try true or false."
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/contrib/mmap.cc:111

 #, c-format
 #, c-format

-msgid "Invalid operation %s"
+msgid "Couldn't duplicate file descriptor %i"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/mmap.cc:119

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
+msgid "Couldn't make mmap of %llu bytes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:633
-#, c-format
-msgid "Opening configuration file %s"
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/mmap.cc:290

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Malformed tag"
+msgid "Couldn't make mmap of %lu bytes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/contrib/mmap.cc:341

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/contrib/mmap.cc:446

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Too many nested includes"
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: apt-pkg/contrib/cdromutl.cc:65

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Included from here"
+msgid "Unable to stat the mount point %s"
+msgstr ""
+
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:522

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgid "Unrecognized type abbreviation: '%c'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/configuration.cc:636

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Opening configuration file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/configuration.cc:804

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "Syntax error %s:%u: Block starts with no name."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/configuration.cc:823

 #, c-format
 #, c-format

-msgid "Not using locking for read only lock file %s"
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/configuration.cc:840

 #, c-format
 #, c-format

-msgid "Could not open lock file %s"
+msgid "Syntax error %s:%u: Extra junk after value"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/configuration.cc:880

 #, c-format
 #, c-format

-msgid "Not using locking for nfs mounted lock file %s"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/configuration.cc:887

 #, c-format
 #, c-format

-msgid "Could not get lock %s"
+msgid "Syntax error %s:%u: Too many nested includes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896

 #, c-format
 #, c-format

-msgid "List of files can't be created as '%s' is not a directory"
+msgid "Syntax error %s:%u: Included from here"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/configuration.cc:900

 #, c-format
 #, c-format

-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/configuration.cc:903

 #, c-format
 #, c-format

-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/configuration.cc:953

 #, c-format
 #, c-format

-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Syntax error %s:%u: Extra junk at end of file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/cmndline.cc:127

 #, c-format
 #, c-format

-msgid "Sub-process %s received a segmentation fault."
+msgid "Command line option '%c' [from %s] is not known."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169

 #, c-format
 #, c-format

-msgid "Sub-process %s received signal %u."
+msgid "Command line option %s is not understood"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/cmndline.cc:174

 #, c-format
 #, c-format

-msgid "Sub-process %s returned an error code (%u)"
+msgid "Command line option %s is not boolean"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236

 #, c-format
 #, c-format

-msgid "Sub-process %s exited unexpectedly"
+msgid "Option %s requires an argument."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255

 #, c-format
 #, c-format

-msgid "Problem closing the gzip file %s"
+msgid "Option %s: Configuration item specification must have an =<val>."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/cmndline.cc:284

 #, c-format
 #, c-format

-msgid "Could not open file %s"
+msgid "Option %s requires an integer argument, not '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/cmndline.cc:315

 #, c-format
 #, c-format

-msgid "Could not open file descriptor %d"
+msgid "Option '%s' is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1315
-msgid "Failed to create subprocess IPC"
+#: apt-pkg/contrib/cmndline.cc:347
+#, c-format
+msgid "Sense %s is not understood, try true or false."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1373
-msgid "Failed to exec compressor "
+#: apt-pkg/contrib/cmndline.cc:397
+#, c-format
+msgid "Invalid operation %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/deb/dpkgpm.cc:112

 #, c-format
 #, c-format

-msgid "read, still have %llu to read but none left"
+msgid "Installing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008

 #, c-format
 #, c-format

-msgid "write, still have %llu to write but couldn't"
+msgid "Configuring %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015

 #, c-format
 #, c-format

-msgid "Problem closing the file %s"
+msgid "Removing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/deb/dpkgpm.cc:115

 #, c-format
 #, c-format

-msgid "Problem renaming the file %s to %s"
+msgid "Completely removing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/deb/dpkgpm.cc:116

 #, c-format
 #, c-format

-msgid "Problem unlinking the file %s"
+msgid "Noting disappearance of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1951
-msgid "Problem syncing the file"
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839

 #, c-format
 #, c-format

-msgid "No keyring installed in %s."
+msgid "Directory '%s' missing"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:111
+#: apt-pkg/deb/dpkgpm.cc:1001

 #, c-format
 #, c-format

-msgid "Couldn't duplicate file descriptor %i"
+msgid "Preparing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:119
+#: apt-pkg/deb/dpkgpm.cc:1002

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %llu bytes"
+msgid "Unpacking %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/deb/dpkgpm.cc:1014

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/deb/dpkgpm.cc:1021

 #, c-format
 #, 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 "Preparing to completely remove %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:446
+#: apt-pkg/deb/dpkgpm.cc:1022

 #, c-format
 #, c-format

-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+msgid "Completely removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:150
-#, c-format
-msgid "%c%s... Done"
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"

 msgstr ""
 
 msgstr ""
 

-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, c-format
-msgid "%c%s... %u%%"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"

 msgstr ""
 
 msgstr ""
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
-#, c-format
-msgid "%lid %lih %limin %lis"
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."

 msgstr ""
 
 msgstr ""
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"

 msgstr ""
 
 msgstr ""
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%limin %lis"
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"

 msgstr ""
 
 msgstr ""
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
-#, c-format
-msgid "%lis"
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1258
-#, c-format
-msgid "Selection %s not found"
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"

 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:91
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:91


@@ -3180,139 +3199,156 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
 msgid "Not locked"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:95
-#, c-format
-msgid "Installing %s"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
-#, c-format
-msgid "Configuring %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr ""
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
+#: apt-inst/filelist.cc:477

 #, c-format
 #, c-format

-msgid "Removing %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-inst/filelist.cc:506

 #, c-format
 #, c-format

-msgid "Completely removing %s"
+msgid "Double add of diversion %s -> %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-inst/filelist.cc:549

 #, c-format
 #, c-format

-msgid "Noting disappearance of %s"
+msgid "Duplicate conf file %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172

 #, c-format
 #, c-format

-msgid "Running post-installation trigger %s"
+msgid "The path %s is too long"

 msgstr ""
 
 msgstr ""
 

-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:830
+#: apt-inst/extract.cc:132

 #, c-format
 #, c-format

-msgid "Directory '%s' missing"
+msgid "Unpacking %s more than once"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#: apt-inst/extract.cc:142

 #, c-format
 #, c-format

-msgid "Could not open file '%s'"
+msgid "The directory %s is diverted"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-inst/extract.cc:152

 #, c-format
 #, c-format

-msgid "Preparing %s"
+msgid "The package is trying to write to the diversion target %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:993
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr ""
+
+#: apt-inst/extract.cc:249

 #, c-format
 #, c-format

-msgid "Unpacking %s"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr ""
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr ""
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:998
+#: apt-inst/extract.cc:421

 #, c-format
 #, c-format

-msgid "Preparing to configure %s"
+msgid "Overwrite package match with no version for %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1000
+#: apt-inst/extract.cc:438

 #, c-format
 #, c-format

-msgid "Installed %s"
+msgid "File %s/%s overwrites the one in the package %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-inst/extract.cc:498

 #, c-format
 #, c-format

-msgid "Preparing for removal of %s"
+msgid "Unable to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54

 #, c-format
 #, c-format

-msgid "Removed %s"
+msgid "Failed to write file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-inst/dirstream.cc:104

 #, c-format
 #, c-format

-msgid "Preparing to completely remove %s"
+msgid "Failed to close file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63

 #, c-format
 #, c-format

-msgid "Completely removed %s"
+msgid "This is not a valid DEB archive, missing '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
-#: apt-pkg/deb/dpkgpm.cc:1150
+#: apt-inst/deb/debfile.cc:132

 #, c-format
 #, c-format

-msgid "Can not write log (%s)"
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
-msgid "Is /dev/pts mounted?"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1124
-msgid "Is stdout a terminal?"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1625
-msgid "Operation was interrupted before it could finish"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1687
-msgid "No apport report written because MaxReports is reached already"
+#: apt-inst/contrib/arfile.cc:96
+#, c-format
+msgid "Invalid archive member header %s"

 msgstr ""
 
 msgstr ""
 

-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1692
-msgid "dependency problems - leaving unconfigured"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1694
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1742
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:312
+#, c-format
+msgid "Unknown TAR header type %u, member %s"

 msgstr ""
 msgstr ""