add {contrib,non-free}/{metapackages,oldlibs} to section specialhandling

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 3822dd9dbc6fa0d9372a3bb27a52ceb3f3a2e6e4..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.9.5\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: 2015-01-16 04:37-0500\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:1591 cmdline/apt-helper.cc:84 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:1071
+#: 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:839
+#: 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:873 cmdline/apt-get.cc:876
-#: 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:886
-#, 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:895
+#: 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:900
+#: 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:906
+#: 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:924
+#: cmdline/apt-get.cc:899

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

-#: cmdline/apt-get.cc:929 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990

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

-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: 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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408

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

-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: 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:1596
+#: cmdline/apt-get.cc:1615

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

-#: cmdline/apt-get.cc:1637
+#: 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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79

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

-#: cmdline/apt-helper.cc:91
+#: 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:1317
+#: 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"


@@ -662,12 +657,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
 msgid "File not found"
 msgstr ""
 

-#: methods/copy.cc:61 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:105 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:243
+#: 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:249 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:357 methods/rsh.cc:319
+#: 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:338
+#: 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 ""
 


@@ -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
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: 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'
 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
-msgid "Unknown error executing gpgv"
+#: methods/gpgv.cc:174
+msgid "Unknown error executing apt-key"

 msgstr ""
 
 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:513
+#: methods/http.cc:517

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

-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533

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

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

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

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

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

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

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

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

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


@@ -986,268 +981,30 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
 msgid "Unknown date format"
 msgstr ""
 

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

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

-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617

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

-#: methods/server.cc:659
-msgid "Internal error"
-msgstr ""
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:148
-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
-#, 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
-#, 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
-#, 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
-#, 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."
-msgstr ""
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-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
-msgid "Yes, do as I say!"
-msgstr ""
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr ""
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr ""
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr ""
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr ""
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589

 #, c-format
 #, c-format

-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:519
-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
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc:638

 msgid ""
 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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr ""
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr ""
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr ""
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: apt-private/private-install.cc:899
-#, 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
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+#: methods/server.cc:712
+msgid "Internal error"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121

 msgid "Listing"
 msgstr ""
 
 msgid "Listing"
 msgstr ""
 

-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151

 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""


@@ -1255,31 +1012,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95

 msgid "Correcting dependencies..."
 msgstr ""
 
 msgid "Correcting dependencies..."
 msgstr ""
 

-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98

 msgid " failed."
 msgstr ""
 
 msgid " failed."
 msgstr ""
 

-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101

 msgid "Unable to correct dependencies"
 msgstr ""
 
 msgid "Unable to correct dependencies"
 msgstr ""
 

-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104

 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 

-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106

 msgid " Done"
 msgstr ""
 
 msgid " Done"
 msgstr ""
 

-#: apt-private/private-cachefile.cc:108
+#: apt-private/private-cachefile.cc:110

 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-cachefile.cc:111
+#: apt-private/private-cachefile.cc:113

 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 


@@ -1378,7 +1135,7 @@ msgstr ""
 
 #: apt-private/private-output.cc:688
 #, c-format
 
 #: apt-private/private-output.cc:688
 #, c-format

-msgid "%s (due to %s) "
+msgid "%s (due to %s)"

 msgstr ""
 
 #: apt-private/private-output.cc:696
 msgstr ""
 
 #: apt-private/private-output.cc:696


@@ -1438,7 +1195,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
 msgid "N"
 msgstr ""
 

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

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""


@@ -1447,7 +1204,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95

 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""


@@ -1455,10 +1212,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-update.cc:101
+#: apt-private/private-update.cc:99

 msgid "All packages are up to date."
 msgstr ""
 
 msgid "All packages are up to date."
 msgstr ""
 

+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr ""
+

 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"
 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"


@@ -1479,97 +1240,346 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 

-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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:154

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-sources.cc:58
+#. 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:159

 #, c-format
 #, c-format

-msgid "Failed to parse %s. Edit again? "
+msgid "Need to get %sB of archives.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-sources.cc:70
+#. 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:166

 #, c-format
 #, c-format

-msgid "Your '%s' file changed, please run 'apt-get update'."
+msgid "After this operation, %sB of additional disk space will be used.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#. 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:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr ""
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr ""
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr ""
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr ""
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr ""
+
+#: 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_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
+#: 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."
+msgstr ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-upgrade.cc:28
-msgid "Done"
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:492
+#, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+
+#: 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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr ""
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr ""
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr ""
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr ""
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: 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
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr ""
+
+#: apt-private/private-sources.cc:58
+#, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr ""
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"

 msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgstr ""
 
 #: apt-private/acqprogress.cc:66

-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:90
-msgid "Get:"
+#: apt-private/acqprogress.cc:88
+#, c-format
+msgid "Get:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:121
-msgid "Ign "
+#: apt-private/acqprogress.cc:119
+#, c-format
+msgid "Ign:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:125
-msgid "Err "
+#: apt-private/acqprogress.cc:126
+#, c-format
+msgid "Err:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150

 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 

-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240

 #, c-format
 msgid " [Working]"
 msgstr ""
 
 #, c-format
 msgid " [Working]"
 msgstr ""
 

-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301

 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"

-"in the drive '%s' and press enter\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/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: 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 ""
 
 #: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 
 #: 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:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"


@@ -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,205 +1651,381 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
 msgid "Merging available information"
 msgstr ""
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: 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 ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:477
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr ""
+
+#: 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
 #, c-format

-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Error processing directory %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:430

 #, c-format
 #, c-format

-msgid "Double add of diversion %s -> %s"
+msgid "Error processing contents %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:906

 #, c-format
 #, c-format

-msgid "Duplicate conf file %s/%s"
+msgid "Some files are missing in the package file group `%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/cachedb.cc:67

 #, c-format
 #, c-format

-msgid "The path %s is too long"
+msgid "DB was corrupted, file renamed to %s.old"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:132
+#: ftparchive/cachedb.cc:85

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
+msgid "DB is old, attempting to upgrade %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:142
+#: 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 ""
+
+#: ftparchive/cachedb.cc:101

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
+msgid "Unable to open DB file %s: %s"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Failed to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:104

 #, c-format
 #, c-format

-msgid "Failed to stat %s"
+msgid "W: Unable to read directory %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/writer.cc:109

 #, c-format
 #, c-format

-msgid "Failed to rename %s to %s"
+msgid "W: Unable to stat %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr ""
+
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
+msgid "Failed to resolve %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:293
-msgid "The path is too long"
+#: ftparchive/writer.cc:232
+#, c-format
+msgid "Failed to open %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:291

 #, c-format
 #, c-format

-msgid "Overwrite package match with no version for %s"
+msgid " DeLink %s [%s]\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:299

 #, c-format
 #, c-format

-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Failed to readlink %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:303

 #, c-format
 #, c-format

-msgid "Unable to stat %s"
+msgid "Failed to unlink %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:311

 #, c-format
 #, c-format

-msgid "Failed to write file %s"
+msgid "*** Failed to link %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:321

 #, c-format
 #, c-format

-msgid "Failed to close file %s"
+msgid " DeLink limit of %sB hit.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "  %s has no override entry\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862

 #, c-format
 #, c-format

-msgid "Internal error, could not locate member %s"
+msgid "  %s maintainer is %s not %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/override.cc:38 ftparchive/override.cc:142

 #, c-format
 #, c-format

-msgid "Invalid archive member header %s"
+msgid "Unable to open %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr ""
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr ""
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr ""
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr ""
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr ""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr ""
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr ""
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59

 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 

-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176

 msgid "Running dpkg"
 msgstr ""
 
 msgid "Running dpkg"
 msgstr ""
 

-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172

 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 

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

 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777

 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 

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

 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""


@@ -1854,6 +2040,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
 msgid "Hash mismatch for: %s"
 msgstr ""
 

+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+

 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""


@@ -1866,215 +2072,178 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr ""
 
 msgid "The list of sources could not be read."
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154

 msgid "Empty package cache"
 msgstr ""
 
 msgid "Empty package cache"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171

 msgid "The package cache file is corrupted"
 msgstr ""
 
 msgid "The package cache file is corrupted"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165

 msgid "The package cache file is an incompatible version"
 msgstr ""
 
 msgid "The package cache file is an incompatible version"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168

 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175

 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322

 msgid "Depends"
 msgstr ""
 
 msgid "Depends"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322

 msgid "PreDepends"
 msgstr ""
 
 msgid "PreDepends"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322

 msgid "Suggests"
 msgstr ""
 
 msgid "Suggests"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323

 msgid "Recommends"
 msgstr ""
 
 msgid "Recommends"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323

 msgid "Conflicts"
 msgstr ""
 
 msgid "Conflicts"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323

 msgid "Replaces"
 msgstr ""
 
 msgid "Replaces"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324

 msgid "Obsoletes"
 msgstr ""
 
 msgid "Obsoletes"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324

 msgid "Breaks"
 msgstr ""
 
 msgid "Breaks"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324

 msgid "Enhances"
 msgstr ""
 
 msgid "Enhances"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335

 msgid "important"
 msgstr ""
 
 msgid "important"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335

 msgid "required"
 msgstr ""
 
 msgid "required"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335

 msgid "standard"
 msgstr ""
 
 msgid "standard"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336

 msgid "optional"
 msgstr ""
 
 msgid "optional"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336

 msgid "extra"
 msgstr ""
 
 msgid "extra"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/pkgrecords.cc:38

 #, c-format
 #, c-format

-msgid "Is the package %s installed?"
+msgid "Index file type '%s' is not supported"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Method %s did not start correctly"
+msgid "Malformed stanza %u in source list %s (URI parse)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:170

 #, c-format
 #, c-format

-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] unparseable)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:173

 #, c-format
 #, c-format

-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr ""
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+msgid "Malformed line %lu in source list %s ([option] too short)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:184

 #, c-format
 #, c-format

-msgid "Failed to open StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:190

 #, c-format
 #, c-format

-msgid "Failed to write temporary StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"

 msgstr ""
 
 msgstr ""
 

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

 #, 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"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"

 msgstr ""
 
 msgstr ""
 

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

 #, 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 (URI)"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Unable to find hash sum for '%s' in Release file"
+msgid "Malformed line %lu in source list %s (dist)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217

 #, 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 (absolute dist)"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, 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 "Opening %s"

 msgstr ""
 
 msgstr ""
 

-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371

 #, 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 %u in source list %s (type)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375

 #, c-format
 #, c-format

-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416

 #, c-format
 #, c-format

-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 msgid "Clean of %s is not supported"
 msgstr ""
 #, c-format
 msgid "Clean of %s is not supported"
 msgstr ""


@@ -2084,107 +2253,228 @@ msgstr ""
 msgid "Unable to stat %s."
 msgstr ""
 
 msgid "Unable to stat %s."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:93
+#: apt-pkg/pkgcachegen.cc:113

 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info

-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc: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: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/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 ""
 
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:273

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:276

 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/pkgcachegen.cc:279

 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:282

 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/pkgcachegen.cc:591

 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgcachegen.cc:1196

 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: 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 ""
 
 msgid "Reading package lists"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1316
+#: apt-pkg/pkgcachegen.cc:1301

 msgid "Collecting File Provides"
 msgstr ""
 
 msgid "Collecting File Provides"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108

 #, c-format
 #, c-format

-msgid "Unable to write to %s"
+msgid "rename failed, %s (%s -> %s)."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:255
+msgid "Signature error"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, 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"
+msgstr ""
+
+#. 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 ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
+#, c-format
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/acquire-item.cc:1975
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1999
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2037
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: apt-pkg/acquire-item.cc:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83

 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 

-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832

 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151

 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:99
+#: apt-pkg/acquire.cc:162

 #, c-format
 msgid "Unable to lock directory %s"
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 

-#: apt-pkg/acquire.cc:904
+#: apt-pkg/acquire.cc:983

 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 

-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-

 #: apt-pkg/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 #: apt-pkg/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""


@@ -2210,19 +2500,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984

 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593

 #, c-format
 msgid "Could not configure '%s'. "
 msgstr ""
 
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2230,9 +2520,10 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 

-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."

 msgstr ""
 
 #: apt-pkg/cdrom.cc:571
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571


@@ -2298,11 +2589,11 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr ""
 
 msgid "Copying package lists..."
 msgstr ""
 

-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866

 msgid "Writing new source list\n"
 msgstr ""
 
 msgid "Writing new source list\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877

 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 


@@ -2312,337 +2603,263 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1088
+#: apt-pkg/algorithms.cc:1092

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 

-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:237
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/depcache.cc:252

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Failed to open StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/depcache.cc:258

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "Failed to write temporary StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "Unable to parse package file %s (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/cacheset.cc:501

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Release '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/cacheset.cc:504

 #, c-format
 #, c-format

-msgid "Opening %s"
+msgid "Version '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/cacheset.cc:629

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
+msgid "Couldn't find task '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/cacheset.cc:635

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Couldn't find any package by regex '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/cacheset.cc:641

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Couldn't find any package by glob '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:680

 #, c-format
 #, c-format

-msgid "Release '%s' for '%s' was not found"
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:719

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:727

 #, c-format
 #, c-format

-msgid "Couldn't find task '%s'"
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:735

 #, c-format
 #, c-format

-msgid "Couldn't find any package by regex '%s'"
+msgid "Can't select installed version from package %s as it is not installed"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Couldn't find any package by glob '%s'"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/indexrecords.cc:83

 #, c-format
 #, c-format

-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Unable to parse Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/indexrecords.cc:91

 #, c-format
 #, c-format

-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "No sections in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:132

 #, c-format
 #, c-format

-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "No Hash entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:145

 #, c-format
 #, c-format

-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Invalid 'Valid-Until' entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:164

 #, c-format
 #, c-format

-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Invalid 'Date' entry in Release file %s"

 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:418
+#: apt-pkg/contrib/strutl.cc:425

 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:425
+#: apt-pkg/contrib/strutl.cc:432

 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439

 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds

-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444

 #, c-format
 msgid "%lis"
 msgstr ""
 
 #, c-format
 msgid "%lis"
 msgstr ""
 

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

 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 

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

 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 

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

 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 

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

 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 

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

 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480

 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 

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

 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 

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

 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 

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

 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 

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

 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 

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

 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140

 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246

 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr ""
 
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123

 msgid "Failed to create subprocess IPC"
 msgstr ""
 
 msgid "Failed to create subprocess IPC"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412

 msgid "Failed to exec compressor "
 msgstr ""
 
 msgid "Failed to exec compressor "
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553

 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688

 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954

 #, c-format
 msgid "Problem closing the file %s"
 msgstr ""
 
 #, c-format
 msgid "Problem closing the file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965

 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976

 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989

 msgid "Problem syncing the file"
 msgstr ""
 
 msgid "Problem syncing the file"
 msgstr ""
 


@@ -2725,109 +2942,103 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
 msgid "Failed to stat the cdrom"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522

 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636

 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804

 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823

 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/contrib/configuration.cc:880

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/contrib/configuration.cc:887

 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:900

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/configuration.cc:903

 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/configuration.cc:953

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127

 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169

 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174

 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236

 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255

 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284

 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315

 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347

 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397

 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""


@@ -2837,12 +3048,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr ""
 
 msgid "Installing %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008

 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015

 #, c-format
 msgid "Removing %s"
 msgstr ""
 #, c-format
 msgid "Removing %s"
 msgstr ""


@@ -2863,451 +3074,281 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
 msgstr ""
 
 #. FIXME: use a better string after freeze

-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839

 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876

 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/deb/dpkgpm.cc:1001

 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1015
-#, c-format
-msgid "Preparing to configure %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Installed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1022
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1029
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1030
-#, c-format
-msgid "Completely removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
-#, c-format
-msgid "Can not write log (%s)"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1670
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1732
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1737
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1739
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1745
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1752
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1787
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:91
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:94
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:254
+#: apt-pkg/deb/dpkgpm.cc:1002

 #, c-format
 #, c-format

-msgid "Unable to mkstemp %s"
+msgid "Unpacking %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"

 msgstr ""
 
 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
+#: apt-pkg/deb/dpkgpm.cc:1014

 #, c-format
 #, c-format

-msgid "Error processing directory %s"
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/deb/dpkgpm.cc:1022

 #, c-format
 #, c-format

-msgid "Error processing contents %s"
+msgid "Completely removed %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:94
+#: apt-pkg/deb/dpkgpm.cc:1725

 msgid ""
 msgid ""

-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
+#: 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 ""
 

-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:91

 #, c-format
 #, c-format

-msgid "W: Unable to read directory %s\n"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/debsystem.cc:94

 #, c-format
 #, c-format

-msgid "W: Unable to stat %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:152
-msgid "E: "
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:154
-msgid "W: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:477

 #, c-format
 #, c-format

-msgid " DeLink %s [%s]\n"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:506

 #, c-format
 #, c-format

-msgid "Failed to readlink %s"
+msgid "Double add of diversion %s -> %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:290
+#: apt-inst/filelist.cc:549

 #, c-format
 #, c-format

-msgid "Failed to unlink %s"
+msgid "Duplicate conf file %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172

 #, c-format
 #, c-format

-msgid "*** Failed to link %s to %s"
+msgid "The path %s is too long"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:132

 #, c-format
 #, c-format

-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
+msgid "Unpacking %s more than once"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:142

 #, c-format
 #, c-format

-msgid "  %s has no override entry\n"
+msgid "The directory %s is diverted"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:152

 #, c-format
 #, c-format

-msgid "  %s maintainer is %s not %s\n"
+msgid "The package is trying to write to the diversion target %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:698
-#, c-format
-msgid "  %s has no source override entry\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:249

 #, c-format
 #, c-format

-msgid "  %s has no binary override entry either\n"
+msgid "The directory %s is being replaced by a non-directory"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"

 msgstr ""
 
 msgstr ""
 

-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:421

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu (%s)"
+msgid "Overwrite package match with no version for %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438

 #, c-format
 #, c-format

-msgid "Failed to read the override file %s"
+msgid "File %s/%s overwrites the one in the package %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu #1"
+msgid "Unable to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu #2"
+msgid "Failed to write file %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu #3"
+msgid "Failed to close file %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63

 #, c-format
 #, c-format

-msgid "Unknown compression algorithm '%s'"
+msgid "This is not a valid DEB archive, missing '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132

 #, c-format
 #, c-format

-msgid "Compressed output %s needs a compression set"
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96

 #, c-format
 #, c-format

-msgid "Internal error, failed to create %s"
+msgid "Invalid archive member header %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: 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 ""