verify hash of input file in rred

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 07904688f0b71720261facd8e06334f7305f9e09..689058e69efb0925cfe71fac64a3f02d532bac89 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt 1.1~exp12ubuntu1~20151005\n"
+"Project-Id-Version: apt 1.3~exp3\n"

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

-"POT-Creation-Date: 2015-10-05 18:29+0200\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -162,6 +162,36 @@ msgstr ""
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
 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 ""
+
+#: 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 ""
+

 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""


@@ -190,9 +220,9 @@ msgid ""
 "unauthenticated"
 msgstr ""
 
 "unauthenticated"
 msgstr ""
 

-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc

 #, c-format
 #, c-format

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

 msgstr ""
 
 #: apt-private/private-download.cc
 msgstr ""
 
 #: apt-private/private-download.cc


@@ -205,6 +235,36 @@ msgstr ""
 msgid "You don't have enough free space in %s."
 msgstr ""
 
 msgid "You don't have enough free space in %s."
 msgstr ""
 

+#: apt-private/private-download.cc
+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 ""
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""


@@ -295,7 +355,7 @@ msgstr ""
 msgid "Some files failed to download"
 msgstr ""
 
 msgid "Some files failed to download"
 msgstr ""
 

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

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


@@ -341,20 +401,6 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
 "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 ""
 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""


@@ -377,6 +423,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: apt-private/private-install.cc
 msgstr[1] ""
 
 #: apt-private/private-install.cc

+#, c-format

 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""


@@ -392,18 +439,6 @@ msgid ""
 "solution)."
 msgstr ""
 
 "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 ""
 #: apt-private/private-install.cc
 msgid "The following additional packages will be installed:"
 msgstr ""


@@ -464,12 +499,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

+#. TRANSLATORS: placeholder is a binary name like apt or apt-get

 #: apt-private/private-main.cc
 #: apt-private/private-main.cc

+#, c-format

 msgid ""
 "NOTE: This is only a simulation!\n"
 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"
 "      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
 msgstr ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc


@@ -631,7 +668,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr ""
 
 msgid "Regex compilation error - %s"
 msgstr ""
 

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

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


@@ -656,8 +693,177 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
 msgid "not a real package (virtual)"
 msgstr ""
 

-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr ""
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+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 ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"

 msgstr ""
 
 #: apt-private/private-sources.cc
 msgstr ""
 
 #: apt-private/private-sources.cc


@@ -670,6 +876,11 @@ msgstr ""
 msgid "Your '%s' file changed, please run 'apt-get update'."
 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 ""
 #: apt-private/private-update.cc
 msgid "The update command takes no arguments"
 msgstr ""


@@ -686,11 +897,6 @@ msgstr[1] ""
 msgid "All packages are up to date."
 msgstr ""
 
 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 ""
 #: cmdline/apt-cache.cc
 msgid "apt-cache stats does not take any arguments"
 msgstr ""


@@ -763,113 +969,45 @@ msgstr ""
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 

-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-
-#. Show any packages have explicit pins

 #: cmdline/apt-cache.cc
 #: cmdline/apt-cache.cc

-msgid "Pinned packages:"
+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 ""
 
 #: cmdline/apt-cache.cc
 msgstr ""
 
 #: cmdline/apt-cache.cc

-msgid "(not found)"
+msgid "Show source records"

 msgstr ""
 
 msgstr ""
 

-#. Print the package name and the version we are forcing to

 #: cmdline/apt-cache.cc
 #: cmdline/apt-cache.cc

-#, c-format
-msgid "%s -> %s with priority %d\n"
+msgid "Search the package list for a regex pattern"

 msgstr ""
 
 #: cmdline/apt-cache.cc
 msgstr ""
 
 #: cmdline/apt-cache.cc

-msgid "  Installed: "
+msgid "Show raw dependency information for a package"

 msgstr ""
 
 #: cmdline/apt-cache.cc
 msgstr ""
 
 #: cmdline/apt-cache.cc

-msgid "  Candidate: "
+msgid "Show reverse dependency information for a package"

 msgstr ""
 
 #: cmdline/apt-cache.cc
 msgstr ""
 
 #: cmdline/apt-cache.cc

-msgid "(none)"
+msgid "Show a readable record for the package"

 msgstr ""
 
 #: cmdline/apt-cache.cc
 msgstr ""
 
 #: cmdline/apt-cache.cc

-msgid "  Package pin: "
+msgid "List the names of all packages in the system"

 msgstr ""
 
 msgstr ""
 

-#. Show the priority tables

 #: cmdline/apt-cache.cc
 #: cmdline/apt-cache.cc

-msgid "  Version table:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-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"
-msgstr ""
-
-#: cmdline/apt.cc
-msgid ""
-"Usage: apt [options] command\n"
-"\n"
-"CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
+msgid "Show policy settings"

 msgstr ""
 
 #: cmdline/apt-cdrom.cc
 msgstr ""
 
 #: cmdline/apt-cdrom.cc


@@ -897,6 +1035,15 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 

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

 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr ""
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr ""


@@ -905,41 +1052,16 @@ msgstr ""
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package for architecture '%s'"
+"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
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc


@@ -963,311 +1085,265 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-msgid "Unable to lock the download directory"
+msgid "Supported modules:"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-msgid "Must specify at least one package to fetch source for"
+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 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 ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Unable to find a source package for %s"
+msgid "Retrieve new lists of packages"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

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

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgid "Install new packages (pkg is libc6 not libc6.deb)"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

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

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

-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
+msgid "Remove packages and config files"

 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
-#, c-format
-msgid "Need to get %sB of source archives.\n"
+#: cmdline/apt-get.cc cmdline/apt.cc
+msgid "Remove automatically all unused packages"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Fetch source %s\n"
+msgid "Distribution upgrade, see apt-get(8)"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-msgid "Failed to fetch some archives."
+msgid "Follow dselect selections"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
+msgid "Configure build-dependencies for source packages"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Unpack command '%s' failed.\n"
+msgid "Erase downloaded archive files"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgid "Erase old downloaded archive files"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Build command '%s' failed.\n"
+msgid "Verify that there are no broken dependencies"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-msgid "Must specify at least one package to check builddeps for"
+msgid "Download source archives"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+msgid "Download the binary package into the current directory"

 msgstr ""
 
 #: cmdline/apt-get.cc
 msgstr ""
 
 #: cmdline/apt-get.cc

-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
+msgid "Download and display the changelog for the given package"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
+#: cmdline/apt-helper.cc
+msgid "Need one URL as argument"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
+#: cmdline/apt-helper.cc
+msgid "Must specify at least one pair url/filename"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
+#: cmdline/apt-helper.cc
+msgid "Download Failed"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
+msgid "GetSrvRec failed for %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-#, c-format
+#: cmdline/apt-helper.cc

 msgid ""
 msgid ""

-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
+"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
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+msgid "%s can not be marked as it is not installed.\n"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
+msgid "%s was already set to manually installed.\n"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: %s"
+msgid "%s was already set to automatically installed.\n"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Build-dependencies for %s could not be satisfied."
+msgid "%s was already set on hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "%s was already not hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-msgid "Supported modules:"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc
-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"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "%s set on hold.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-helper.cc
-msgid "Need one URL as argument"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Canceled hold on %s.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-helper.cc
-msgid "Must specify at least one pair url/filename"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for purge.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-helper.cc
-msgid "Download Failed"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-helper.cc
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "GetSrvRec failed for %s"
+msgid "Selected %s for installation.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-helper.cc
+#: cmdline/apt-mark.cc

 msgid ""
 msgid ""

-"Usage: apt-helper [options] command\n"
-"       apt-helper [options] download-file uri target-path\n"
-"\n"
-"apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"

 "\n"
 "\n"

-"                       This APT helper has Super Meep Powers.\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 ""
 
 #: cmdline/apt-mark.cc
 msgstr ""
 
 #: cmdline/apt-mark.cc

-#, c-format
-msgid "%s can not be marked as it is not installed.\n"
+msgid "Mark the given packages as automatically installed"

 msgstr ""
 
 #: cmdline/apt-mark.cc
 msgstr ""
 
 #: cmdline/apt-mark.cc

-#, c-format
-msgid "%s was already set to manually installed.\n"
+msgid "Mark the given packages as manually installed"

 msgstr ""
 
 #: cmdline/apt-mark.cc
 msgstr ""
 
 #: cmdline/apt-mark.cc

-#, c-format
-msgid "%s was already set to automatically installed.\n"
+msgid "Mark a package as held back"

 msgstr ""
 
 #: cmdline/apt-mark.cc
 msgstr ""
 
 #: cmdline/apt-mark.cc

-#, c-format
-msgid "%s was already set on hold.\n"
+msgid "Unset a package set as held back"

 msgstr ""
 
 #: cmdline/apt-mark.cc
 msgstr ""
 
 #: cmdline/apt-mark.cc

-#, c-format
-msgid "%s was already not hold.\n"
+msgid "Print the list of automatically installed packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+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 ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc
-#, c-format
-msgid "%s set on hold.\n"
+#: cmdline/apt.cc
+msgid "remove packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc
-#, c-format
-msgid "Canceled hold on %s.\n"
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-#: 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 list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\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."
+#: 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
 msgstr ""
 
 #: methods/cdrom.cc


@@ -1364,11 +1440,11 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 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 ""
 
 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 ""
 
 msgid "Failed to set modification time"
 msgstr ""
 


@@ -1521,6 +1597,21 @@ msgstr ""
 msgid "Unable to invoke "
 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 ""
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr ""


@@ -1534,16 +1625,14 @@ msgstr ""
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 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 ""
 
 msgstr ""
 

+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.

 #: methods/gpgv.cc
 #: 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
 msgstr ""
 
 #: methods/gpgv.cc


@@ -1556,10 +1645,6 @@ msgid ""
 "available:\n"
 msgstr ""
 
 "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 ""
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr ""


@@ -1627,6 +1712,12 @@ msgstr ""
 msgid "[Mirror: %s]"
 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 ""
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""


@@ -1682,6 +1773,10 @@ msgstr ""
 msgid "Internal error"
 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 ""
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr ""


@@ -1716,18 +1811,27 @@ msgstr ""
 msgid "Merging available information"
 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"
 "\n"
 #: cmdline/apt-extracttemplates.cc
 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 ""
 
 #: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc


@@ -1749,13 +1853,8 @@ msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
 "apt-internal-solver is an interface to use the current internal\n"
 "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"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"

 msgstr ""
 
 #: cmdline/apt-sortpkgs.cc
 msgstr ""
 
 #: cmdline/apt-sortpkgs.cc


@@ -1766,14 +1865,9 @@ msgstr ""
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 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-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
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc


@@ -1870,11 +1964,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 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 ""
 #: ftparchive/cachedb.cc
 msgid "Failed to read .dsc"
 msgstr ""


@@ -1922,11 +2011,6 @@ msgstr ""
 msgid "Failed to read while computing MD5"
 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"
 #: ftparchive/multicompress.cc apt-inst/extract.cc
 #, c-format
 msgid "Failed to rename %s to %s"


@@ -2005,16 +2089,11 @@ msgstr ""
 msgid " DeLink %s [%s]\n"
 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 ""
 
 #, 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"
 #: ftparchive/writer.cc
 #, c-format
 msgid "*** Failed to link %s to %s"


@@ -2199,47 +2278,61 @@ msgstr ""
 msgid "Duplicate conf file %s/%s"
 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 ""
 
 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 ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Unable to lock directory %s"
+msgid "The repository '%s' is no longer signed."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

+msgid "The repository '%s' does no longer have a Release file."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc

 msgid ""
 msgid ""

-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Clean of %s is not supported"
+msgid "The repository '%s' is not signed."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "The repository '%s' does not have a Release file."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li"
+msgid "The repository '%s' provides only weak security information."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid "Hash Sum mismatch"

 msgstr ""
 
 #: apt-pkg/acquire-item.cc
 msgstr ""
 
 #: apt-pkg/acquire-item.cc

-msgid "Use --allow-insecure-repositories to force the update"
+msgid "Insufficient information available to perform this download securely"

 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc


@@ -2247,10 +2340,6 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 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 ""
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr ""


@@ -2276,6 +2365,13 @@ msgstr ""
 msgid "GPG error: %s: %s"
 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 ""
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""


@@ -2284,7 +2380,10 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
 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
 msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is


@@ -2302,31 +2401,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc
-#, 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 ""
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""


@@ -2372,6 +2446,50 @@ msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr ""
 
 "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 ""
 #: apt-pkg/algorithms.cc
 #, c-format
 msgid ""


@@ -2646,6 +2764,11 @@ msgstr ""
 msgid "Syntax error %s:%u: Extra junk at end of file"
 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"
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Not using locking for read only lock file %s"


@@ -2713,46 +2836,45 @@ msgid "Problem closing the gzip file %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 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
 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
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc

-msgid "Failed to create subprocess IPC"
+msgid "Failed to exec compressor "

 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc
 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
 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
 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
 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
 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
 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
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc


@@ -2765,12 +2887,12 @@ msgstr ""
 
 #: apt-pkg/contrib/mmap.cc
 #, c-format
 
 #: 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
 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
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc


@@ -2891,23 +3013,30 @@ msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 
 #: 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
 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
 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
 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
 msgstr ""
 
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc


@@ -2975,7 +3104,7 @@ msgstr ""
 msgid "Directory '%s' missing"
 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 ""
 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""


@@ -3197,10 +3326,6 @@ msgstr ""
 msgid "The package cache file is an incompatible version"
 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'"
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"


@@ -3211,6 +3336,10 @@ msgstr ""
 msgid "The package cache was built for different architectures: %s vs %s"
 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 ""
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr ""


@@ -3248,11 +3377,11 @@ msgid "Enhances"
 msgstr ""
 
 #: apt-pkg/pkgcache.cc
 msgstr ""
 
 #: apt-pkg/pkgcache.cc

-msgid "important"
+msgid "required"

 msgstr ""
 
 #: apt-pkg/pkgcache.cc
 msgstr ""
 
 #: apt-pkg/pkgcache.cc

-msgid "required"
+msgid "important"

 msgstr ""
 
 #: apt-pkg/pkgcache.cc
 msgstr ""
 
 #: apt-pkg/pkgcache.cc


@@ -3364,18 +3493,18 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 

+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+

 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
 #: apt-pkg/tagfile.cc
 #, c-format
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 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
 msgstr ""
 
 #: apt-pkg/update.cc