CMake: Translations: Allow excluding languages from translation

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 4703792d7a49362a601da09fdb7622386be0a2d4..3c9958befa31a9e8acaf1fe8d78edb05235dbfde 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt 0.9.7.9~exp2\n"
+"Project-Id-Version: apt 1.3~pre3\n"

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

-"POT-Creation-Date: 2013-04-03 14:20+0200\n"
+"POT-Creation-Date: 2016-08-04 10:25+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"


@@ -16,1509 +16,1793 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: cmdline/apt-cache.cc:158
+#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+#: apt-private/acqprogress.cc

 #, c-format
 #, c-format

-msgid "Package %s version %s has an unmet dep:\n"
+msgid "Hit:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:286
-msgid "Total package names: "
+#. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
+#. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Get:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:288
-msgid "Total package structures: "
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download, but the error is ignored (compare "Err:")
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Ign:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:328
-msgid "  Normal packages: "
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download and the error is critical (compare "Ign:")
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Err:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:329
-msgid "  Pure virtual packages: "
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:330
-msgid "  Single virtual packages: "
+#: apt-private/acqprogress.cc
+msgid " [Working]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:331
-msgid "  Mixed virtual packages: "
+#: apt-private/acqprogress.cc
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press [Enter]\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:332
-msgid "  Missing: "
+#: apt-private/private-cachefile.cc
+msgid "Correcting dependencies..."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:334
-msgid "Total distinct versions: "
+#: apt-private/private-cachefile.cc
+msgid " failed."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:336
-msgid "Total distinct descriptions: "
+#: apt-private/private-cachefile.cc
+msgid "Unable to correct dependencies"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:338
-msgid "Total dependencies: "
+#: apt-private/private-cachefile.cc
+msgid "Unable to minimize the upgrade set"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:341
-msgid "Total ver/file relations: "
+#: apt-private/private-cachefile.cc
+msgid " Done"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:343
-msgid "Total Desc/File relations: "
+#: apt-private/private-cachefile.cc
+msgid "You might want to run 'apt-get -f install' to correct these."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:345
-msgid "Total Provides mappings: "
+#: apt-private/private-cachefile.cc
+msgid "Unmet dependencies. Try using -f."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:357
-msgid "Total globbed strings: "
+#: apt-private/private-cacheset.cc apt-private/private-search.cc
+msgid "Sorting"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:371
-msgid "Total dependency version space: "
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:376
-msgid "Total slack space: "
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' for glob '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:384
-msgid "Total space accounted for: "
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147
+#: apt-private/private-cacheset.cc

 #, c-format
 #, c-format

-msgid "Package file %s is out of sync."
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+msgid " [Installed]"
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+msgid " [Not candidate version]"
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+msgid "You should explicitly select one to install."
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+#, 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 ""
+
+#: apt-private/private-cacheset.cc
+msgid "However the following packages replace it:"
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-cacheset.cc apt-private/private-install.cc
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-cacheset.cc apt-private/private-install.cc
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr ""
+
+#: apt-private/private-cmndline.cc
+msgid "Most used commands:"
+msgstr ""
+
+#: apt-private/private-cmndline.cc
+#, c-format
+msgid "See %s for more information about the available commands."
+msgstr ""
+
+#: apt-private/private-cmndline.cc
+msgid ""
+"Configuration options and syntax is detailed in apt.conf(5).\n"
+"Information about how to configure sources can be found in sources.list(5).\n"
+"Package and version choices can be expressed via apt_preferences(5).\n"
+"Security details are available in apt-secure(8).\n"
+msgstr ""
+
+#: apt-private/private-cmndline.cc
+msgid "This APT has Super Cow Powers."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc

 msgid "No packages found"
 msgstr ""
 
 msgid "No packages found"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1226
-msgid "You must give at least one search pattern"
+#: apt-private/private-download.cc
+msgid "WARNING: The following packages cannot be authenticated!"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1361
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+#: apt-private/private-download.cc
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc
+msgid "Install these packages without verification?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: apt-private/private-download.cc apt-private/private-install.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
+#: apt-private/private-download.cc
+msgid ""
+"There were unauthenticated packages and -y was used without --allow-"
+"unauthenticated"
+msgstr ""
+
+#: apt-private/private-download.cc apt-pkg/update.cc

 #, c-format
 #, c-format

-msgid "Unable to locate package %s"
+msgid "Failed to fetch %s  %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1486
-msgid "Package files:"
+#: apt-private/private-download.cc
+#, c-format
+msgid "Couldn't determine free space in %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
-msgid "Cache is out of sync, can't x-ref a package file"
+#: apt-private/private-download.cc
+#, c-format
+msgid "You don't have enough free space in %s."

 msgstr ""
 
 msgstr ""
 

-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
-msgid "Pinned packages:"
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
-msgid "(not found)"
+#: apt-private/private-install.cc
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1527
-msgid "  Installed: "
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1528
-msgid "  Candidate: "
+#: apt-private/private-install.cc
+msgid "Broken packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
-msgid "(none)"
+#: apt-private/private-install.cc
+msgid "Internal error, InstallPackages was called with broken packages!"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1561
-msgid "  Package pin: "
+#: apt-private/private-install.cc
+msgid "Packages need to be removed but remove is disabled."

 msgstr ""
 
 msgstr ""
 

-#. Show the priority tables
-#: cmdline/apt-cache.cc:1570
-msgid "  Version table:"
+#: apt-private/private-install.cc
+msgid ""
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Packages were downgraded and -y was used without --allow-downgrades."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid ""
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
-#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "%s %s for %s compiled on %s %s\n"
+msgid "Need to get %sB/%sB of archives.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1690
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr ""
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc
+msgid "Yes, do as I say!"
+msgstr ""
+
+#: apt-private/private-install.cc
+#, c-format

 msgid ""
 msgid ""

-"Usage: apt-cache [options] command\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 query information\n"
-"from APT's binary cache files\n"
-"\n"
-"Commands:\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"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\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"
-"   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"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:79
-msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+#: apt-private/private-install.cc
+msgid "Abort."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Do you want to continue?"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Some files failed to download"
+msgstr ""
+
+#: apt-private/private-install.cc apt-private/private-source.cc
+msgid "Download complete and in download only mode"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:94
-msgid "Please insert a Disc in the drive and press enter"
+#: apt-private/private-install.cc
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:129
+#: apt-private/private-install.cc
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Aborting install."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "Failed to mount '%s' to '%s'"
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc
+#, c-format
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc
+msgid "You might want to run 'apt-get -f install' to correct these:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:163
-msgid "Repeat this process for the rest of the CDs in your set."
+#: apt-private/private-install.cc
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-config.cc:46
-msgid "Arguments not in pairs"
+#: apt-private/private-install.cc
+msgid "The following additional packages will be installed:"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Suggested packages:"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid "Recommended packages:"
+msgstr ""
+
+#: apt-private/private-install.cc
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc
+#, c-format
+msgid "%s is already the newest version (%s).\n"
+msgstr ""
+
+#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr ""
+
+#: apt-private/private-install.cc
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-config.cc:87
+#: apt-private/private-install.cc
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#: apt-private/private-list.cc
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
+#: apt-private/private-main.cc
+#, c-format

 msgid ""
 msgid ""

-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"NOTE: This is only a simulation!\n"
+"      %s needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:135
-msgid "Y"
+#: apt-private/private-output.cc apt-private/private-show.cc
+msgid "unknown"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:140
-msgid "N"
+#: apt-private/private-output.cc
+#, c-format
+msgid "[installed,upgradable to: %s]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc
+msgid "[installed,local]"
+msgstr ""
+
+#: apt-private/private-output.cc
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc
+msgid "[installed,automatic]"
+msgstr ""
+
+#: apt-private/private-output.cc
+msgid "[installed]"
+msgstr ""
+
+#: apt-private/private-output.cc

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
+msgid "[upgradable from: %s]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:260
-msgid "The following packages have unmet dependencies:"
+#: apt-private/private-output.cc
+msgid "[residual-config]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:350
+#: apt-private/private-output.cc

 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:352
+#: apt-private/private-output.cc

 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:359
+#: apt-private/private-output.cc

 msgid "but it is not installable"
 msgstr ""
 
 msgid "but it is not installable"
 msgstr ""
 

-#: cmdline/apt-get.cc:361
+#: apt-private/private-output.cc

 msgid "but it is a virtual package"
 msgstr ""
 
 msgid "but it is a virtual package"
 msgstr ""
 

-#: cmdline/apt-get.cc:364
+#: apt-private/private-output.cc

 msgid "but it is not installed"
 msgstr ""
 
 msgid "but it is not installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:364
+#: apt-private/private-output.cc

 msgid "but it is not going to be installed"
 msgstr ""
 
 msgid "but it is not going to be installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:369
+#: apt-private/private-output.cc

 msgid " or"
 msgstr ""
 
 msgid " or"
 msgstr ""
 

-#: cmdline/apt-get.cc:398
+#: apt-private/private-output.cc
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc

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

-#: cmdline/apt-get.cc:424
+#: apt-private/private-output.cc

 msgid "The following packages will be REMOVED:"
 msgstr ""
 
 msgid "The following packages will be REMOVED:"
 msgstr ""
 

-#: cmdline/apt-get.cc:446
+#: apt-private/private-output.cc

 msgid "The following packages have been kept back:"
 msgstr ""
 
 msgid "The following packages have been kept back:"
 msgstr ""
 

-#: cmdline/apt-get.cc:467
+#: apt-private/private-output.cc

 msgid "The following packages will be upgraded:"
 msgstr ""
 
 msgid "The following packages will be upgraded:"
 msgstr ""
 

-#: cmdline/apt-get.cc:488
+#: apt-private/private-output.cc

 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 

-#: cmdline/apt-get.cc:508
+#: apt-private/private-output.cc

 msgid "The following held packages will be changed:"
 msgstr ""
 
 msgid "The following held packages will be changed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:563
+#: apt-private/private-output.cc

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:571
+#: apt-private/private-output.cc

 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
 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:602
+#: apt-private/private-output.cc

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 

-#: cmdline/apt-get.cc:606
+#: apt-private/private-output.cc

 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 

-#: cmdline/apt-get.cc:608
+#: apt-private/private-output.cc

 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 

-#: cmdline/apt-get.cc:610
+#: apt-private/private-output.cc

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:614
+#: apt-private/private-output.cc

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:635
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc apt-pkg/cachefilter.cc

 #, c-format
 #, c-format

-msgid "Note, selecting '%s' for task '%s'\n"
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-search.cc
+msgid "You must give at least one search pattern"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:640
+#: apt-private/private-search.cc
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/private-show.cc cmdline/apt-cache.cc

 #, c-format
 #, c-format

-msgid "Note, selecting '%s' for regex '%s'\n"
+msgid "Package file %s is out of sync."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:657
+#: apt-private/private-show.cc

 #, c-format
 #, c-format

-msgid "Package %s is a virtual package provided by:\n"
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc
+msgid "not a real package (virtual)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:668
-msgid " [Installed]"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:677
-msgid " [Not candidate version]"
+#: apt-private/private-show.cc
+msgid "Package files:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:679
-msgid "You should explicitly select one to install."
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr ""
+
+#. Print the package name and the version we are forcing to
+#: apt-private/private-show.cc
+#, c-format
+msgid "%s -> %s with priority %d\n"
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr ""
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:682
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr ""
+
+#: apt-private/private-source.cc

 #, c-format
 msgid ""
 #, 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"
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:700
-msgid "However the following packages replace it:"
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:712
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Package '%s' has no installation candidate"
+msgid "Skipping already downloaded file '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:725
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Virtual packages like '%s' can't be removed\n"
+msgid "Need to get %sB/%sB of source archives.\n"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATORS: Note, this is not an interactive question
-#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgid "Need to get %sB of source archives.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Package '%s' is not installed, so not removed\n"
+msgid "Fetch source %s\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:788
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Note, selecting '%s' instead of '%s'\n"
+msgid "Note, using file '%s' to get the build dependencies\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:818
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:822
+#: apt-private/private-sources.cc

 #, c-format
 #, c-format

-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgid "Failed to parse %s. Edit again? "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:834
+#: apt-private/private-sources.cc

 #, c-format
 #, c-format

-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgid "Your '%s' file changed, please run 'apt-get update'."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:839
+#: apt-private/private-unmet.cc

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
+msgid "Package %s version %s has an unmet dep:\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
-#, c-format
-msgid "%s set to manually installed.\n"
+#: apt-private/private-update.cc
+msgid "The update command takes no arguments"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:884
+#: apt-private/private-update.cc

 #, c-format
 #, c-format

-msgid "Selected version '%s' (%s) for '%s'\n"
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc
+msgid "All packages are up to date."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:889
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+#: cmdline/apt-cache.cc
+msgid "apt-cache stats does not take any arguments"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1025
-msgid "Correcting dependencies..."
+#: cmdline/apt-cache.cc
+msgid "Total package names: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1028
-msgid " failed."
+#: cmdline/apt-cache.cc
+msgid "Total package structures: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1031
-msgid "Unable to correct dependencies"
+#: cmdline/apt-cache.cc
+msgid "  Normal packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1034
-msgid "Unable to minimize the upgrade set"
+#: cmdline/apt-cache.cc
+msgid "  Pure virtual packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1036
-msgid " Done"
+#: cmdline/apt-cache.cc
+msgid "  Single virtual packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1040
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: cmdline/apt-cache.cc
+msgid "  Mixed virtual packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1043
-msgid "Unmet dependencies. Try using -f."
+#: cmdline/apt-cache.cc
+msgid "  Missing: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1068
-msgid "WARNING: The following packages cannot be authenticated!"
+#: cmdline/apt-cache.cc
+msgid "Total distinct versions: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1072
-msgid "Authentication warning overridden.\n"
+#: cmdline/apt-cache.cc
+msgid "Total distinct descriptions: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1079
-msgid "Install these packages without verification [y/N]? "
+#: cmdline/apt-cache.cc
+msgid "Total dependencies: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1081
-msgid "Some packages could not be authenticated"
+#: cmdline/apt-cache.cc
+msgid "Total ver/file relations: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
-msgid "There are problems and -y was used without --force-yes"
+#: cmdline/apt-cache.cc
+msgid "Total Desc/File relations: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1131
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: cmdline/apt-cache.cc
+msgid "Total Provides mappings: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1140
-msgid "Packages need to be removed but remove is disabled."
+#: cmdline/apt-cache.cc
+msgid "Total globbed strings: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1151
-msgid "Internal error, Ordering didn't finish"
+#: cmdline/apt-cache.cc
+msgid "Total slack space: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1189
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: cmdline/apt-cache.cc
+msgid "Total space accounted for: "

 msgstr ""
 
 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:1196
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
+#: cmdline/apt-cache.cc
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."

 msgstr ""
 
 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:1201
-#, c-format
-msgid "Need to get %sB of archives.\n"
+#: cmdline/apt-cache.cc
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] show pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache queries and displays available information about installed\n"
+"and installable packages. It works exclusively on the data acquired\n"
+"into the local cache via the 'update' command of e.g. apt-get. The\n"
+"displayed information may therefore be outdated if the last update was\n"
+"too long ago, but in exchange apt-cache works independently of the\n"
+"availability of the configured sources (e.g. offline).\n"

 msgstr ""
 
 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:1208
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: cmdline/apt-cache.cc
+msgid "Show source records"

 msgstr ""
 
 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:1213
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
-#, c-format
-msgid "Couldn't determine free space in %s"
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1241
-#, c-format
-msgid "You don't have enough free space in %s."
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279
-msgid "Trivial Only specified but this is not a trivial operation."
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
-#. careful with hard to type or special characters (like non-breaking spaces)
-#: cmdline/apt-get.cc:1261
-msgid "Yes, do as I say!"
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1263
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288
-msgid "Abort."
+#: cmdline/apt-cdrom.cc
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1284
-msgid "Do you want to continue [Y/n]? "
+#: cmdline/apt-cdrom.cc
+msgid "Please insert a Disc in the drive and press [Enter]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-cdrom.cc

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
+msgid "Failed to mount '%s' to '%s'"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1374
-msgid "Some files failed to download"
+#: cmdline/apt-cdrom.cc
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
-msgid "Download complete and in download only mode"
+#: cmdline/apt-cdrom.cc
+msgid "Repeat this process for the rest of the CDs in your set."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 msgid ""

-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n"
+"media types as package sources to APT. The mount point and device\n"
+"information is taken from apt.conf(5), udev(7) and fstab(5).\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1385
-msgid "--fix-missing and media swapping is not currently supported"
+#: cmdline/apt-config.cc
+msgid "Arguments not in pairs"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1390
-msgid "Unable to correct missing packages."
+#: cmdline/apt-config.cc
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is an interface to the configuration settings used by\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1391
-msgid "Aborting install."
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1419
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1423
-msgid "Note: This is done automatically and on purpose by dpkg."
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1561
+#: cmdline/apt-get.cc

 #, c-format
 #, c-format

-msgid "Ignore unavailable target release '%s' of package '%s'"
+msgid "Couldn't find package %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Picking '%s' as source package instead of '%s'\n"
+msgid "%s set to automatically installed.\n"

 msgstr ""
 
 msgstr ""
 

-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1631
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1647
-msgid "The update command takes no arguments"
+#: cmdline/apt-get.cc
+msgid "Internal error, problem resolver broke stuff"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1713
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
+#: cmdline/apt-get.cc
+msgid "Supported modules:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc

 msgid ""
 msgid ""

-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a command line interface for retrieval of packages\n"
+"and information about them from authenticated sources and\n"
+"for installation, upgrade and removal of packages together\n"
+"with their dependencies.\n"

 msgstr ""
 
 msgstr ""
 

-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
-msgid "The following information may help to resolve the situation:"
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1824
-msgid "Internal Error, AutoRemover broke stuff"
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1831
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1835
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1837
-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:1856
-msgid "Internal error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1955
-msgid "You might want to run 'apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc
+msgid "Remove packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1959
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1974
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+#: cmdline/apt-get.cc cmdline/apt.cc
+msgid "Remove automatically all unused packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1995
-msgid "Broken packages"
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2021
-msgid "The following extra packages will be installed:"
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2111
-msgid "Suggested packages:"
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2112
-msgid "Recommended packages:"
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2154
-#, c-format
-msgid "Couldn't find package %s"
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
-#, c-format
-msgid "%s set to automatically installed.\n"
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
-msgid ""
-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
+#: cmdline/apt-get.cc
+msgid "Download source archives"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2185
-msgid "Calculating upgrade... "
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
-msgid "Failed"
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2193
-msgid "Done"
+#: cmdline/apt-helper.cc
+msgid "Need one URL as argument"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
-msgid "Internal error, problem resolver broke stuff"
+#: cmdline/apt-helper.cc
+msgid "Must specify at least one pair url/filename"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
-msgid "Unable to lock the download directory"
+#: cmdline/apt-helper.cc
+msgid "Download Failed"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2393
-#, c-format
-msgid "Downloading %s %s"
+#: cmdline/apt-helper.cc
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper bundles a variety of commands for shell scripts to use\n"
+"e.g. the same proxy configuration or acquire system as APT would.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2453
-msgid "Must specify at least one package to fetch source for"
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
-#, c-format
-msgid "Unable to find a source package for %s"
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2510
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2515
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Skipping already downloaded file '%s'\n"
+msgid "%s can not be marked as it is not installed.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "You don't have enough free space in %s"
+msgid "%s was already set to manually installed.\n"

 msgstr ""
 
 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:2614
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of source archives.\n"
+msgid "%s was already set to automatically installed.\n"

 msgstr ""
 
 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:2619
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB of source archives.\n"
+msgid "%s was already set on hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Fetch source %s\n"
+msgid "%s was already not hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2663
-msgid "Failed to fetch some archives."
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Skipping unpack of already unpacked source in %s\n"
+msgid "%s set on hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Unpack command '%s' failed.\n"
+msgid "Canceled hold on %s.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgid "Selected %s for purge.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2749
-msgid "Child process failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2768
-msgid "Must specify at least one package to check builddeps for"
+msgid "Selected %s for removal.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+msgid "Selected %s for installation.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
-#, c-format
-msgid "Unable to get build-dependency information for %s"
+#: cmdline/apt-mark.cc
+msgid ""
+"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 be used to\n"
+"manipulate the dpkg(1) selection states of packages, and to list\n"
+"all packages with or without a certain marking.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2840
-#, c-format
-msgid "%s has no build depends.\n"
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as automatically installed"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3010
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3028
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3051
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3090
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3096
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3119
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3135
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
+#: cmdline/apt.cc
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"apt is a commandline package manager and provides commands for\n"
+"searching and managing as well as querying information about packages.\n"
+"It provides the same functionality as the specialized APT tools,\n"
+"like apt-get and apt-cache, but enables options more suitable for\n"
+"interactive use by default.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3140
-msgid "Failed to process build dependencies"
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
-#, c-format
-msgid "Changelog for %s (%s)"
+#: cmdline/apt.cc
+msgid "search in package descriptions"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3368
-msgid "Supported modules:"
+#: cmdline/apt.cc
+msgid "show package details"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:3409
-msgid ""
-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\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"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  Download only - do NOT install or unpack archives\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
-"  -m  Attempt to continue if archives are unlocatable\n"
-"  -u  Show a list of upgraded packages as well\n"
-"  -b  Build the source package after fetching it\n"
-"  -V  Show verbose version numbers\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:3574
-msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:60
-msgid "Hit "
+#: cmdline/apt.cc
+msgid "remove packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:84
-msgid "Get:"
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:115
-msgid "Ign "
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:119
-msgid "Err "
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:140
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:230
+#: methods/cdrom.cc

 #, c-format
 #, c-format

-msgid " [Working]"
+msgid "Unable to read the cdrom database %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/acqprogress.cc:286
-#, c-format
+#: methods/cdrom.cc

 msgid ""
 msgid ""

-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
+"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 ""
 

-#: cmdline/apt-mark.cc:55
-#, c-format
-msgid "%s can not be marked as it is not installed.\n"
+#: methods/cdrom.cc
+msgid "Wrong CD-ROM"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:61
+#: methods/cdrom.cc

 #, c-format
 #, c-format

-msgid "%s was already set to manually installed.\n"
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:63
-#, c-format
-msgid "%s was already set to automatically installed.\n"
+#: methods/cdrom.cc
+msgid "Disk not found."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:228
-#, c-format
-msgid "%s was already set on hold.\n"
+#: methods/cdrom.cc methods/file.cc methods/rsh.cc
+msgid "File not found"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:230
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "%s was already not hold.\n"
+msgid "Connecting to %s (%s)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Waited for %s but it wasn't there"
+msgid "[IP: %s %s]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "%s set on hold.\n"
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Canceled hold on %s.\n"
+msgid "Cannot initiate the connection to %s:%s (%s)."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:332
-msgid "Executing dpkg failed. Are you root?"
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:379
-msgid ""
-"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."
+#: methods/connect.cc methods/ftp.cc methods/rsh.cc
+msgid "Failed"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:203
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Unable to read the cdrom database %s"
+msgid "Could not connect to %s:%s (%s)."

 msgstr ""
 
 msgstr ""
 

-#: 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"
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc methods/rsh.cc
+#, c-format
+msgid "Connecting to %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:222
-msgid "Wrong CD-ROM"
+#: methods/connect.cc
+#, c-format
+msgid "Could not resolve '%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:249
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgid "Temporary failure resolving '%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:254
-msgid "Disk not found."
+#: methods/connect.cc
+#, c-format
+msgid "System error resolving '%s:%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
-msgid "File not found"
+#: methods/connect.cc
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"

 msgstr ""
 
 msgstr ""
 

-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
-msgid "Failed to stat"
+#: methods/connect.cc
+#, c-format
+msgid "Unable to connect to %s:%s:"

 msgstr ""
 
 msgstr ""
 

-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
-msgid "Failed to set modification time"
+#: methods/copy.cc
+msgid "Failed to stat"

 msgstr ""
 
 msgstr ""
 

-#: methods/file.cc:47
+#: methods/file.cc

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

-#: methods/ftp.cc:173
+#: methods/ftp.cc

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

-#: methods/ftp.cc:179
+#: methods/ftp.cc

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

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

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

-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc

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

-#: methods/ftp.cc:221
+#: methods/ftp.cc

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

-#: methods/ftp.cc:228
+#: methods/ftp.cc

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

-#: methods/ftp.cc:248
+#: methods/ftp.cc

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

-#: methods/ftp.cc:276
+#: methods/ftp.cc

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

-#: methods/ftp.cc:302
+#: methods/ftp.cc

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

-#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
+#: methods/ftp.cc methods/rsh.cc

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

-#: methods/ftp.cc:346
+#: methods/ftp.cc

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

-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc

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

-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc methods/rsh.cc

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

-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc

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

-#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc

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

-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc

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

-#: methods/ftp.cc:707
+#: methods/ftp.cc

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

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

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

-#: methods/ftp.cc:730
+#: methods/ftp.cc

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

-#: methods/ftp.cc:744
+#: methods/ftp.cc

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

-#: methods/ftp.cc:748
+#: methods/ftp.cc

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

-#: methods/ftp.cc:755
+#: methods/ftp.cc

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

-#: methods/ftp.cc:787
+#: methods/ftp.cc

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

-#: methods/ftp.cc:797
+#: methods/ftp.cc

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

-#: methods/ftp.cc:806
+#: methods/ftp.cc

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

-#: methods/ftp.cc:826
+#: methods/ftp.cc

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

-#: methods/ftp.cc:833
+#: methods/ftp.cc

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

-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc methods/rsh.cc methods/server.cc

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

-#: methods/ftp.cc:885
+#: methods/ftp.cc

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

-#: methods/ftp.cc:900 methods/rsh.cc:330
+#: methods/ftp.cc methods/rsh.cc

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

-#: methods/ftp.cc:930
+#: methods/ftp.cc

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

-#: methods/ftp.cc:1007
+#: methods/ftp.cc

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

-#: methods/ftp.cc:1119
+#: methods/ftp.cc

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

-#: methods/connect.cc:76
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Connecting to %s (%s)"
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:87
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc

 #, c-format
 #, c-format

-msgid "[IP: %s %s]"
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:94
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+#: methods/gpgv.cc
+msgid "At least one invalid signature was encountered."

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:100
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+#: methods/gpgv.cc
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:108
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+#: methods/gpgv.cc
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:126
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"

 msgstr ""
 
 msgstr ""
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc

 #, c-format
 #, c-format

-msgid "Connecting to %s"
+msgid "Signature by key %s uses weak digest algorithm (%s)"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:180 methods/connect.cc:199
-#, c-format
-msgid "Could not resolve '%s'"
+#: methods/gpgv.cc
+msgid "The following signatures were invalid:\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:205
-#, c-format
-msgid "Temporary failure resolving '%s'"
+#: methods/gpgv.cc
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s'"
+#: methods/http.cc
+msgid "Error writing to the file"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:211
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+#: methods/http.cc
+msgid "Error reading from server. Remote end closed connection"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:258
-#, c-format
-msgid "Unable to connect to %s:%s:"
+#: methods/http.cc
+msgid "Error reading from server"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:169
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/http.cc
+msgid "Error writing to file"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:174
-msgid "At least one invalid signature was encountered."
+#: methods/http.cc
+msgid "Select failed"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:178
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: methods/http.cc
+msgid "Connection timed out"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:183
-msgid "Unknown error executing gpgv"
+#: methods/http.cc
+msgid "Error writing to output file"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:217 methods/gpgv.cc:224
-msgid "The following signatures were invalid:\n"
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: methods/mirror.cc apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/init.cc
+#: apt-pkg/policy.cc apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unable to read %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:231
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+#: methods/mirror.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc
+#, c-format
+msgid "Unable to change to %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/gzip.cc:65
-msgid "Empty files can't be valid archives"
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc
+#, c-format
+msgid "No mirror file '%s' found "

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:394
-msgid "Waiting for headers"
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc
+#, c-format
+msgid "Can not read mirror file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:544
-msgid "Bad header line"
+#: methods/mirror.cc
+#, c-format
+msgid "No entry found in mirror file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:569 methods/http.cc:576
-msgid "The HTTP server sent an invalid reply header"
+#: methods/mirror.cc
+#, c-format
+msgid "[Mirror: %s]"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:606
-msgid "The HTTP server sent an invalid Content-Length header"
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:621
-msgid "The HTTP server sent an invalid Content-Range header"
+#: methods/rred.cc
+msgid "Failed to set modification time"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:623
-msgid "This HTTP server has broken range support"
+#: methods/rsh.cc ftparchive/multicompress.cc
+msgid "Failed to create IPC pipe to subprocess"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:647
-msgid "Unknown date format"
+#: methods/rsh.cc
+msgid "Connection closed prematurely"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:822
-msgid "Select failed"
+#: methods/server.cc
+msgid "Waiting for headers"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:827
-msgid "Connection timed out"
+#: methods/server.cc
+msgid "Bad header line"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:850
-msgid "Error writing to output file"
+#: methods/server.cc
+msgid "The HTTP server sent an invalid reply header"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:881
-msgid "Error writing to file"
+#: methods/server.cc
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:909
-msgid "Error writing to the file"
+#: methods/server.cc
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:923
-msgid "Error reading from server. Remote end closed connection"
+#: methods/server.cc
+msgid "This HTTP server has broken range support"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:925
-msgid "Error reading from server"
+#: methods/server.cc
+msgid "Unknown date format"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:1198
+#: methods/server.cc

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

-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/server.cc

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

-#: methods/http.cc:1362
-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:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 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
-msgid "Unable to read %s"
-msgstr ""
-
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/cdromutl.cc:213 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
-msgid "Unable to change to %s"
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:280
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:287
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr ""
-
-#: methods/mirror.cc:442
-#, c-format
-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
+#: methods/server.cc

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

-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
-msgid "Failed to create IPC pipe to subprocess"
+#: methods/server.cc
+msgid "Internal error"

 msgstr ""
 
 msgstr ""
 

-#: methods/rsh.cc:338
-msgid "Connection closed prematurely"
+#: methods/store.cc
+msgid "Empty files can't be valid archives"

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:32
+#: dselect/install:33

 msgid "Bad default setting!"
 msgstr ""
 
 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."
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45
+msgid "Press [Enter] to continue."

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:91
+#: dselect/install:92

 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 

-#: dselect/install:101
+#: dselect/install:102

 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr ""
 
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr ""
 

-#: dselect/install:102
+#: dselect/install:103

 msgid "will be configured. This may result in duplicate errors"
 msgstr ""
 
 msgid "will be configured. This may result in duplicate errors"
 msgstr ""
 

-#: dselect/install:103
+#: dselect/install:104

 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
 
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
 

-#: dselect/install:104
+#: dselect/install:105

 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""


@@ -1527,59 +1811,97 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
 msgid "Merging available information"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc

 #, c-format
 #, c-format

-msgid "%s not a valid DEB package."
+msgid "Waited for %s but it wasn't there"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 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"
+"apt-extracttemplates is used to extract config and template files\n"
+"from debian packages. It is used mainly by debconf(1) to prompt for\n"
+"configuration questions before installation of packages.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc

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

-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc

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

-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
+#: cmdline/apt-internal-planner.cc
+msgid ""
+"Usage: apt-internal-planner\n"
+"\n"
+"apt-internal-planner is an interface to use the current internal\n"
+"installation planner for the APT family like an external one,\n"
+"for debugging or the like.\n"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc
+msgid "Unknown package record!"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package information files.\n"
+"By default it sorts by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc

 msgid "Package extension list is too long"
 msgstr ""
 
 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:263
-#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:261
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:378
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:408
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:596
+#: ftparchive/apt-ftparchive.cc

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


@@ -1621,1546 +1943,1601 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:802
-msgid "No selections matched"
+#: ftparchive/apt-ftparchive.cc
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr ""
+
+#: ftparchive/cachedb.cc
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr ""
+
+#: ftparchive/cachedb.cc
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc
+msgid "Failed to read .dsc"
+msgstr ""
+
+#: ftparchive/cachedb.cc
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/contents.cc
+msgid "realloc - Failed to allocate memory"
+msgstr ""
+
+#: ftparchive/multicompress.cc
+#, c-format
+msgid "Unknown compression algorithm '%s'"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:880
+#: ftparchive/multicompress.cc

 #, c-format
 #, c-format

-msgid "Some files are missing in the package file group `%s'"
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc
+msgid "Failed to fork"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:47
+#: ftparchive/multicompress.cc
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc

 #, c-format
 #, c-format

-msgid "DB was corrupted, file renamed to %s.old"
+msgid "Internal error, failed to create %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc
+msgid "IO to subprocess/file failed"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:65
+#: ftparchive/multicompress.cc
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "DB is old, attempting to upgrade %s"
+msgid "Failed to rename %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: 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."
+#: ftparchive/override.cc
+#, c-format
+msgid "Unable to open %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:81
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc

 #, c-format
 #, c-format

-msgid "Unable to open DB file %s: %s"
+msgid "Malformed override %s line %llu (%s)"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/override.cc

 #, c-format
 #, c-format

-msgid "Failed to stat %s"
+msgid "Failed to read the override file %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
+#: ftparchive/override.cc
+#, c-format
+msgid "Malformed override %s line %llu #1"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
+#: ftparchive/override.cc
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr ""
+
+#: ftparchive/override.cc
+#, c-format
+msgid "Malformed override %s line %llu #3"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc

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

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

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

-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc

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

-#: ftparchive/writer.cc:281
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc

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

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

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

-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:708
+#: ftparchive/writer.cc

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

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

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

-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr ""
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
-#, c-format
-msgid "Unable to open %s"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive signature"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
-msgid "Malformed override %s line %llu #1"
+#: apt-inst/contrib/arfile.cc
+msgid "Error reading archive member header"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: apt-inst/contrib/arfile.cc

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu #2"
+msgid "Invalid archive member header %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive member header"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
+#: apt-inst/contrib/arfile.cc
+msgid "Archive is too short"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:70
-#, c-format
-msgid "Unknown compression algorithm '%s'"
+#: apt-inst/contrib/arfile.cc
+msgid "Failed to read the archive headers"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:100
+#: apt-inst/contrib/extracttar.cc

 #, c-format
 #, c-format

-msgid "Compressed output %s needs a compression set"
+msgid "Cannot find a configured compressor for '%s'"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:189
-msgid "Failed to create FILE*"
+#: apt-inst/contrib/extracttar.cc
+msgid "Corrupted archive"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:192
-msgid "Failed to fork"
+#: apt-inst/contrib/extracttar.cc
+msgid "Tar checksum failed, archive corrupted"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:206
-msgid "Compress child"
+#: apt-inst/contrib/extracttar.cc
+#, c-format
+msgid "Unknown TAR header type %u, member %s"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Internal error, failed to create %s"
+msgid "This is not a valid DEB archive, missing '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:304
-msgid "IO to subprocess/file failed"
+#: apt-inst/deb/debfile.cc
+#, c-format
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:342
-msgid "Failed to read while computing MD5"
+#: apt-inst/deb/debfile.cc
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:358
+#: apt-inst/dirstream.cc

 #, c-format
 #, c-format

-msgid "Problem unlinking %s"
+msgid "Failed to write file %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: apt-inst/dirstream.cc

 #, c-format
 #, c-format

-msgid "Failed to rename %s to %s"
-msgstr ""
-
-#: 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 ""
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
+msgid "Failed to close file %s"

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:117
-msgid "Failed to create pipes"
+#: apt-inst/extract.cc
+#, c-format
+msgid "Unpacking %s more than once"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:144
-msgid "Failed to exec gzip "
+#: apt-inst/extract.cc
+#, c-format
+msgid "The directory %s is diverted"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
-msgid "Corrupted archive"
+#: apt-inst/extract.cc
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:196
-msgid "Tar checksum failed, archive corrupted"
+#: apt-inst/extract.cc
+msgid "The diversion path is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "Unknown TAR header type %u, member %s"
+msgid "The directory %s is being replaced by a non-directory"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
+#: apt-inst/extract.cc
+msgid "Failed to locate node in its hash bucket"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
+#: apt-inst/extract.cc
+msgid "The path is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:94
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
+msgid "Overwrite package match with no version for %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:132
-msgid "Archive is too short"
+#: apt-inst/extract.cc
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:136
-msgid "Failed to read the archive headers"
+#: apt-inst/extract.cc
+#, c-format
+msgid "Unable to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc

 msgid "DropNode called on still linked node"
 msgstr ""
 
 msgid "DropNode called on still linked node"
 msgstr ""
 

-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc

 msgid "Failed to locate the hash element!"
 msgstr ""
 
 msgid "Failed to locate the hash element!"
 msgstr ""
 

-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc

 msgid "Failed to allocate diversion"
 msgstr ""
 
 msgid "Failed to allocate diversion"
 msgstr ""
 

-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc

 msgid "Internal error in AddDiversion"
 msgstr ""
 
 msgid "Internal error in AddDiversion"
 msgstr ""
 

-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc

 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 

-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc

 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 

-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc

 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 

-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
-msgid "Failed to write file %s"
-msgstr ""
-
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
-#, c-format
-msgid "The path %s is too long"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can't be authenticated and is therefore "
+"potentially dangerous to use."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:127
-#, c-format
-msgid "Unpacking %s more than once"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:137
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
+msgid "The repository '%s' is no longer signed."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:147
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "The repository '%s' does no longer have a Release file."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
-msgid "The diversion path is too long"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:243
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-
-#: apt-inst/extract.cc:283
-msgid "Failed to locate node in its hash bucket"
+msgid "The repository '%s' is not signed."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:287
-msgid "The path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:415
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Overwrite package match with no version for %s"
+msgid "The repository '%s' does not have a Release file."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:432
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "File %s/%s overwrites the one in the package %s"
+msgid "The repository '%s' provides only weak security information."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:492
-#, c-format
-msgid "Unable to stat %s"
+#: apt-pkg/acquire-item.cc
+msgid "Hash Sum mismatch"

 msgstr ""
 
 msgstr ""
 

-#: 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"
+#: apt-pkg/acquire-item.cc
+msgid "Insufficient information available to perform this download securely"

 msgstr ""
 
 msgstr ""
 

-#. 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
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgid "rename failed, %s (%s -> %s)."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:120
-#, c-format
-msgid "Internal error, could not locate member %s"
+#: apt-pkg/acquire-item.cc
+msgid "Size mismatch"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:214
-msgid "Unparsable control file"
+#: apt-pkg/acquire-item.cc
+msgid "Invalid file format"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
+#: apt-pkg/acquire-item.cc
+msgid "Signature error"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Couldn't duplicate file descriptor %i"
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:119
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
+msgid "GPG error: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:322
-msgid "Failed to truncate file"
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"

 msgstr ""
 
 msgstr ""
 

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

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

-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+msgid "Conflicting distribution: %s (expected %s but got %s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:443
+#: apt-pkg/acquire-item.cc
+#, c-format

 msgid ""
 msgid ""

-"Unable to increase size of the MMap as automatic growing is disabled by user."
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"

 msgstr ""
 
 msgstr ""
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
+msgid "Can't find a source to download version '%s' of '%s'"

 msgstr ""
 
 msgstr ""
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."

 msgstr ""
 
 msgstr ""
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "%limin %lis"
+msgid "Changelog unavailable for %s=%s"

 msgstr ""
 
 msgstr ""
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/acquire-worker.cc

 #, c-format
 #, c-format

-msgid "%lis"
+msgid "The method driver %s could not be found."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/acquire-worker.cc

 #, c-format
 #, c-format

-msgid "Selection %s not found"
+msgid "Is the package %s installed?"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
+msgid "Method %s did not start correctly"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Block starts with no name."
+msgid "List directory %spartial is missing."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:792
+#: apt-pkg/acquire.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Malformed tag"
+msgid "Archives directory %spartial is missing."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/acquire.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk after value"
+msgid "Unable to lock directory %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:849
+#: apt-pkg/acquire.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "No sandbox user '%s' on the system, can not drop privileges"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:856
+#: apt-pkg/acquire.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Too many nested includes"
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/acquire.cc apt-pkg/clean.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Included from here"
+msgid "Clean of %s is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:869
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgid "Retrieving file %li of %li (%s remaining)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:872
+#: apt-pkg/acquire.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Retrieving file %li of %li"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:922
+#: apt-pkg/algorithms.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
+#: apt-pkg/algorithms.cc
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Done"
+#: apt-pkg/algorithms.cc
+msgid "Unable to correct problems, you have held broken packages."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/cachefile.cc
+msgid "The package lists or status file could not be parsed or opened."

 msgstr ""
 
 msgstr ""
 

-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
+#: apt-pkg/cachefile.cc
+msgid "You may want to run apt-get update to correct these problems"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:80
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: apt-pkg/cachefile.cc
+msgid "The list of sources could not be read."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
+msgid "Release '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Command line option %s is not boolean"
+msgid "Version '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Option %s requires an argument."
+msgid "Couldn't find task '%s'"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Couldn't find any package by regex '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Option %s requires an integer argument, not '%s'"
+msgid "Couldn't find any package by glob '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Option '%s' is too long"
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Sense %s is not understood, try true or false."
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Invalid operation %s"
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Unable to stat the mount point %s"
+msgid "Can't select installed version from package %s as it is not installed"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:224
-msgid "Failed to stat the cdrom"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:93
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Problem closing the gzip file %s"
+msgid "Line %u too long in source list %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:225
-#, c-format
-msgid "Not using locking for read only lock file %s"
+#: apt-pkg/cdrom.cc
+msgid "Unmounting CD-ROM...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Could not open lock file %s"
+msgid "Using CD-ROM mount point %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:248
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+#: apt-pkg/cdrom.cc
+msgid "Waiting for disc...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:252
-#, c-format
-msgid "Could not get lock %s"
+#: apt-pkg/cdrom.cc
+msgid "Mounting CD-ROM...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+#: apt-pkg/cdrom.cc
+msgid "Identifying... "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Stored label: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:444
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/cdrom.cc
+msgid "Scanning disc for index files...\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/cdrom.cc

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

-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:840
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
+#: apt-pkg/cdrom.cc
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Sub-process %s received signal %u."
+msgid "Found label '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
+#: apt-pkg/cdrom.cc
+msgid "That is not a valid name, try again.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Sub-process %s exited unexpectedly"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:984
-#, c-format
-msgid "Could not open file %s"
+#: apt-pkg/cdrom.cc
+msgid "Copying package lists..."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1046
-#, c-format
-msgid "Could not open file descriptor %d"
+#: apt-pkg/cdrom.cc
+msgid "Writing new source list\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1136
-msgid "Failed to create subprocess IPC"
+#: apt-pkg/cdrom.cc
+msgid "Source list entries for this disc are:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1192
-msgid "Failed to exec compressor "
+#: apt-pkg/clean.cc
+#, c-format
+msgid "Unable to stat %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/cdromutl.cc

 #, c-format
 #, c-format

-msgid "read, still have %llu to read but none left"
+msgid "Unable to stat the mount point %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
-#, c-format
-msgid "write, still have %llu to write but couldn't"
+#: apt-pkg/contrib/cdromutl.cc
+msgid "Failed to stat the cdrom"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Problem closing the file %s"
+msgid ""
+"Command line option '%c' [from %s] is not understood in combination with the "
+"other options."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Problem renaming the file %s to %s"
+msgid ""
+"Command line option %s is not understood in combination with the other "
+"options"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Problem unlinking the file %s"
+msgid "Command line option %s is not boolean"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:1754
-msgid "Problem syncing the file"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option %s requires an argument."

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "No keyring installed in %s."
+msgid "Option %s: Configuration item specification must have an =<val>."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option '%s' is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Sense %s is not understood, try true or false."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Invalid operation %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "This APT does not support the versioning system '%s'"
+msgid "Unrecognized type abbreviation: '%c'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Opening configuration file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:305
-msgid "Depends"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:305
-msgid "PreDepends"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:305
-msgid "Suggests"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:306
-msgid "Recommends"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:306
-msgid "Conflicts"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:306
-msgid "Replaces"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Included from here"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:307
-msgid "Obsoletes"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:307
-msgid "Breaks"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:307
-msgid "Enhances"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:318
-msgid "important"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Problem unlinking the file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:318
-msgid "required"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Not using locking for read only lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:318
-msgid "standard"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:319
-msgid "optional"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:319
-msgid "extra"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not get lock %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:244
+#: apt-pkg/contrib/fileutl.cc

 #, c-format
 #, c-format

-msgid "Failed to open StateFile %s"
+msgid "Sub-process %s received a segmentation fault."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:250
+#: apt-pkg/contrib/fileutl.cc

 #, c-format
 #, c-format

-msgid "Failed to write temporary StateFile %s"
+msgid "Sub-process %s received signal %u."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (1)"
+msgid "Sub-process %s returned an error code (%u)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (2)"
+msgid "Sub-process %s exited unexpectedly"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "Problem closing the gzip file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:99
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Unexpected end of file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:110
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to create subprocess IPC"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:116
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to exec compressor "

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
+msgid "Could not open file descriptor %d"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist)"
+msgid "read, still have %llu to read but none left"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "write, still have %llu to write but couldn't"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "Problem closing the file %s"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Problem renaming the file %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:248
-#, c-format
-msgid "Opening %s"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Problem syncing the file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/contrib/mmap.cc
+msgid "Can't mmap an empty file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/contrib/mmap.cc

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
+msgid "Couldn't make mmap of %llu bytes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/contrib/mmap.cc

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Couldn't duplicate file descriptor %i"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+#: apt-pkg/contrib/mmap.cc
+msgid "Unable to close mmap"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
-#, c-format
-msgid "Could not configure '%s'. "
+#: apt-pkg/contrib/mmap.cc
+msgid "Unable to synchronize mmap"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/contrib/mmap.cc

 #, 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 "Couldn't make mmap of %lu bytes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgrecords.cc:34
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/contrib/mmap.cc
+msgid "Failed to truncate file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/contrib/mmap.cc

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

-"The package %s needs to be reinstalled, but I can't find an archive for it."
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/contrib/mmap.cc
+#, c-format

 msgid ""
 msgid ""

-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1233
-msgid "Unable to correct problems, you have held broken packages."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/contrib/mmap.cc

 msgid ""
 msgid ""

-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"Unable to increase size of the MMap as automatic growing is disabled by user."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:81
+#: apt-pkg/contrib/progress.cc

 #, c-format
 #, c-format

-msgid "List directory %spartial is missing."
+msgid "%c%s... Error!"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:85
+#: apt-pkg/contrib/progress.cc

 #, c-format
 #, c-format

-msgid "Archives directory %spartial is missing."
+msgid "%c%s... Done"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
+#: apt-pkg/contrib/progress.cc
+msgid "..."

 msgstr ""
 
 msgstr ""
 

-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "%c%s... %u%%"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:895
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li"
+msgid "%lid %lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:112
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "The method driver %s could not be found."
+msgid "%lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:161
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "Method %s did not start correctly"
+msgid "%limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:440
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "%lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/init.cc:151
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "Packaging system '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/init.cc:167
-msgid "Unable to determine a suitable packaging system type"
+msgid "Selection %s not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/clean.cc:57
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Target %s (%s) is configured multiple times in %s and %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Unable to parse Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "No sections in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "No Hash entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:75
+#: apt-pkg/deb/debmetaindex.cc

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

-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:399
+#: apt-pkg/deb/debmetaindex.cc

 #, c-format
 #, c-format

-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Invalid '%s' entry in Release file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:421
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc

 #, c-format
 #, c-format

-msgid "Did not understand pin type %s"
+msgid "Conflicting values set for option %s regarding source %s %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:429
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Invalid value set for option %s regarding source %s %s (%s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (%s%d)"
+msgid "Unable to parse package file %s (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/deb/debsystem.cc
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/deb/debsystem.cc
+msgid "Not locked"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Installing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
-msgid "Reading package lists"
+msgid "Configuring %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1255
-msgid "Collecting File Provides"
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Removing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
-msgid "IO Error saving source cache"
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Completely removing %s"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "rename failed, %s (%s -> %s)."
+msgid "Noting disappearance of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:599
-msgid "MD5Sum mismatch"
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Running post-installation trigger %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
-msgid "Hash Sum mismatch"
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Installed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1370
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Directory '%s' missing"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc

 #, c-format
 #, c-format

-msgid "Unable to find hash sum for '%s' in Release file"
+msgid "Could not open file '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1428
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Preparing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
+msgid "Removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
+msgid "Preparing to completely remove %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 #, c-format

-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Can not write log (%s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1857
-msgid "Size mismatch"
+#: apt-pkg/deb/dpkgpm.cc
+msgid "Is /dev/pts mounted?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:68
-#, c-format
-msgid "Unable to parse Release file %s"
+#: apt-pkg/deb/dpkgpm.cc
+msgid "Operation was interrupted before it could finish"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "No sections in Release file %s"
+#: apt-pkg/deb/dpkgpm.cc
+msgid "No apport report written because MaxReports is reached already"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:112
-#, c-format
-msgid "No Hash entry in Release file %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc
+msgid "dependency problems - leaving unconfigured"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:125
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:144
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/vendorlist.cc:78
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:576
-#, c-format
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 msgid ""

-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
+"No apport report written because the error message indicates an issue on the "
+"local system"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
+#: apt-pkg/depcache.cc
+msgid "Building dependency tree"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
-msgid "Unmounting CD-ROM...\n"
+#: apt-pkg/depcache.cc
+msgid "Candidate versions"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:642
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
+#: apt-pkg/depcache.cc
+msgid "Dependency generation"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/depcache.cc
+msgid "Reading state information"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:665
-msgid "Waiting for disc...\n"
+#: apt-pkg/depcache.cc
+#, c-format
+msgid "Failed to open StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:674
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/depcache.cc
+#, c-format
+msgid "Failed to write temporary StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:693
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/edsp.cc
+msgid "Send scenario to solver"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:744
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+#: apt-pkg/edsp.cc
+msgid "Send request to solver"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:755
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+#: apt-pkg/edsp.cc
+msgid "Prepare for receiving solution"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:782
-#, c-format
-msgid "Found label '%s'\n"
+#: apt-pkg/edsp.cc
+msgid "External solver failed without a proper error message"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:811
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/edsp.cc
+msgid "Execute external solver"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:828
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+#: apt-pkg/edsp.cc
+msgid "Execute external planner"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:830
-msgid "Copying package lists..."
+#: apt-pkg/edsp.cc
+msgid "Send request to planner"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:857
-msgid "Writing new source list\n"
+#: apt-pkg/edsp.cc
+msgid "Send scenario to planner"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:865
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/edsp.cc
+msgid "External planner failed without a proper error message"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc

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

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
+#: apt-pkg/indexcopy.cc

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

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
+#: apt-pkg/indexcopy.cc

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

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
+#: apt-pkg/indexcopy.cc

 #, 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:515
+#: apt-pkg/indexcopy.cc

 #, 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:521
+#: apt-pkg/indexcopy.cc

 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:403
+#: apt-pkg/init.cc

 #, c-format
 #, c-format

-msgid "Release '%s' for '%s' was not found"
+msgid "Packaging system '%s' is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:406
-#, c-format
-msgid "Version '%s' for '%s' was not found"
+#: apt-pkg/init.cc
+msgid "Unable to determine a suitable packaging system type"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:517
+#: apt-pkg/install-progress.cc

 #, c-format
 #, c-format

-msgid "Couldn't find task '%s'"
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc
+msgid "Running dpkg"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:523
+#: apt-pkg/packagemanager.cc

 #, c-format
 #, c-format

-msgid "Couldn't find any package by regex '%s'"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:534
+#: apt-pkg/packagemanager.cc

 #, c-format
 #, c-format

-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Could not configure '%s'. "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/packagemanager.cc

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

-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"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/cacheset.cc:555
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+#: apt-pkg/pkgcache.cc
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is an incompatible version"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:563
+#: apt-pkg/pkgcache.cc

 #, c-format
 #, c-format

-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "This APT does not support the versioning system '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:571
+#: apt-pkg/pkgcache.cc

 #, c-format
 #, c-format

-msgid "Can't select installed version from package %s as it is not installed"
+msgid "The package cache was built for different architectures: %s vs %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted, it has the wrong hash"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/pkgcache.cc
+msgid "Depends"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/pkgcache.cc
+msgid "PreDepends"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/pkgcache.cc
+msgid "Suggests"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/pkgcache.cc
+msgid "Recommends"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:73
-#, c-format
-msgid "Installing %s"
+#: apt-pkg/pkgcache.cc
+msgid "Conflicts"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
-#, c-format
-msgid "Configuring %s"
+#: apt-pkg/pkgcache.cc
+msgid "Replaces"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
-#, c-format
-msgid "Removing %s"
+#: apt-pkg/pkgcache.cc
+msgid "Obsoletes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:76
-#, c-format
-msgid "Completely removing %s"
+#: apt-pkg/pkgcache.cc
+msgid "Breaks"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:77
-#, c-format
-msgid "Noting disappearance of %s"
+#: apt-pkg/pkgcache.cc
+msgid "Enhances"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:78
-#, c-format
-msgid "Running post-installation trigger %s"
+#: apt-pkg/pkgcache.cc
+msgid "required"

 msgstr ""
 
 msgstr ""
 

-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
-#, c-format
-msgid "Directory '%s' missing"
+#: apt-pkg/pkgcache.cc
+msgid "important"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
-#, c-format
-msgid "Could not open file '%s'"
+#: apt-pkg/pkgcache.cc
+msgid "standard"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:945
-#, c-format
-msgid "Preparing %s"
+#: apt-pkg/pkgcache.cc
+msgid "optional"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:946
-#, c-format
-msgid "Unpacking %s"
+#: apt-pkg/pkgcache.cc
+msgid "extra"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:951
-#, c-format
-msgid "Preparing to configure %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "Cache has an incompatible versioning system"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:953
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:958
-#, c-format
-msgid "Preparing for removal of %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of package names this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:960
-#, c-format
-msgid "Removed %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc
+msgid "IO Error saving source cache"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/pkgrecords.cc

 #, c-format
 #, c-format

-msgid "Preparing to completely remove %s"
+msgid "Index file type '%s' is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/policy.cc

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1213
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/policy.cc
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1243
-msgid "Running dpkg"
+#: apt-pkg/policy.cc
+#, c-format
+msgid "Did not understand pin type %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1415
-msgid "Operation was interrupted before it could finish"
+#: apt-pkg/policy.cc
+#, c-format
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1477
-msgid "No apport report written because MaxReports is reached already"
+#: apt-pkg/policy.cc
+msgid "No priority (or zero) specified for pin"

 msgstr ""
 
 msgstr ""
 

-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
-msgid "dependency problems - leaving unconfigured"
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Malformed entry %u in %s file %s (%s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1484
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Opening %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1490
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Malformed line %u in source list %s (type)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1496
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1503
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Type '%s' is not known on stanza %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Unsupported file %s given on commandline"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
+#: apt-pkg/srcrecords.cc
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/tagfile.cc

 #, c-format
 #, c-format

+msgid "Cannot convert %s to integer: out of range"
+msgstr ""
+
+#: apt-pkg/update.cc

 msgid ""
 msgid ""

-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
+#: apt-pkg/upgrade.cc
+msgid "Calculating upgrade"

 msgstr ""
 msgstr ""