X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8561c2fedae26aecd8ba758a5e7ef686ba1243f3..08fcf9628806af202e555bd02b3611e4e9a3d757:/po/apt-all.pot?ds=sidebyside

diff --git a/po/apt-all.pot b/po/apt-all.pot
index c3e08765b..689058e69 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.1~exp14\n"
+"Project-Id-Version: apt 1.3~exp3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-27 10:30+0100\n"
+"POT-Creation-Date: 2016-06-23 09:02+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"
@@ -220,9 +220,9 @@ msgid ""
 "unauthenticated"
 msgstr ""
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
+msgid "Failed to fetch %s  %s"
 msgstr ""
 
 #: apt-private/private-download.cc
@@ -239,6 +239,32 @@ msgstr ""
 msgid "Unable to lock the download directory"
 msgstr ""
 
+#: 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 ""
+
+#.
+#. 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 ""
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr ""
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -375,20 +401,6 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
@@ -427,18 +439,6 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: 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 ""
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr ""
-
 #: apt-private/private-install.cc
 msgid "The following additional packages will be installed:"
 msgstr ""
@@ -499,12 +499,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
 #: apt-private/private-main.cc
+#, c-format
 msgid ""
 "NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\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!"
+"      so don't depend on the relevance to the real current situation!\n"
 msgstr ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc
@@ -709,10 +711,6 @@ msgstr ""
 msgid "Pinned packages:"
 msgstr ""
 
-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr ""
-
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
@@ -731,10 +729,6 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr ""
-
 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"
@@ -837,27 +831,6 @@ msgstr ""
 msgid "Build command '%s' failed.\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 ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr ""
-
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
@@ -869,46 +842,24 @@ msgid "%s has no build depends.\n"
 msgstr ""
 
 #: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 #: apt-private/private-source.cc
 #, c-format
 msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
 msgstr ""
 
 #: apt-private/private-source.cc
 #, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
+msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
 
 #: apt-private/private-source.cc
 #, c-format
-msgid "Build-dependencies for %s could not be satisfied."
+msgid "Note, using file '%s' to get the build dependencies\n"
 msgstr ""
 
 #: apt-private/private-source.cc
@@ -925,6 +876,11 @@ msgstr ""
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
+#: apt-private/private-unmet.cc
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr ""
+
 #: apt-private/private-update.cc
 msgid "The update command takes no arguments"
 msgstr ""
@@ -941,11 +897,6 @@ msgstr[1] ""
 msgid "All packages are up to date."
 msgstr ""
 
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
-
 #: cmdline/apt-cache.cc
 msgid "apt-cache stats does not take any arguments"
 msgstr ""
@@ -1024,10 +975,10 @@ msgid ""
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
 "apt-cache queries and displays available information about installed\n"
-"as well as installable packages. It works exclusively on the data\n"
-"acquired via the 'update' command of e.g. apt-get to the local cache.\n"
-"The displayed information can therefore be outdated if the last update\n"
-"is too long ago, but in exchange apt-cache works independently of the\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 ""
 
@@ -1059,61 +1010,6 @@ msgstr ""
 msgid "Show policy settings"
 msgstr ""
 
-#: 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 ""
-
-#. query
-#: cmdline/apt.cc
-msgid "list packages based on package names"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "search in package descriptions"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "show package details"
-msgstr ""
-
-#. package stuff
-#: cmdline/apt.cc
-msgid "install packages"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "remove packages"
-msgstr ""
-
-#: cmdline/apt.cc cmdline/apt-get.cc
-msgid "Remove automatically all unused packages"
-msgstr ""
-
-#. system wide stuff
-#: cmdline/apt.cc
-msgid "update list of available packages"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "upgrade the system by installing/upgrading packages"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid "upgrade the system by removing/installing/upgrading packages"
-msgstr ""
-
-#. misc
-#: cmdline/apt.cc
-msgid "edit the source information file"
-msgstr ""
-
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -1157,7 +1053,7 @@ msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is an interface to the configuration settings used by\n"
-"all APT tools to be used mainly in debugging and shell scripting.\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"
 msgstr ""
 
 #: cmdline/apt-config.cc
@@ -1224,6 +1120,10 @@ msgstr ""
 msgid "Remove packages and config files"
 msgstr ""
 
+#: cmdline/apt-get.cc cmdline/apt.cc
+msgid "Remove automatically all unused packages"
+msgstr ""
+
 #: cmdline/apt-get.cc
 msgid "Distribution upgrade, see apt-get(8)"
 msgstr ""
@@ -1280,10 +1180,11 @@ msgstr ""
 #: 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 do.\n"
+"e.g. the same proxy configuration or acquire system as APT would.\n"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1294,6 +1195,10 @@ msgstr ""
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"
 msgstr ""
@@ -1357,9 +1262,9 @@ 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 is also possible to\n"
-"manipulate the dpkg(1) selection states of packages with it.\n"
-"It can also list all packages with or without a certain marking.\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 ""
 
 #: cmdline/apt-mark.cc
@@ -1390,6 +1295,57 @@ msgstr ""
 msgid "Print the list of package on hold"
 msgstr ""
 
+#: 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 ""
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr ""
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -1484,11 +1440,11 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/store.cc
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/rred.cc methods/store.cc
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1641,6 +1597,21 @@ msgstr ""
 msgid "Unable to invoke "
 msgstr ""
 
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr ""
+
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr ""
@@ -1654,16 +1625,14 @@ msgstr ""
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"
 msgstr ""
 
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
 #: methods/gpgv.cc
-msgid "Unknown error executing apt-key"
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
 msgstr ""
 
 #: methods/gpgv.cc
@@ -1676,10 +1645,6 @@ msgid ""
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc
-msgid "Empty files can't be valid archives"
-msgstr ""
-
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr ""
@@ -1747,6 +1712,12 @@ msgstr ""
 msgid "[Mirror: %s]"
 msgstr ""
 
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr ""
+
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
@@ -1802,6 +1773,10 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr ""
+
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr ""
@@ -1836,6 +1811,20 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
+#: 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
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
 #: cmdline/apt-extracttemplates.cc
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -1864,7 +1853,8 @@ 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"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"
 msgstr ""
 
 #: cmdline/apt-sortpkgs.cc
@@ -1876,7 +1866,7 @@ msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 "apt-sortpkgs is a simple tool to sort package information files.\n"
-"It sorts by default by binary package information, but the -s option\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 ""
 
@@ -1974,11 +1964,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc apt-inst/extract.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
 #: ftparchive/cachedb.cc
 msgid "Failed to read .dsc"
 msgstr ""
@@ -2026,11 +2011,6 @@ msgstr ""
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc
-#, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
 #: ftparchive/multicompress.cc apt-inst/extract.cc
 #, c-format
 msgid "Failed to rename %s to %s"
@@ -2109,16 +2089,11 @@ msgstr ""
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
 #: ftparchive/writer.cc
 #, c-format
 msgid "*** Failed to link %s to %s"
@@ -2303,61 +2278,61 @@ msgstr ""
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
-#, c-format
-msgid "List directory %spartial is missing."
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."
 msgstr ""
 
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "Archives directory %spartial is missing."
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can't be authenticated and is therefore "
+"potentially dangerous to use."
 msgstr ""
 
-#: apt-pkg/acquire.cc
-#, c-format
-msgid "Unable to lock directory %s"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
-#: apt-pkg/acquire.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
+msgid "The repository '%s' is no longer signed."
 msgstr ""
 
-#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid "Clean of %s is not supported"
+msgid "The repository '%s' does no longer have a Release file."
 msgstr ""
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "The repository '%s' is not signed."
 msgstr ""
 
-#: apt-pkg/acquire.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid "Retrieving file %li of %li"
+msgid "The repository '%s' does not have a Release file."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid ""
-"Updating such a repository securily is impossible and therefore disabled by "
-"default."
+#, c-format
+msgid "The repository '%s' provides only weak security information."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid ""
-"Data from such a repository can not be authenticated and is therefore "
-"potentially dangerous to use."
+msgid "Hash Sum mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid ""
-"See apt-secure(8) manpage for repository creation and user configuration "
-"details."
+msgid "Insufficient information available to perform this download securely"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2365,10 +2340,6 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc
-msgid "Hash Sum mismatch"
-msgstr ""
-
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr ""
@@ -2394,6 +2365,13 @@ msgstr ""
 msgid "GPG error: %s: %s"
 msgstr ""
 
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"
+msgstr ""
+
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2402,7 +2380,10 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
 msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
@@ -2420,33 +2401,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. No Release file was present, or verification failed, so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the users explicitely wants it
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid "The repository '%s' is not signed."
-msgstr ""
-
-#. No Release file was present so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the users explicitely wants it
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid "The repository '%s' does not have a Release file."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2492,6 +2446,50 @@ msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr ""
 
+#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "No sandbox user '%s' on the system, can not drop privileges"
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr ""
+
 #: apt-pkg/algorithms.cc
 #, c-format
 msgid ""
@@ -2766,6 +2764,11 @@ msgstr ""
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for read only lock file %s"
@@ -2807,11 +2810,6 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -2838,46 +2836,45 @@ msgid "Problem closing the gzip file %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file %s"
+msgid "Unexpected end of file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file descriptor %d"
+msgid "Failed to create subprocess IPC"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
-msgid "Failed to create subprocess IPC"
+msgid "Failed to exec compressor "
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
-msgid "Failed to exec compressor "
+#, c-format
+msgid "Could not open file %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid "Could not open file descriptor %d"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "Problem closing the file %s"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "Problem renaming the file %s to %s"
+msgid "Problem closing the file %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
-msgid "Problem unlinking the file %s"
+msgid "Problem renaming the file %s to %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
@@ -2890,12 +2887,12 @@ msgstr ""
 
 #: apt-pkg/contrib/mmap.cc
 #, c-format
-msgid "Couldn't duplicate file descriptor %i"
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc
 #, c-format
-msgid "Couldn't make mmap of %llu bytes"
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc
@@ -3016,23 +3013,30 @@ msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+msgid ""
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Invalid '%s' entry in Release file %s"
 msgstr ""
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Conflicting values set for option %s concerning source %s %s"
+msgid "Conflicting values set for option %s regarding source %s %s"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Invalid value set for option %s concerning source %s %s (%s)"
+msgid "Invalid value set for option %s regarding source %s %s (%s)"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
 msgstr ""
 
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
@@ -3100,7 +3104,7 @@ msgstr ""
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""
@@ -3322,10 +3326,6 @@ msgstr ""
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
-
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
@@ -3336,6 +3336,10 @@ msgstr ""
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr ""
+
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr ""
@@ -3373,11 +3377,11 @@ msgid "Enhances"
 msgstr ""
 
 #: apt-pkg/pkgcache.cc
-msgid "important"
+msgid "required"
 msgstr ""
 
 #: apt-pkg/pkgcache.cc
-msgid "required"
+msgid "important"
 msgstr ""
 
 #: apt-pkg/pkgcache.cc
@@ -3500,12 +3504,7 @@ msgstr ""
 
 #: apt-pkg/tagfile.cc
 #, c-format
-msgid "Cannot convert %s to integer"
-msgstr ""
-
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
+msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
 #: apt-pkg/update.cc