fix partial (206 and 416) support in https

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 71e212509c4600e9b9ae97bf1232bef717cee2e9..ab5b68a52f5683ed4e1cf95f17c20d9b561c0774 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-12 17:42+0100\n"
+"Project-Id-Version: apt 0.9.8.1\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2013-07-31 16:24+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,157 +15,160 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

 
 

-#: cmdline/apt-cache.cc:156
+#: cmdline/apt-cache.cc:158

 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:286

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

-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:288

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

-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:328

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

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

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

-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:330

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:341

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

-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:343

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

-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:345

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

-#: cmdline/apt-cache.cc:355
+#: cmdline/apt-cache.cc:357

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

-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:371

 msgid "Total dependency version space: "
 msgstr ""
 
 msgid "Total dependency version space: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:376

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

-#: cmdline/apt-cache.cc:382
+#: cmdline/apt-cache.cc:384

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

-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165

 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 

-#: cmdline/apt-cache.cc:1273
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452
+#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+msgid "No packages found"
+msgstr ""
+
+#: cmdline/apt-cache.cc:1265

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

-#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
-#: cmdline/apt-cache.cc:1508
-msgid "No packages found"
+#: cmdline/apt-cache.cc:1431
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510

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

-#: cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1556

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

-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
+#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654

 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:1554
+#: cmdline/apt-cache.cc:1577

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

-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634

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

-#: cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:1597

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

-#: cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1598

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

-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624

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

-#: cmdline/apt-cache.cc:1615
+#: cmdline/apt-cache.cc:1631

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

-#: cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1640

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

-#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375
+#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147

 #, 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:1745
+#: cmdline/apt-cache.cc:1760

 msgid ""
 "Usage: apt-cache [options] command\n"
 msgid ""
 "Usage: apt-cache [options] command\n"

-"       apt-cache [options] add file1 [file2 ...]\n"

 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"

-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"

 "\n"
 "Commands:\n"
 "\n"
 "Commands:\n"

-"   add - Add a package file to the source cache\n"

 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"
 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"


@@ -175,7 +178,6 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"

-"   showauto - Display a list of automatically installed packages\n"

 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"


@@ -194,28 +196,36 @@ 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:77
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+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. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85

 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:92
+#: cmdline/apt-cdrom.cc:100

 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:135

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

-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:170

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

-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc:46

 msgid "Arguments not in pairs"
 msgstr ""
 
 msgid "Arguments not in pairs"
 msgstr ""
 

-#: cmdline/apt-config.cc:76
+#: cmdline/apt-config.cc:87

 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"


@@ -231,680 +241,392 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:232
-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"
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: cmdline/apt-get.cc:146
+msgid "[Y/n]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
-#, c-format
-msgid "Unable to write to %s"
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: cmdline/apt-get.cc:152
+msgid "[y/N]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:309
-msgid "Cannot get debconf version. Is debconf installed?"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: cmdline/apt-get.cc:163
+msgid "Y"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
-msgid "Package extension list is too long"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: cmdline/apt-get.cc:169
+msgid "N"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33

 #, c-format
 #, c-format

-msgid "Error processing directory %s"
+msgid "Regex compilation error - %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:260
-msgid "Source extension list is too long"
+#: cmdline/apt-get.cc:289
+msgid "The following packages have unmet dependencies:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:377
-msgid "Error writing header to contents file"
+#: cmdline/apt-get.cc:379
+#, c-format
+msgid "but %s is installed"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:407
+#: cmdline/apt-get.cc:381

 #, c-format
 #, c-format

-msgid "Error processing contents %s"
+msgid "but %s is to be installed"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:595
-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"
+#: cmdline/apt-get.cc:388
+msgid "but it is not installable"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:801
-msgid "No selections matched"
+#: cmdline/apt-get.cc:390
+msgid "but it is a virtual package"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:879
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+#: cmdline/apt-get.cc:393
+msgid "but it is not installed"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
+#: cmdline/apt-get.cc:393
+msgid "but it is not going to be installed"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:61
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
+#: cmdline/apt-get.cc:398
+msgid " or"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: cmdline/apt-get.cc:427
+msgid "The following NEW packages will be installed:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
+#: cmdline/apt-get.cc:453
+msgid "The following packages will be REMOVED:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
+#: cmdline/apt-get.cc:475
+msgid "The following packages have been kept back:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:242
-msgid "Archive has no control record"
+#: cmdline/apt-get.cc:496
+msgid "The following packages will be upgraded:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:448
-msgid "Unable to get a cursor"
+#: cmdline/apt-get.cc:517
+msgid "The following packages will be DOWNGRADED:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:73
-#, c-format
-msgid "W: Unable to read directory %s\n"
+#: cmdline/apt-get.cc:537
+msgid "The following held packages will be changed:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:78
+#: cmdline/apt-get.cc:592

 #, c-format
 #, c-format

-msgid "W: Unable to stat %s\n"
+msgid "%s (due to %s) "

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:134
-msgid "E: "
+#: cmdline/apt-get.cc:600
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:136
-msgid "W: "
+#: cmdline/apt-get.cc:631
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:143
-msgid "E: Errors apply to file "
+#: cmdline/apt-get.cc:635
+#, c-format
+msgid "%lu reinstalled, "

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
+#: cmdline/apt-get.cc:637

 #, c-format
 #, c-format

-msgid "Failed to resolve %s"
+msgid "%lu downgraded, "

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:174
-msgid "Tree walking failed"
+#: cmdline/apt-get.cc:639
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:201
+#: cmdline/apt-get.cc:643

 #, c-format
 #, c-format

-msgid "Failed to open %s"
+msgid "%lu not fully installed or removed.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:260
+#: cmdline/apt-get.cc:664

 #, c-format
 #, c-format

-msgid " DeLink %s [%s]\n"
+msgid "Note, selecting '%s' for task '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:268
+#: cmdline/apt-get.cc:669

 #, c-format
 #, c-format

-msgid "Failed to readlink %s"
+msgid "Note, selecting '%s' for regex '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:272
+#: cmdline/apt-get.cc:686

 #, c-format
 #, c-format

-msgid "Failed to unlink %s"
+msgid "Package %s is a virtual package provided by:\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:279
-#, c-format
-msgid "*** Failed to link %s to %s"
+#: cmdline/apt-get.cc:697
+msgid " [Installed]"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:289
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
+#: cmdline/apt-get.cc:706
+msgid " [Not candidate version]"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:393
-msgid "Archive had no package field"
+#: cmdline/apt-get.cc:708
+msgid "You should explicitly select one to install."

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
+#: cmdline/apt-get.cc:711

 #, c-format
 #, c-format

-msgid "  %s has no override entry\n"
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:729
+msgid "However the following packages replace it:"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
+#: cmdline/apt-get.cc:741

 #, c-format
 #, c-format

-msgid "  %s maintainer is %s not %s\n"
+msgid "Package '%s' has no installation candidate"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:698
+#: cmdline/apt-get.cc:754

 #, c-format
 #, c-format

-msgid "  %s has no source override entry\n"
+msgid "Virtual packages like '%s' can't be removed\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:702
+#. TRANSLATORS: Note, this is not an interactive question
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969

 #, c-format
 #, c-format

-msgid "  %s has no binary override entry either\n"
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/contents.cc:321
+#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975

 #, c-format
 #, c-format

-msgid "Internal error, could not locate member %s"
+msgid "Package '%s' is not installed, so not removed\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
+#: cmdline/apt-get.cc:817
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#: cmdline/apt-get.cc:847

 #, c-format
 #, c-format

-msgid "Unable to open %s"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#: cmdline/apt-get.cc:851

 #, c-format
 #, c-format

-msgid "Malformed override %s line %lu #1"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#: cmdline/apt-get.cc:863

 #, c-format
 #, c-format

-msgid "Malformed override %s line %lu #2"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#: cmdline/apt-get.cc:868

 #, c-format
 #, c-format

-msgid "Malformed override %s line %lu #3"
+msgid "%s is already the newest version.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68

 #, c-format
 #, c-format

-msgid "Failed to read the override file %s"
+msgid "%s set to manually installed.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:72
+#: cmdline/apt-get.cc:913

 #, c-format
 #, c-format

-msgid "Unknown compression algorithm '%s'"
+msgid "Selected version '%s' (%s) for '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:102
+#: cmdline/apt-get.cc:918

 #, c-format
 #, c-format

-msgid "Compressed output %s needs a compression set"
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
+#: cmdline/apt-get.cc:1054
+msgid "Correcting dependencies..."

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
+#: cmdline/apt-get.cc:1057
+msgid " failed."

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
+#: cmdline/apt-get.cc:1060
+msgid "Unable to correct dependencies"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:212
-msgid "Compress child"
+#: cmdline/apt-get.cc:1063
+msgid "Unable to minimize the upgrade set"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:235
-#, c-format
-msgid "Internal error, failed to create %s"
+#: cmdline/apt-get.cc:1065
+msgid " Done"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
+#: cmdline/apt-get.cc:1069
+msgid "You might want to run 'apt-get -f install' to correct these."

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
+#: cmdline/apt-get.cc:1072
+msgid "Unmet dependencies. Try using -f."

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
+#: cmdline/apt-get.cc:1097
+msgid "WARNING: The following packages cannot be authenticated!"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
+#: cmdline/apt-get.cc:1101
+msgid "Authentication warning overridden.\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
+#: cmdline/apt-get.cc:1108
+msgid "Install these packages without verification?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:472
-#, c-format
-msgid "Problem unlinking %s"
+#: cmdline/apt-get.cc:1110
+msgid "Some packages could not be authenticated"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
+#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280
+msgid "There are problems and -y was used without --force-yes"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:135
-msgid "Y"
+#: cmdline/apt-get.cc:1160
+msgid "Internal error, InstallPackages was called with broken packages!"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
-#, c-format
-msgid "Regex compilation error - %s"
+#: cmdline/apt-get.cc:1169
+msgid "Packages need to be removed but remove is disabled."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:252
-msgid "The following packages have unmet dependencies:"
+#: cmdline/apt-get.cc:1180
+msgid "Internal error, Ordering didn't finish"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:342
-#, c-format
-msgid "but %s is installed"
+#: cmdline/apt-get.cc:1218
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:344
+#. 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:1225

 #, c-format
 #, c-format

-msgid "but %s is to be installed"
+msgid "Need to get %sB/%sB of archives.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:351
-msgid "but it is not installable"
+#. 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:1230
+#, c-format
+msgid "Need to get %sB of archives.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:353
-msgid "but it is a virtual package"
+#. 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:1237
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:356
-msgid "but it is not installed"
+#. 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:1242
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:356
-msgid "but it is not going to be installed"
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2624
+#, c-format
+msgid "Couldn't determine free space in %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:361
-msgid " or"
+#: cmdline/apt-get.cc:1270
+#, c-format
+msgid "You don't have enough free space in %s."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:392
-msgid "The following NEW packages will be installed:"
+#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308
+msgid "Trivial Only specified but this is not a trivial operation."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:420
-msgid "The following packages will be REMOVED:"
+#. 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)
+#: cmdline/apt-get.cc:1290
+msgid "Yes, do as I say!"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:442
-msgid "The following packages have been kept back:"
+#: cmdline/apt-get.cc:1292
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:465
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: cmdline/apt-get.cc:488
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: cmdline/apt-get.cc:508
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:563
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: cmdline/apt-get.cc:571
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: cmdline/apt-get.cc:605
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: cmdline/apt-get.cc:609
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: cmdline/apt-get.cc:611
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: cmdline/apt-get.cc:613
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:617
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:639
-#, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:645
-#, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:662
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:673
-msgid " [Installed]"
-msgstr ""
-
-#: cmdline/apt-get.cc:682
-msgid " [Not candidate version]"
-msgstr ""
-
-#: cmdline/apt-get.cc:684
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:687
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:705
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:717
-#, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:728
-#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:759
-#, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:789
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:793
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:803
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:808
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:853
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:858
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:898
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:973
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: cmdline/apt-get.cc:976
-msgid " failed."
-msgstr ""
-
-#: cmdline/apt-get.cc:979
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:982
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: cmdline/apt-get.cc:984
-msgid " Done"
-msgstr ""
-
-#: cmdline/apt-get.cc:988
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: cmdline/apt-get.cc:991
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: cmdline/apt-get.cc:1016
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: cmdline/apt-get.cc:1020
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1027
-msgid "Install these packages without verification [y/N]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:1029
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:1079
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: cmdline/apt-get.cc:1088
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: cmdline/apt-get.cc:1099
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: cmdline/apt-get.cc:1137
-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
-#: cmdline/apt-get.cc:1144
-#, 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
-#: cmdline/apt-get.cc:1149
-#, 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
-#: cmdline/apt-get.cc:1156
-#, 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
-#: cmdline/apt-get.cc:1161
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
-#: cmdline/apt-get.cc:2370
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:1189
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#: cmdline/apt-get.cc:1207
-msgid "Yes, do as I say!"
-msgstr ""
-
-#: cmdline/apt-get.cc:1209
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
+#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317

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

-#: cmdline/apt-get.cc:1230
-msgid "Do you want to continue [Y/n]? "
+#: cmdline/apt-get.cc:1313
+msgid "Do you want to continue?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
+#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 

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

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

-#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
+#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698

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

-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1410

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

-#: cmdline/apt-get.cc:1331
+#: cmdline/apt-get.cc:1414

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

-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1419

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

-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1420

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

-#: cmdline/apt-get.cc:1365
+#: cmdline/apt-get.cc:1448

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


@@ -914,35 +636,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1590

 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:1531
+#: cmdline/apt-get.cc:1622

 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)

-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1660

 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1676

 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

-#: cmdline/apt-get.cc:1647
+#: cmdline/apt-get.cc:1742

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

-#: cmdline/apt-get.cc:1699
+#: cmdline/apt-get.cc:1846

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


@@ -958,15 +680,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
+#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017

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

-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1853

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

-#: cmdline/apt-get.cc:1713
+#: cmdline/apt-get.cc:1860

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


@@ -975,7 +697,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: cmdline/apt-get.cc:1717
+#: cmdline/apt-get.cc:1864

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


@@ -983,25 +705,27 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: cmdline/apt-get.cc:1719
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
+#: cmdline/apt-get.cc:1866
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1885

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1828
+#: cmdline/apt-get.cc:1984

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

-#: cmdline/apt-get.cc:1831
+#: cmdline/apt-get.cc:1988

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

-#: cmdline/apt-get.cc:1843
+#: cmdline/apt-get.cc:2002

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"


@@ -1009,185 +733,227 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:2023

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

-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:2049

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

-#: cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:2139

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

-#: cmdline/apt-get.cc:1980
+#: cmdline/apt-get.cc:2140

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

-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:2182

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

-#: cmdline/apt-get.cc:2029
+#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70

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

-#: cmdline/apt-get.cc:2050
+#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""
+
+#: cmdline/apt-get.cc:2213

 msgid "Calculating upgrade... "
 msgstr ""
 
 msgid "Calculating upgrade... "
 msgstr ""
 

-#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116

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

-#: cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2221

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

-#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
+#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296

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

-#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361

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

-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2418
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:2423
+#, c-format
+msgid "Downloading %s %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2483

 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:2273 cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835

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

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

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

-"bzr get %s\n"
+"bzr branch %s\n"

 "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:2345
+#: cmdline/apt-get.cc:2598

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

-#: cmdline/apt-get.cc:2380
+#: cmdline/apt-get.cc:2635

 #, 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
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2644

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

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

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

-#: cmdline/apt-get.cc:2432
+#: cmdline/apt-get.cc:2693

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

-#: cmdline/apt-get.cc:2462
+#: cmdline/apt-get.cc:2724

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

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

-#: cmdline/apt-get.cc:2475
+#: cmdline/apt-get.cc:2737

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

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

-#: cmdline/apt-get.cc:2512
+#: cmdline/apt-get.cc:2779

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

-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2798

 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:2559
+#: cmdline/apt-get.cc:2823
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850

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

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

-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:3040
+#, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+
+#: cmdline/apt-get.cc:3058

 #, 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:2683
+#: cmdline/apt-get.cc:3081
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+
+#: cmdline/apt-get.cc:3120

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

-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2719
+#: cmdline/apt-get.cc:3126

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2746
+#: cmdline/apt-get.cc:3149

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

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

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

-#: cmdline/apt-get.cc:2798
+#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274
+#, c-format
+msgid "Changelog for %s (%s)"
+msgstr ""
+
+#: cmdline/apt-get.cc:3397

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

-#: cmdline/apt-get.cc:2839
+#: cmdline/apt-get.cc:3438

 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"


@@ -1211,8 +977,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"

-"   markauto - Mark the given packages as automatically installed\n"
-"   unmarkauto - Mark the given packages as manually installed\n"
+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"

 "\n"
 "Options:\n"
 "  -h  This help text.\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"


@@ -1233,7 +999,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:3603

 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"


@@ -1241,33 +1007,33 @@ 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 ""
 

-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:60

 msgid "Hit "
 msgstr ""
 
 msgid "Hit "
 msgstr ""
 

-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:84

 msgid "Get:"
 msgstr ""
 
 msgid "Get:"
 msgstr ""
 

-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:115

 msgid "Ign "
 msgstr ""
 
 msgid "Ign "
 msgstr ""
 

-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:119

 msgid "Err "
 msgstr ""
 
 msgid "Err "
 msgstr ""
 

-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:140

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

-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:230

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

-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:286

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


@@ -1275,861 +1041,1205 @@ msgid ""
 "in the drive '%s' and press enter\n"
 msgstr ""
 
 "in the drive '%s' and press enter\n"
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
+#: cmdline/apt-mark.cc:55
+#, c-format
+msgid "%s can not be marked as it is not installed.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:150
-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"
+#: cmdline/apt-mark.cc:61
+#, c-format
+msgid "%s was already set to manually installed.\n"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:32
-msgid "Bad default setting!"
+#: cmdline/apt-mark.cc:63
+#, c-format
+msgid "%s was already set to automatically installed.\n"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
+#: cmdline/apt-mark.cc:228
+#, c-format
+msgid "%s was already set on hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
+#: cmdline/apt-mark.cc:230
+#, c-format
+msgid "%s was already not hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:101
-msgid "Some errors occurred while unpacking. Packages that were installed"
+#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1032
+#, c-format
+msgid "Waited for %s but it wasn't there"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:102
-msgid "will be configured. This may result in duplicate errors"
+#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#, c-format
+msgid "%s set on hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#, c-format
+msgid "Canceled hold on %s.\n"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:104
+#: cmdline/apt-mark.cc:332
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+
+#: cmdline/apt-mark.cc:379

 msgid ""
 msgid ""

-"above this message are important. Please fix them and run [I]nstall again"
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+"   auto - Mark the given packages as automatically installed\n"
+"   manual - Mark the given packages as manually installed\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -s  No-act. Just prints what would be done.\n"
+"  -f  read/write auto/manual marking in the given file\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."

 msgstr ""
 
 msgstr ""
 

-#: dselect/update:30
-msgid "Merging available information"
+#: methods/cdrom.cc:203
+#, c-format
+msgid "Unable to read the cdrom database %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
+#: methods/cdrom.cc:212
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
+#: methods/cdrom.cc:222
+msgid "Wrong CD-ROM"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
+#: methods/cdrom.cc:249
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
+#: methods/cdrom.cc:254
+msgid "Disk not found."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:296
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+msgid "File not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
+#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
+#: methods/rred.cc:512 methods/rred.cc:521
+msgid "Failed to stat"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+msgid "Failed to set modification time"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
+#: methods/file.cc:47
+msgid "Invalid URI, local URIS must not start with //"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:173
+msgid "Logging in"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
+#: methods/ftp.cc:179
+msgid "Unable to determine the peer name"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
+#: methods/ftp.cc:184
+msgid "Unable to determine the local name"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: methods/ftp.cc:215 methods/ftp.cc:243
+#, c-format
+msgid "The server refused the connection and said: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: methods/ftp.cc:221
+#, c-format
+msgid "USER failed, server said: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: methods/ftp.cc:228
+#, c-format
+msgid "PASS failed, server said: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: methods/ftp.cc:248
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:477
+#: methods/ftp.cc:276

 #, c-format
 #, c-format

-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Login script command '%s' failed, server said: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:506
+#: methods/ftp.cc:302

 #, c-format
 #, c-format

-msgid "Double add of diversion %s -> %s"
+msgid "TYPE failed, server said: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+msgid "Connection timeout"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, c-format
-msgid "Failed to write file %s"
+#: methods/ftp.cc:346
+msgid "Server closed the connection"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264
+#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276
+msgid "Read error"
+msgstr ""
+
+#: methods/ftp.cc:356 methods/rsh.cc:206
+msgid "A response overflowed the buffer."
+msgstr ""
+
+#: methods/ftp.cc:373 methods/ftp.cc:385
+msgid "Protocol corruption"
+msgstr ""
+
+#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
+#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397
+msgid "Write error"
+msgstr ""
+
+#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+msgid "Could not create a socket"
+msgstr ""
+
+#: methods/ftp.cc:708
+msgid "Could not connect data socket, connection timed out"
+msgstr ""
+
+#: methods/ftp.cc:714
+msgid "Could not connect passive socket."
+msgstr ""
+
+#: methods/ftp.cc:731
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr ""
+
+#: methods/ftp.cc:745
+msgid "Could not bind a socket"
+msgstr ""
+
+#: methods/ftp.cc:749
+msgid "Could not listen on the socket"
+msgstr ""
+
+#: methods/ftp.cc:756
+msgid "Could not determine the socket's name"
+msgstr ""
+
+#: methods/ftp.cc:788
+msgid "Unable to send PORT command"
+msgstr ""
+
+#: methods/ftp.cc:798

 #, c-format
 #, c-format

-msgid "Failed to close file %s"
+msgid "Unknown address family %u (AF_*)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: methods/ftp.cc:807

 #, c-format
 #, c-format

-msgid "The path %s is too long"
+msgid "EPRT failed, server said: %s"
+msgstr ""
+
+#: methods/ftp.cc:827
+msgid "Data socket connect timed out"
+msgstr ""
+
+#: methods/ftp.cc:834
+msgid "Unable to accept connection"
+msgstr ""
+
+#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313
+msgid "Problem hashing file"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:124
+#: methods/ftp.cc:886

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
+msgid "Unable to fetch file, server said '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:134
+#: methods/ftp.cc:901 methods/rsh.cc:332
+msgid "Data socket timed out"
+msgstr ""
+
+#: methods/ftp.cc:931

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
+msgid "Data transfer failed, server said '%s'"
+msgstr ""
+
+#. Get the files information
+#: methods/ftp.cc:1008
+msgid "Query"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:144
+#: methods/ftp.cc:1120
+msgid "Unable to invoke "
+msgstr ""
+
+#: methods/connect.cc:76

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Connecting to %s (%s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
+#: methods/connect.cc:87
+#, c-format
+msgid "[IP: %s %s]"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:240
+#: methods/connect.cc:94

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
+#: methods/connect.cc:100
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:284
-msgid "The path is too long"
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:414
+#: methods/connect.cc:126

 #, c-format
 #, c-format

-msgid "Overwrite package match with no version for %s"
+msgid "Could not connect to %s:%s (%s)."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:431
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:154 methods/rsh.cc:435

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
-#: methods/mirror.cc:87
+#: methods/connect.cc:180 methods/connect.cc:199

 #, c-format
 #, c-format

-msgid "Unable to read %s"
+msgid "Could not resolve '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:491
+#: methods/connect.cc:205

 #, c-format
 #, c-format

-msgid "Unable to stat %s"
+msgid "Temporary failure resolving '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: methods/connect.cc:209

 #, c-format
 #, c-format

-msgid "Failed to remove %s"
+msgid "System error resolving '%s:%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: methods/connect.cc:211

 #, c-format
 #, c-format

-msgid "Unable to create %s"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:114
+#: methods/connect.cc:258

 #, c-format
 #, c-format

-msgid "Failed to stat %sinfo"
+msgid "Unable to connect to %s:%s:"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
+#: methods/gpgv.cc:167
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
-#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
-#: apt-pkg/pkgcachegen.cc:1326
-msgid "Reading package lists"
+#: methods/gpgv.cc:171
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#: methods/gpgv.cc:173
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:176
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:179

 #, c-format
 #, c-format

-msgid "Failed to change to the admin dir %sinfo"
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
+#: methods/gpgv.cc:183
+msgid "Unknown error executing gpgv"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
+#: methods/gpgv.cc:216 methods/gpgv.cc:223
+msgid "The following signatures were invalid:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
+#: methods/gpgv.cc:230

 msgid ""
 msgid ""

-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
+#: methods/gzip.cc:65
+msgid "Empty files can't be valid archives"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
+#: methods/http.cc:394
+msgid "Waiting for headers"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
+#: methods/http.cc:544
+msgid "Bad header line"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
+#: methods/http.cc:569 methods/http.cc:576
+msgid "The HTTP server sent an invalid reply header"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
+#: methods/http.cc:606
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
+#: methods/http.cc:621
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
+#: methods/http.cc:623
+msgid "This HTTP server has broken range support"
+msgstr ""
+
+#: methods/http.cc:647
+msgid "Unknown date format"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:439
+#: methods/http.cc:826
+msgid "Select failed"
+msgstr ""
+
+#: methods/http.cc:831
+msgid "Connection timed out"
+msgstr ""
+
+#: methods/http.cc:854
+msgid "Error writing to output file"
+msgstr ""
+
+#: methods/http.cc:885
+msgid "Error writing to file"
+msgstr ""
+
+#: methods/http.cc:913
+msgid "Error writing to the file"
+msgstr ""
+
+#: methods/http.cc:927
+msgid "Error reading from server. Remote end closed connection"
+msgstr ""
+
+#: methods/http.cc:929
+msgid "Error reading from server"
+msgstr ""
+
+#: methods/http.cc:1197
+msgid "Bad header data"
+msgstr ""
+
+#: methods/http.cc:1214 methods/http.cc:1269
+msgid "Connection failed"
+msgstr ""
+
+#: methods/http.cc:1361
+msgid "Internal error"
+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:464
+#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404
+#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362

 #, c-format
 #, c-format

-msgid "Failed to find a Package: header, offset %lu"
+msgid "Unable to read %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:461
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
+#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
+#: apt-pkg/clean.cc:123

 #, c-format
 #, c-format

-msgid "Bad ConfFile section in the status file. Offset %lu"
+msgid "Unable to change to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:466
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280

 #, c-format
 #, c-format

-msgid "Error parsing MD5. Offset %lu"
+msgid "No mirror file '%s' found "

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:287

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Can not read mirror file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:50
+#: methods/mirror.cc:315

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgid "No entry found in mirror file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:110
+#: methods/mirror.cc:445

 #, c-format
 #, c-format

-msgid "Couldn't change to %s"
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rred.cc:491
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:496
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:140
-msgid "Internal error, could not locate member"
+#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+msgid "Failed to create IPC pipe to subprocess"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
+#: methods/rsh.cc:340
+msgid "Connection closed prematurely"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:258
-msgid "Unparsable control file"
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr ""
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr ""
+
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""
+
+#: dselect/install:101
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr ""
+
+#: dselect/install:102
+msgid "will be configured. This may result in duplicate errors"
+msgstr ""
+
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc:102
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc:236
+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 ""
 

-#: methods/bzip2.cc:65
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388

 #, c-format
 #, c-format

-msgid "Couldn't open pipe for %s"
+msgid "Unable to write to %s"
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc:313
+msgid "Cannot get debconf version. Is debconf installed?"

 msgstr ""
 
 msgstr ""
 

-#: methods/bzip2.cc:109
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
+msgid "Package extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
+#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300

 #, c-format
 #, c-format

-msgid "Read error from %s process"
+msgid "Error processing directory %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
-#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
-#: methods/rred.cc:495
-msgid "Failed to stat"
+#: ftparchive/apt-ftparchive.cc:262
+msgid "Source extension list is too long"

 msgstr ""
 
 msgstr ""
 

-#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
-#: methods/rred.cc:492
-msgid "Failed to set modification time"
+#: ftparchive/apt-ftparchive.cc:379
+msgid "Error writing header to contents file"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:199
+#: ftparchive/apt-ftparchive.cc:409

 #, c-format
 #, c-format

-msgid "Unable to read the cdrom database %s"
+msgid "Error processing contents %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:208
+#: ftparchive/apt-ftparchive.cc:597

 msgid ""
 msgid ""

-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+"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 ""
 
 msgstr ""
 

-#: methods/cdrom.cc:218
-msgid "Wrong CD-ROM"
+#: ftparchive/apt-ftparchive.cc:803
+msgid "No selections matched"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:245
+#: ftparchive/apt-ftparchive.cc:881

 #, c-format
 #, c-format

-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgid "Some files are missing in the package file group `%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:250
-msgid "Disk not found."
+#: ftparchive/cachedb.cc:47
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB is old, attempting to upgrade %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."

 msgstr ""
 
 msgstr ""
 

-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
-msgid "Logging in"
+#: ftparchive/cachedb.cc:81
+#, c-format
+msgid "Unable to open DB file %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:174
-msgid "Unable to determine the peer name"
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
+#, c-format
+msgid "Failed to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:179
-msgid "Unable to determine the local name"
+#: ftparchive/cachedb.cc:249
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:490
+msgid "Unable to get a cursor"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: ftparchive/writer.cc:82

 #, c-format
 #, c-format

-msgid "The server refused the connection and said: %s"
+msgid "W: Unable to read directory %s\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:216
+#: ftparchive/writer.cc:87

 #, c-format
 #, c-format

-msgid "USER failed, server said: %s"
+msgid "W: Unable to stat %s\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:223
+#: ftparchive/writer.cc:143
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:145
+msgid "W: "
+msgstr ""
+
+#: ftparchive/writer.cc:152
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202

 #, c-format
 #, c-format

-msgid "PASS failed, server said: %s"
+msgid "Failed to resolve %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:243
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+#: ftparchive/writer.cc:183
+msgid "Tree walking failed"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:271
+#: ftparchive/writer.cc:210

 #, c-format
 #, c-format

-msgid "Login script command '%s' failed, server said: %s"
+msgid "Failed to open %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:297
+#: ftparchive/writer.cc:269

 #, c-format
 #, c-format

-msgid "TYPE failed, server said: %s"
+msgid " DeLink %s [%s]\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
+#: ftparchive/writer.cc:277
+#, c-format
+msgid "Failed to readlink %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:341
-msgid "Server closed the connection"
+#: ftparchive/writer.cc:281
+#, c-format
+msgid "Failed to unlink %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
-msgid "Read error"
+#: ftparchive/writer.cc:288
+#, c-format
+msgid "*** Failed to link %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:351 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
+#: ftparchive/writer.cc:298
+#, c-format
+msgid " DeLink limit of %sB hit.\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:368 methods/ftp.cc:380
-msgid "Protocol corruption"
+#: ftparchive/writer.cc:403
+msgid "Archive had no package field"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
-msgid "Write error"
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#, c-format
+msgid "  %s has no override entry\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
-msgid "Could not create a socket"
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#, c-format
+msgid "  %s maintainer is %s not %s\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:703
-msgid "Could not connect data socket, connection timed out"
+#: ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no source override entry\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:709
-msgid "Could not connect passive socket."
+#: ftparchive/writer.cc:715
+#, c-format
+msgid "  %s has no binary override entry either\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:727
-msgid "getaddrinfo was unable to get a listening socket"
+#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+msgid "realloc - Failed to allocate memory"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:741
-msgid "Could not bind a socket"
+#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#, c-format
+msgid "Unable to open %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:745
-msgid "Could not listen on the socket"
+#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#, c-format
+msgid "Malformed override %s line %llu #1"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:752
-msgid "Could not determine the socket's name"
+#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#, c-format
+msgid "Malformed override %s line %llu #2"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:784
-msgid "Unable to send PORT command"
+#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#, c-format
+msgid "Malformed override %s line %llu #3"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:794
+#: ftparchive/override.cc:128 ftparchive/override.cc:202

 #, c-format
 #, c-format

-msgid "Unknown address family %u (AF_*)"
+msgid "Failed to read the override file %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:803
+#: ftparchive/multicompress.cc:70

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
+msgid "Unknown compression algorithm '%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:823
-msgid "Data socket connect timed out"
+#: ftparchive/multicompress.cc:100
+#, c-format
+msgid "Compressed output %s needs a compression set"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:830
-msgid "Unable to accept connection"
+#: ftparchive/multicompress.cc:189
+msgid "Failed to create FILE*"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
-msgid "Problem hashing file"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to fork"
+msgstr ""
+
+#: ftparchive/multicompress.cc:206
+msgid "Compress child"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:882
+#: ftparchive/multicompress.cc:229

 #, c-format
 #, c-format

-msgid "Unable to fetch file, server said '%s'"
+msgid "Internal error, failed to create %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:897 methods/rsh.cc:321
-msgid "Data socket timed out"
+#: ftparchive/multicompress.cc:304
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:342
+msgid "Failed to read while computing MD5"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:927
+#: ftparchive/multicompress.cc:358

 #, c-format
 #, c-format

-msgid "Data transfer failed, server said '%s'"
+msgid "Problem unlinking %s"

 msgstr ""
 
 msgstr ""
 

-#. Get the files information
-#: methods/ftp.cc:1004
-msgid "Query"
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#, c-format
+msgid "Failed to rename %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/ftp.cc:1116
-msgid "Unable to invoke "
+#: cmdline/apt-internal-solver.cc:37
+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 ""
 

-#: methods/connect.cc:71
-#, c-format
-msgid "Connecting to %s (%s)"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
+#: 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"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:89
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+#: apt-inst/contrib/extracttar.cc:116
+msgid "Failed to create pipes"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:95
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:103
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+msgid "Corrupted archive"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"

 msgstr ""
 
 msgstr ""
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:424
+#: apt-inst/contrib/extracttar.cc:302

 #, c-format
 #, c-format

-msgid "Connecting to %s"
+msgid "Unknown TAR header type %u, member %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:168 methods/connect.cc:187
-#, c-format
-msgid "Could not resolve '%s'"
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:193
-#, c-format
-msgid "Temporary failure resolving '%s'"
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:196
+#: apt-inst/contrib/arfile.cc:94

 #, c-format
 #, c-format

-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgid "Invalid archive member header %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:243
-#, c-format
-msgid "Unable to connect to %s:%s:"
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:71
-#, c-format
-msgid "No keyring installed in %s."
+#: apt-inst/contrib/arfile.cc:135
+msgid "Archive is too short"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:163
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: apt-inst/contrib/arfile.cc:139
+msgid "Failed to read the archive headers"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:168
-msgid "At least one invalid signature was encountered."
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:172
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:177
-msgid "Unknown error executing gpgv"
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:211 methods/gpgv.cc:218
-msgid "The following signatures were invalid:\n"
+#: apt-inst/filelist.cc:466
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:225
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+#: apt-inst/filelist.cc:479
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:385
-msgid "Waiting for headers"
+#: apt-inst/filelist.cc:508
+#, c-format
+msgid "Double add of diversion %s -> %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:531
+#: apt-inst/filelist.cc:551

 #, c-format
 #, c-format

-msgid "Got a single header line over %u chars"
+msgid "Duplicate conf file %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:539
-msgid "Bad header line"
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#, c-format
+msgid "Failed to write file %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:564 methods/http.cc:571
-msgid "The HTTP server sent an invalid reply header"
+#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#, c-format
+msgid "Failed to close file %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:600
-msgid "The HTTP server sent an invalid Content-Length header"
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#, c-format
+msgid "The path %s is too long"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:615
-msgid "The HTTP server sent an invalid Content-Range header"
+#: apt-inst/extract.cc:125
+#, c-format
+msgid "Unpacking %s more than once"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:617
-msgid "This HTTP server has broken range support"
+#: apt-inst/extract.cc:135
+#, c-format
+msgid "The directory %s is diverted"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:641
-msgid "Unknown date format"
+#: apt-inst/extract.cc:145
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:799
-msgid "Select failed"
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+msgid "The diversion path is too long"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:804
-msgid "Connection timed out"
+#: apt-inst/extract.cc:242
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:827
-msgid "Error writing to output file"
+#: apt-inst/extract.cc:282
+msgid "Failed to locate node in its hash bucket"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:858
-msgid "Error writing to file"
+#: apt-inst/extract.cc:286
+msgid "The path is too long"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:886
-msgid "Error writing to the file"
+#: apt-inst/extract.cc:414
+#, c-format
+msgid "Overwrite package match with no version for %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:900
-msgid "Error reading from server. Remote end closed connection"
+#: apt-inst/extract.cc:431
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:902
-msgid "Error reading from server"
+#: apt-inst/extract.cc:491
+#, c-format
+msgid "Unable to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
-msgid "Failed to truncate file"
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:1160
-msgid "Bad header data"
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:55
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:1177 methods/http.cc:1232
-msgid "Connection failed"
+#: apt-inst/deb/debfile.cc:120
+#, c-format
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:1324
-msgid "Internal error"
+#: apt-inst/deb/debfile.cc:214
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79

 msgid "Can't mmap an empty file"
 msgstr ""
 
 msgid "Can't mmap an empty file"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:111

 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
+#: apt-pkg/contrib/mmap.cc:119

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:146

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

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

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

-#: apt-pkg/contrib/mmap.cc:300
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:341

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

-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "

 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:399
+#: apt-pkg/contrib/mmap.cc:440

 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:402
+#: apt-pkg/contrib/mmap.cc:443

 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:371
+#: apt-pkg/contrib/strutl.cc:378

 #, 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:378
+#: apt-pkg/contrib/strutl.cc:385

 #, 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:385
+#: apt-pkg/contrib/strutl.cc:392

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

-#: apt-pkg/contrib/strutl.cc:390
+#: apt-pkg/contrib/strutl.cc:397

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

-#: apt-pkg/contrib/strutl.cc:1119
+#: apt-pkg/contrib/strutl.cc:1173

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

-#: apt-pkg/contrib/configuration.cc:452
+#: apt-pkg/contrib/configuration.cc:491

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

-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/contrib/configuration.cc:605

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

-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/contrib/configuration.cc:773

 #, 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:697
+#: apt-pkg/contrib/configuration.cc:792

 #, 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:714
+#: apt-pkg/contrib/configuration.cc:809

 #, 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:754
+#: apt-pkg/contrib/configuration.cc:849

 #, 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:761
+#: apt-pkg/contrib/configuration.cc:856

 #, 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:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865

 #, 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:774
+#: apt-pkg/contrib/configuration.cc:869

 #, 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:777
+#: apt-pkg/contrib/configuration.cc:872

 #, 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:827
+#: apt-pkg/contrib/configuration.cc:922

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

-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146

 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148

 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 
 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:80

 #, 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:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122

 #, 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:124
+#: apt-pkg/contrib/cmndline.cc:127

 #, 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:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189

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

-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208

 #, 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:236
+#: apt-pkg/contrib/cmndline.cc:237

 #, 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:267
+#: apt-pkg/contrib/cmndline.cc:268

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


@@ -2144,961 +2254,952 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr ""
 
 msgid "Invalid operation %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56

 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:93
-#, c-format
-msgid "Unable to change to %s"
+#: apt-pkg/contrib/cdromutl.cc:225
+msgid "Failed to stat the cdrom"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:217
-msgid "Failed to stat the cdrom"
+#: apt-pkg/contrib/fileutl.cc:93
+#, c-format
+msgid "Problem closing the gzip file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:226

 #, 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:159
+#: apt-pkg/contrib/fileutl.cc:231

 #, 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:177
+#: apt-pkg/contrib/fileutl.cc:254

 #, 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:181
+#: apt-pkg/contrib/fileutl.cc:259

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

-#: apt-pkg/contrib/fileutl.cc:321
+#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510

 #, 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:661
+#: apt-pkg/contrib/fileutl.cc:430

 #, c-format
 #, c-format

-msgid "Waited for %s but it wasn't there"
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:448
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:673
+#: apt-pkg/contrib/fileutl.cc:457
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:844

 #, 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:675
+#: apt-pkg/contrib/fileutl.cc:846

 #, 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:679
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243

 #, 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:681
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236

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

-#: apt-pkg/contrib/fileutl.cc:746
+#: apt-pkg/contrib/fileutl.cc:988

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

-#: apt-pkg/contrib/fileutl.cc:763
+#: apt-pkg/contrib/fileutl.cc:1065

 #, 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:823
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:1150
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1205
+msgid "Failed to exec compressor "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:856
+#: apt-pkg/contrib/fileutl.cc:1298

 #, c-format
 #, c-format

-msgid "write, still have %lu to write but couldn't"
+msgid "read, still have %llu to read but none left"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:985
+#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407

 #, c-format
 #, c-format

-msgid "Problem closing the gzip file %s"
+msgid "write, still have %llu to write but couldn't"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:988
+#: apt-pkg/contrib/fileutl.cc:1695

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

-#: apt-pkg/contrib/fileutl.cc:993
+#: apt-pkg/contrib/fileutl.cc:1707

 #, 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:1004
+#: apt-pkg/contrib/fileutl.cc:1718

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

-#: apt-pkg/contrib/fileutl.cc:1017
+#: apt-pkg/contrib/fileutl.cc:1731

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

-#: apt-pkg/pkgcache.cc:145
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:148

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

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

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

-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159

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

-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167

 #, 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:166
+#: apt-pkg/pkgcache.cc:172

 msgid "The package cache was built for a different architecture"
 msgstr ""
 
 msgid "The package cache was built for a different architecture"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:293
+#: apt-pkg/pkgcache.cc:314

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

-#: apt-pkg/pkgcache.cc:293
+#: apt-pkg/pkgcache.cc:314

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

-#: apt-pkg/pkgcache.cc:293
+#: apt-pkg/pkgcache.cc:314

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

-#: apt-pkg/pkgcache.cc:294
+#: apt-pkg/pkgcache.cc:315

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

-#: apt-pkg/pkgcache.cc:294
+#: apt-pkg/pkgcache.cc:315

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

-#: apt-pkg/pkgcache.cc:294
+#: apt-pkg/pkgcache.cc:315

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

-#: apt-pkg/pkgcache.cc:295
+#: apt-pkg/pkgcache.cc:316

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

-#: apt-pkg/pkgcache.cc:295
+#: apt-pkg/pkgcache.cc:316

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

-#: apt-pkg/pkgcache.cc:295
+#: apt-pkg/pkgcache.cc:316

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

-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:327

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

-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:327

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

-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:327

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

-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:328

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

-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:328

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

-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161

 msgid "Building dependency tree"
 msgstr ""
 
 msgid "Building dependency tree"
 msgstr ""
 

-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133

 msgid "Candidate versions"
 msgstr ""
 
 msgid "Candidate versions"
 msgstr ""
 

-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162

 msgid "Dependency generation"
 msgstr ""
 
 msgid "Dependency generation"
 msgstr ""
 

-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219

 msgid "Reading state information"
 msgstr ""
 
 msgid "Reading state information"
 msgstr ""
 

-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244

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

-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250

 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 

-#: apt-pkg/depcache.cc:922
-#, c-format
-msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:129

 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 

-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:216

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248

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

-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:289

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:293

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923

 #, 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:452
+#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529

 #, c-format
 #, c-format

-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+msgid "Could not configure '%s'. "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:495
+#: apt-pkg/packagemanager.cc:571

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

-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34

 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:292
+#: apt-pkg/algorithms.cc:266

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1218
+#: apt-pkg/algorithms.cc:1238

 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:1220
+#: apt-pkg/algorithms.cc:1240

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

-#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
+#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594

 msgid ""
 msgid ""

-"Some index files failed to download, they have been ignored, or old ones "
+"Some index files failed to download. They have been ignored, or old ones "

 "used instead."
 msgstr ""
 
 "used instead."
 msgstr ""
 

-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838

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

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

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

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

 #, 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:857
+#: apt-pkg/acquire.cc:893

 #, 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:859
+#: apt-pkg/acquire.cc:895

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

-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:447

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 

-#: apt-pkg/init.cc:143
+#: apt-pkg/init.cc:151

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

-#: apt-pkg/init.cc:159
+#: apt-pkg/init.cc:167

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

-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:57

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

-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47

 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 

-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87

 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 

-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91

 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 

-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109

 msgid "The list of sources could not be read."
 msgstr ""
 
 msgid "The list of sources could not be read."
 msgstr ""
 

-#: apt-pkg/policy.cc:344
+#: apt-pkg/policy.cc:75
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:399

 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 

-#: apt-pkg/policy.cc:366
+#: apt-pkg/policy.cc:421

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 

-#: apt-pkg/policy.cc:374
+#: apt-pkg/policy.cc:429

 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:87

 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:198
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:215
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:253
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:285
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:289
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:324
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:320
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:353
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:251

 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:363
+#: apt-pkg/pkgcachegen.cc:254

 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:366
+#: apt-pkg/pkgcachegen.cc:257

 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:369
+#: apt-pkg/pkgcachegen.cc:260

 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:398
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:412
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:418
+#: apt-pkg/pkgcachegen.cc:570

 #, 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:982
+#: apt-pkg/pkgcachegen.cc:1199

 #, 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:1087
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1304

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

-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503

 msgid "IO Error saving source cache"
 msgstr ""
 
 msgid "IO Error saving source cache"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:136
+#: apt-pkg/acquire-item.cc:139

 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:484
+#: apt-pkg/acquire-item.cc:599

 msgid "MD5Sum mismatch"
 msgstr ""
 
 msgid "MD5Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
-#: apt-pkg/acquire-item.cc:1717
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887
+#: apt-pkg/acquire-item.cc:2030

 msgid "Hash Sum mismatch"
 msgstr ""
 
 msgid "Hash Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1244
+#: apt-pkg/acquire-item.cc:1388
+#, 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:1404
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1446

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 

-#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
-#. the time since then the file is invalid - formated in the same way as in
-#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1281
+#: apt-pkg/acquire-item.cc:1484

 #, c-format
 #, c-format

-msgid "Release file expired, ignoring %s (invalid since %s)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1302
+#: apt-pkg/acquire-item.cc:1506

 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1328
+#: apt-pkg/acquire-item.cc:1536

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

-"A error occurred during the signature verification. The repository is not "
+"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 ""
 
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1337
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551

 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1365
+#: apt-pkg/acquire-item.cc:1663

 #, 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 ""
 
 #, 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:1424
+#: apt-pkg/acquire-item.cc:1722

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

-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1479
+#: apt-pkg/acquire-item.cc:1781

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1566
+#: apt-pkg/acquire-item.cc:1879

 msgid "Size mismatch"
 msgstr ""
 
 msgid "Size mismatch"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:68

 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:60
+#: apt-pkg/indexrecords.cc:78

 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:94
+#: apt-pkg/indexrecords.cc:112

 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:107
+#: apt-pkg/indexrecords.cc:125

 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 

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

 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 

-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/vendorlist.cc:78

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

-#: apt-pkg/cdrom.cc:518
+#: apt-pkg/cdrom.cc:576

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682

 msgid "Identifying.. "
 msgstr ""
 
 msgid "Identifying.. "
 msgstr ""
 

-#: apt-pkg/cdrom.cc:552
+#: apt-pkg/cdrom.cc:613

 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915

 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:578
+#: apt-pkg/cdrom.cc:642

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:596
+#: apt-pkg/cdrom.cc:660

 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:600
+#: apt-pkg/cdrom.cc:665

 msgid "Waiting for disc...\n"
 msgstr ""
 
 msgid "Waiting for disc...\n"
 msgstr ""
 

-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:674

 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:626
+#: apt-pkg/cdrom.cc:693

 msgid "Scanning disc for index files..\n"
 msgstr ""
 
 msgid "Scanning disc for index files..\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:666
+#: apt-pkg/cdrom.cc:744

 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:677
+#: apt-pkg/cdrom.cc:755

 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:703
+#: apt-pkg/cdrom.cc:782

 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:732
+#: apt-pkg/cdrom.cc:811

 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:748
+#: apt-pkg/cdrom.cc:828

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:752
+#: apt-pkg/cdrom.cc:830

 msgid "Copying package lists..."
 msgstr ""
 
 msgid "Copying package lists..."
 msgstr ""
 

-#: apt-pkg/cdrom.cc:778
+#: apt-pkg/cdrom.cc:865

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

-#: apt-pkg/cdrom.cc:787
+#: apt-pkg/cdrom.cc:873

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

-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
+#: 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:272 apt-pkg/indexcopy.cc:910
+#: 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:275 apt-pkg/indexcopy.cc:913
+#: 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:278 apt-pkg/indexcopy.cc:916
+#: 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 ""
 

-#: apt-pkg/indexcopy.cc:537
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:515

 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:521

 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:403

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:406

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:517

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

-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:523

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

-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:534

 #, c-format
 #, c-format

-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548

 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:555

 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:563

 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:571

 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:209
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:279
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:73

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

-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982

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

-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989

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

-#: apt-pkg/deb/dpkgpm.cc:55
+#: apt-pkg/deb/dpkgpm.cc:76

 #, c-format
 msgid "Completely removing %s"
 msgstr ""
 
 #, c-format
 msgid "Completely removing %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:56
+#: apt-pkg/deb/dpkgpm.cc:77

 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:78

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze

-#: apt-pkg/deb/dpkgpm.cc:646
+#: apt-pkg/deb/dpkgpm.cc:735

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

-#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770

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

-#: apt-pkg/deb/dpkgpm.cc:816
+#: apt-pkg/deb/dpkgpm.cc:975

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

-#: apt-pkg/deb/dpkgpm.cc:817
+#: apt-pkg/deb/dpkgpm.cc:976

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

-#: apt-pkg/deb/dpkgpm.cc:822
+#: apt-pkg/deb/dpkgpm.cc:981

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

-#: apt-pkg/deb/dpkgpm.cc:824
+#: apt-pkg/deb/dpkgpm.cc:983

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

-#: apt-pkg/deb/dpkgpm.cc:829
+#: apt-pkg/deb/dpkgpm.cc:988

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:831
+#: apt-pkg/deb/dpkgpm.cc:990

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

-#: apt-pkg/deb/dpkgpm.cc:836
+#: apt-pkg/deb/dpkgpm.cc:995

 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:837
+#: apt-pkg/deb/dpkgpm.cc:996

 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1043
+#: apt-pkg/deb/dpkgpm.cc:1243

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1074
+#: apt-pkg/deb/dpkgpm.cc:1273

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

-#: apt-pkg/deb/dpkgpm.cc:1277
+#: apt-pkg/deb/dpkgpm.cc:1445
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1507

 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error

-#: apt-pkg/deb/dpkgpm.cc:1282
+#: apt-pkg/deb/dpkgpm.cc:1512

 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1284
+#: apt-pkg/deb/dpkgpm.cc:1514

 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1290
+#: apt-pkg/deb/dpkgpm.cc:1520

 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1296
+#: apt-pkg/deb/dpkgpm.cc:1526

 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1303
+#: apt-pkg/deb/dpkgpm.cc:1533

 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84

 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87

 #, 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
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103

 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121

 msgid "Not locked"
 msgstr ""
 msgid "Not locked"
 msgstr ""

-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:200
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#: methods/mirror.cc:343
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rsh.cc:329
-msgid "Connection closed prematurely"
-msgstr ""