revamp all tools help messages

The general idea is: A small paragraph on the tool itself as a
description, a list of the most used (!= all) commands available in the
tool, a remark where to find more information on the tool and its
commands (aka: in the manpage) and finally a common block referring to
even more manpages. In exchange options are completely omitted from the
output as well as deprecated or obscure commands. (Better) Information
about them is available in the manpages anyway and the few options which
were listed before were also the least interesting ones (-o -c -q and co
are hardly of interest for someone totally new looking to find info by
asking for help and anyone with a bit of experience doesn't need this
short list. Those would need a list of options applying to the command
they call, but they are too numerous and command specific to list them
sanely in this context.

68 files changed, 18249 insertions, 18604 deletions

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 4e80314f1..4231c4f0e 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -7,14 +7,17 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cmndline.h>
 
-#include <vector>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
 
+#include <vector>
+#include <iomanip>
+
 #include <apti18n.h>
 									/*}}}*/
 
@@ -362,23 +365,57 @@ std::vector<CommandLine::Args> getCommandArgs(APT_CMD const Program, char const
 									/*}}}*/
 #undef CmdMatches
 #undef addArg
-static bool ShowCommonHelp(APT_CMD const Binary, CommandLine &CmdL, aptDispatchWithHelp const * Cmds)/*{{{*/
+static void ShowHelpListCommands(std::vector<aptDispatchWithHelp> const &Cmds)/*{{{*/
 {
-   std::cout << PACKAGE << " " << PACKAGE_VERSION << " (" << COMMON_ARCH << ")" << std::endl;
-   if (_config->FindB("version") == true && Binary != APT_CMD::APT_GET)
-      return true;
-   return ShowHelp(CmdL, Cmds);
+   if (Cmds.empty() || Cmds[0].Match == nullptr)
+      return;
+   std::cout << std::endl << _("Most used commands:") << std::endl;
+   for (auto const &c: Cmds)
+   {
+      if (c.Help == nullptr)
+	 continue;
+      std::cout << "  " << c.Match << " - " << c.Help << std::endl;
+   }
 }
 									/*}}}*/
-void ShowHelpListCommands(aptDispatchWithHelp const * Cmds)		/*{{{*/
+static bool ShowCommonHelp(APT_CMD const Binary, CommandLine &CmdL, std::vector<aptDispatchWithHelp> const &Cmds)/*{{{*/
 {
-   std::cout << _("Commands:") << std::endl;
-   for (; Cmds->Handler != nullptr; ++Cmds)
+   std::cout << PACKAGE << " " << PACKAGE_VERSION << " (" << COMMON_ARCH << ")" << std::endl;
+   if (_config->FindB("version") == true && Binary != APT_CMD::APT_GET)
+      return true;
+   if (ShowHelp(CmdL) == false)
+      return false;
+   if (_config->FindB("version") == true || Binary == APT_CMD::APT_FTPARCHIVE)
+      return true;
+   ShowHelpListCommands(Cmds);
+   std::cout << std::endl;
+   char const * cmd = nullptr;
+   switch (Binary)
    {
-      if (Cmds->Help == nullptr)
-	 continue;
-      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+      case APT_CMD::APT: cmd = "apt(8)"; break;
+      case APT_CMD::APT_CACHE: cmd = "apt-cache(8)"; break;
+      case APT_CMD::APT_CDROM: cmd = "apt-cdrom(8)"; break;
+      case APT_CMD::APT_CONFIG: cmd = "apt-config(8)"; break;
+      case APT_CMD::APT_EXTRACTTEMPLATES: cmd = "apt-extracttemplates(1)"; break;
+      case APT_CMD::APT_FTPARCHIVE: cmd = "apt-ftparchive(1)"; break;
+      case APT_CMD::APT_GET: cmd = "apt-get(8)"; break;
+      case APT_CMD::APT_HELPER: cmd = nullptr; break;
+      case APT_CMD::APT_INTERNAL_SOLVER: cmd = nullptr; break;
+      case APT_CMD::APT_MARK: cmd = "apt-mark(8)"; break;
+      case APT_CMD::APT_SORTPKG: cmd = "apt-sortpkgs(1)"; break;
    }
+   if (cmd != nullptr)
+      ioprintf(std::cout, _("See %s for more information about the available commands."), cmd);
+   std::cout << std::endl <<
+      _("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");
+   if (Binary == APT_CMD::APT_GET || Binary == APT_CMD::APT)
+      std::cout << std::right << std::setw(70) << _("This APT has Super Cow Powers.") << std::endl;
+   else if (Binary == APT_CMD::APT_HELPER)
+      std::cout << std::right << std::setw(70) << _("This APT helper has Super Meep Powers.") << std::endl;
+   return true;
 }
 									/*}}}*/
 static void BinarySpecificConfiguration(char const * const Binary)	/*{{{*/
@@ -440,7 +477,7 @@ std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD c
        (Sys != NULL && pkgInitSystem(*_config, *Sys) == false))
    {
       if (_config->FindB("version") == true)
-	 ShowCommonHelp(Binary, CmdL, CmdsWithHelp.data());
+	 ShowCommonHelp(Binary, CmdL, CmdsWithHelp);
 
       _error->DumpErrors();
       exit(100);
@@ -450,12 +487,12 @@ std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD c
    if (_config->FindB("help") == true || _config->FindB("version") == true ||
 	 (CmdL.FileSize() > 0 && strcmp(CmdL.FileList[0], "help") == 0))
    {
-      ShowCommonHelp(Binary, CmdL, CmdsWithHelp.data());
+      ShowCommonHelp(Binary, CmdL, CmdsWithHelp);
       exit(0);
    }
    if (Cmds.empty() == false && CmdL.FileSize() == 0)
    {
-      ShowCommonHelp(Binary, CmdL, CmdsWithHelp.data());
+      ShowCommonHelp(Binary, CmdL, CmdsWithHelp);
       exit(1);
    }
    return Cmds;
diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 6a6885a33..819eb77cc 100644
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -23,6 +23,7 @@ enum class APT_CMD {
    APT_SORTPKG,
 };
 
+bool ShowHelp(CommandLine &CmdL);
 struct aptDispatchWithHelp
 {
    const char *Match;
@@ -30,9 +31,7 @@ struct aptDispatchWithHelp
    const char *Help;
 };
 std::vector<aptDispatchWithHelp> GetCommands();
-bool ShowHelp(CommandLine &CmdL, aptDispatchWithHelp const * Cmds);
 
-APT_PUBLIC void ShowHelpListCommands(aptDispatchWithHelp const * Cmds);
 APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[]);
 APT_PUBLIC unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::Dispatch> const &Cmds);
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 465911570..dd1488568 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1202,26 +1202,18 @@ static bool GenCaches(CommandLine &)
    return CacheFile.BuildCaches(&Progress, true);
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
     _("Usage: apt-cache [options] command\n"
       "       apt-cache [options] show pkg1 [pkg2 ...]\n"
       "\n"
-      "apt-cache is a low-level tool used to query information\n"
-      "from APT's binary cache files\n")
-    << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl
-    << _("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");
+      "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"
+      "availability of the configured sources (e.g. offline).\n");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 00895863b..4a24f198c 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -203,28 +203,14 @@ static bool DoIdent(CommandLine &)
    return AddOrIdent(false);
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
       _("Usage: apt-cdrom [options] command\n"
       "\n"
-      "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-      "CDROM mount point and device information is taken from apt.conf,\n"
-      "udev and /etc/fstab.\n")
-      << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl <<
-      _("Options:\n"
-      "  -h   This help text\n"
-      "  -d   CD-ROM mount point\n"
-      "  -r   Rename a recognized CD-ROM\n"
-      "  -m   No mounting\n"
-      "  -f   Fast mode, don't check package files\n"
-      "  -a   Thorough scan mode\n"
-      "  --no-auto-detect Do not try to auto detect drive and mount point\n"
-      "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-      "See fstab(5)\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");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index eb096440a..8442161d3 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -76,19 +76,13 @@ static bool DoDump(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
       _("Usage: apt-config [options] command\n"
       "\n"
-      "apt-config is a simple tool to read the APT config file\n")
-      << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl <<
-      _("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");
+      "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");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index b63f2ff16..0e60ff5fb 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -215,19 +215,14 @@ bool DebFile::ParseInfo()
 	return true;
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
 	cout <<
 		_("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");
 	return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9ffb7b1ee..5002ec1b8 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -343,7 +343,7 @@ static bool DoIndexTargets(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    if (_config->FindB("version") == true)
    {
@@ -371,50 +371,31 @@ bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
 	       cout << "Pkg:  " << Sys->Label << " (Priority " << Sys->Score(*_config) << ")" << endl;
 	 }
       }
-      
+
       for (unsigned I = 0; I != pkgSourceList::Type::GlobalListLen; I++)
       {
 	 pkgSourceList::Type *Type = pkgSourceList::Type::GlobalList[I];
 	 cout << " S.L: '" << Type->Name << "' " << Type->Label << endl;
-      }      
-      
+      }
+
       for (unsigned I = 0; I != pkgIndexFile::Type::GlobalListLen; I++)
       {
 	 pkgIndexFile::Type *Type = pkgIndexFile::Type::GlobalList[I];
 	 cout << " Idx: " << Type->Label << endl;
-      }      
-      
+      }
+
       return true;
    }
 
    std::cout <<
-    _("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")
-      << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl <<
-      _("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");
+      _("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");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index be6c2881a..1c67594b9 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -105,17 +105,14 @@ static bool DoSrvLookup(CommandLine &CmdL)				/*{{{*/
    return true;
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const  * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
-    _("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")
-    << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl <<
-      _("This APT helper has Super Meep Powers.") << std::endl;
+      _("Usage: apt-helper [options] command\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");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index ae8c08bba..929fd6e27 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -41,19 +41,13 @@
 #include <apti18n.h>
 									/*}}}*/
 
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
 	std::cout <<
 		_("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");
+		"like an external resolver for the APT family for debugging or alike.\n");
 	return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index b06fcc0cc..66adfd268 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -280,26 +280,15 @@ static bool ShowSelection(CommandLine &CmdL)				/*{{{*/
    return true;
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
     _("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")
-    << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl
-   << _("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.")
-      << std::endl;
+      "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");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index f9aa7d728..5057ac626 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -132,19 +132,14 @@ static bool DoIt(string InFile)
    return true;
 }
 									/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
     _("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"
+      "It sorts by default by binary package information, but the -s option\n"
+      "can be used to switch to source package ordering instead.\n");
    return true;
 }
 									/*}}}*/
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 368822d2d..761ad60db 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -40,14 +40,16 @@
 #include <apti18n.h>
 									/*}}}*/
 
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
-    _("Usage: apt [options] command\n"
-      "\n"
-      "CLI for apt.\n")
-    << std::endl;
-   ShowHelpListCommands(Cmds);
+      _("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");
    return true;
 }
 									/*}}}*/
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index b649149af..a76eb1000 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -32,10 +32,16 @@
  &synopsis-command-apt-cache;
 
  <refsect1><title>Description</title>
-   <para><command>apt-cache</command> performs a variety of operations on APT's package 
-   cache. <command>apt-cache</command> does not manipulate the state of the system 
-   but does provide operations to search and generate interesting output 
-   from the package metadata.</para>
+    <para>
+       <command>apt-cache</command> performs a variety of operations on APT's
+       package cache. <command>apt-cache</command> does not manipulate the
+       state of the system but does provide operations to search and generate
+       interesting output from the package metadata. The metadata is acquired
+       and updated via the 'update' command of e.g. <command>apt-get</command>,
+       so that it can be outdated if the last update is too long ago, but in
+       exchange <command>apt-cache</command> works independently of the
+       availability of the configured sources (e.g. offline).
+    </para>
 
    <para>Unless the <option>-h</option>, or <option>--help</option> option is given, one of the
    commands below must be present.</para>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index c308771f2..1aaca1f3d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.1~exp14\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1445,7 +1445,11 @@ msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange "
+"<command>apt-cache</command> works independently of the availability of the "
+"configured sources (e.g. offline)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index b8d848781..9e79c0364 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -2009,11 +2009,21 @@ msgstr "den APT-Zwischenspeicher abfragen"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> führt eine Vielzahl von Operationen auf dem "
 "Paketzwischenspeicher von APT durch. <command>apt-cache</command> "
diff --git a/doc/po/es.po b/doc/po/es.po
index 8dbfecd58..9894c7675 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2087,11 +2087,21 @@ msgstr "Realiza consultas al caché de APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> realiza una serie de operaciones sobre la caché "
 "(registro o lista) de paquetes de APT. <command>apt-cache</command> no "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 67b759120..eb79e8324 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -2004,11 +2004,21 @@ msgstr "recherche dans le cache d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> réalise différentes opérations sur le cache de "
 "paquet d'APT. <command>apt-cache</command> ne manipule pas l'état du système "
diff --git a/doc/po/it.po b/doc/po/it.po
index c97b09b35..7157c4bb2 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2015-01-27 14:11+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -2049,11 +2049,21 @@ msgstr "interroga la cache di APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> esegue una varietà di operazioni sulla cache "
 "dei pacchetti di APT. <command>apt-cache</command> non manipola lo stato del "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 7aaff2e79..7de7203e3 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1988,11 +1988,21 @@ msgstr "APT キャッシュ�������"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> � APT �パッケージキャッシュ�対�������"
 "��作を行���。<command>apt-cache</command> ��システム状態��作�行��"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 37cf2fb5f..f1e898a02 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -2088,11 +2088,21 @@ msgstr "odpytanie bufora APT"
 #
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> wykonuje różnorodne operacje na buforze (cache) "
 "pakietów programu APT. <command>apt-cache</command> nie zmienia stanu "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index eae77d68d..a946970c9 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2026,11 +2026,21 @@ msgstr "pesquisa a cache do APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 "<command>apt-cache</command> executa uma variedade de operações na cache de "
 "pacotes do APT. <command>apt-cache</command> não manipula o estado do "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index a96dc5e3c..b5797af9b 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-22 16:34+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1422,7 +1422,11 @@ msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 99d5627f0..b31c92845 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -604,7 +604,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 }
 									/*}}}*/
 
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)		/*{{{*/
+bool ShowHelp(CommandLine &)						/*{{{*/
 {
    std::cout <<
     _("Usage: apt-ftparchive [options] command\n"
@@ -654,7 +654,7 @@ bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)		/*{{{*/
 static bool SimpleGenPackages(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL, nullptr);
+      return ShowHelp(CmdL);
    
    string Override;
    if (CmdL.FileSize() >= 3)
@@ -686,7 +686,7 @@ static bool SimpleGenPackages(CommandLine &CmdL)
 static bool SimpleGenContents(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL, nullptr);
+      return ShowHelp(CmdL);
    
    // Create a package writer object.
    ContentsWriter Contents(NULL, _config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture"));
@@ -708,7 +708,7 @@ static bool SimpleGenContents(CommandLine &CmdL)
 static bool SimpleGenSources(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL, nullptr);
+      return ShowHelp(CmdL);
    
    string Override;
    if (CmdL.FileSize() >= 3)
@@ -745,7 +745,7 @@ static bool SimpleGenSources(CommandLine &CmdL)
 static bool SimpleGenRelease(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL, nullptr);
+      return ShowHelp(CmdL);
 
    string Dir = CmdL.FileList[1];
 
@@ -913,7 +913,7 @@ static bool Generate(CommandLine &CmdL)
 {
    struct CacheDB::Stats SrcStats;
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL, nullptr);
+      return ShowHelp(CmdL);
 
    struct timeval StartTime;
    gettimeofday(&StartTime,0);
@@ -971,7 +971,7 @@ static bool Generate(CommandLine &CmdL)
 static bool Clean(CommandLine &CmdL)
 {
    if (CmdL.FileSize() != 2)
-      return ShowHelp(CmdL, nullptr);
+      return ShowHelp(CmdL);
 
    // Read the configuration file.
    Configuration Setup;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 971b8428c..c3e08765b 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.1~exp14\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,36 @@ 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 ""
@@ -205,6 +235,10 @@ 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 "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -295,7 +329,7 @@ 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 ""
 
@@ -657,8 +691,228 @@ msgstr[1] ""
 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 ""
+
+#: 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
+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 ""
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+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
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
 msgstr ""
 
 #: apt-private/private-sources.cc
@@ -764,81 +1018,17 @@ 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
-msgid "Pinned packages:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr ""
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr ""
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr ""
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
@@ -873,7 +1063,11 @@ msgstr ""
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -915,7 +1109,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -950,24 +1143,9 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -978,15 +1156,8 @@ msgstr ""
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
 
 #: cmdline/apt-config.cc
@@ -999,31 +1170,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
@@ -1043,160 +1189,6 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.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
-#: cmdline/apt-get.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
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr ""
 
@@ -1206,30 +1198,10 @@ msgid ""
 "       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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid ""
-"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"
+"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
@@ -1310,11 +1282,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1388,20 +1357,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1882,14 +1840,9 @@ msgstr ""
 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
@@ -1911,13 +1864,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 
 #: cmdline/apt-sortpkgs.cc
@@ -1928,14 +1875,9 @@ msgstr ""
 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"
+"It sorts by default 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
diff --git a/po/ar.po b/po/ar.po
index 4c3d4d72e..93b67aa6d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -169,6 +169,36 @@ msgstr "الحزمة %s غير م�ثبّتة، لذلك لن ت�زال\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
+#: 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 "تحذير: تعذرت المصادقة على الحزم التالية!"
@@ -213,6 +243,10 @@ msgstr "تعذر حساب المساحة الحرة �ي %s"
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كا�ية �ي %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "تعذر قَ�ْل دليل التنزيل"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
@@ -308,7 +342,7 @@ 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 "اكتمل التنزيل و�ي وضع التنزيل �قط"
 
@@ -682,9 +716,229 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "لم ي�عثر على أية حزم"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: 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 "الحزم الم�دبّسة:"
+
+#: 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
+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 "(لاشيء)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr ""
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr " جدول النسخ:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: 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 "تعذر العثور على مصدر الحزمة %s"
+
+#: 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 "تخطي المل� '%s' المنزل مسبقاً\n"
+
+#. 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 "يجب جلب %sب/%sب من الأرشي�ات المصدرية.\n"
+
+#. 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 "يجب جلب %sب من الأرشي�ات المصدريّة.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "إحضار المصدر %s\n"
+
+#: 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 "أمر �ك الحزمة '%s' �شل.\n"
+
+#: 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 "أمر البناء '%s' �شل.\n"
+
+#: 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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr ""
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -793,81 +1047,17 @@ 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 "تعذر العثور على الحزمة %s"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "الحزم الم�دبّسة:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(غير موجود)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr " م�ثبّت:"
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  مرشّح: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(لاشيء)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr ""
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr " جدول النسخ:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
@@ -902,7 +1092,11 @@ msgstr ""
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -949,7 +1143,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -987,24 +1180,9 @@ msgstr "كرر هذه العملية لباقي الأقراص المدمجة �
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1015,15 +1193,8 @@ msgstr ""
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
 
 #: cmdline/apt-config.cc
@@ -1035,31 +1206,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
@@ -1080,160 +1226,6 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "تعذر قَ�ْل دليل التنزيل"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "تعذر العثور على مصدر الحزمة %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "تخطي المل� '%s' المنزل مسبقاً\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "يجب جلب %sب/%sب من الأرشي�ات المصدرية.\n"
-
-#. 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"
-msgstr "يجب جلب %sب من الأرشي�ات المصدريّة.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "إحضار المصدر %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "�شل إحضار بعض الأرشي�ات."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "أمر �ك الحزمة '%s' �شل.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "أمر البناء '%s' �شل.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
@@ -1243,30 +1235,10 @@ msgid ""
 "       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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid ""
-"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"
+"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
@@ -1351,11 +1323,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1429,20 +1398,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1934,14 +1892,9 @@ msgstr "دمج المعلومات المتو�رة"
 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
@@ -1963,13 +1916,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 
 #: cmdline/apt-sortpkgs.cc
@@ -1980,14 +1927,9 @@ msgstr "سجل حزمة مجهول!"
 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"
+"It sorts by default 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
diff --git a/po/ast.po b/po/ast.po
index 8a0507ac8..f31141cca 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -168,6 +168,36 @@ msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, escoyendo %s nel llugar de %s\n"
 
+#: 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 "Esti APT tien Poderes de Super Vaca."
+
+#: 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 "Nun s'alcontraron paquetes"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
@@ -212,6 +242,10 @@ msgstr "Nun pue determinase l'espaciu llibre de %s"
 msgid "You don't have enough free space in %s."
 msgstr "Nun tienes espaciu libre bastante en %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Nun pue bloquiase'l direutoriu de descarga"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
@@ -308,7 +342,7 @@ msgstr "¿Quies continuar?"
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: 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 "Descarga completa y en mou de sólo descarga"
 
@@ -698,9 +732,248 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nun s'alcontraron paquetes"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nun pue alcontrase'l paquete %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Ficheros de paquete:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"La caché nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Paquetes na chincheta:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nun s'alcontró)"
+
+#. 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 "  Instaláu: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidatu: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(dengún)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Chincheta de paquetes: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabla de versiones:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Inorar versión non disponible de '%s' del paquete '%s'"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nun pudo alcontrase un paquete fonte pa %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"Por favor, usa:\n"
+"bzr get %s\n"
+"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
+"paquete.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saltando'l ficheru yá descargáu '%s'\n"
+
+#. 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 "Hai falta descargar %sB/%sB d'archivos fonte.\n"
+
+#. 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 "Hai falta descargar %sB d'archivos fonte.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Fonte descargada %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Falló la descarga de dellos archivos."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Falló la orde de desempaquetáu '%s'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Falló la orde build '%s'.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
+"construcción"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Fallu al procesar les dependencies de construcción"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nun tien dependencies de construcción.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
+"enforma nuevu"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque denguna versión "
+"disponible del paquete %s satisfaz los requisitos de versión"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Fallu al procesar les dependencies de construcción"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -806,98 +1079,18 @@ msgstr "Informe del total d'espaciu: "
 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 "Nun pue alcontrase'l paquete %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Ficheros de paquete:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"La caché nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Paquetes na chincheta:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nun s'alcontró)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instaláu: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidatu: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(dengún)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Chincheta de paquetes: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabla de versiones:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Usu: apt-cache [opciones] orde\n"
-"     apt-cache [opciones] show paq1 [paq2 ...]\n"
-"\n"
-"apt-cache ye una ferramienta de baxu nivel usada pa remanar\n"
-"ficheros de caché binarios d'APT y consultar información d'ellos\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Opciones:\n"
-"  -h   Esti testu d'aida.\n"
-"  -p=? La cache de paquetes.\n"
-"  -s=? La cache de fontes.\n"
-"  -q   Desactiva l'indicador de progresu.\n"
-"  -i   Amuesa sólo les dependencies importantes de la orde incumplida.\n"
-"  -c=? Lleer esti ficheru de configuración\n"
-"  -o=? Conseña una opción de configuración arbitraria, ex -o dir::cache=/"
-"tmp\n"
-"Ver les páxines del manual apt-cache(8) y apt.conf(5) pa más información.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -931,7 +1124,11 @@ msgstr "Amuesa los axustes de les normes"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -977,7 +1174,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1014,24 +1210,9 @@ msgstr "Repite'l procesu colos demás CDs del conxuntu."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1042,23 +1223,9 @@ msgstr "Argumentos non empareyaos"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Usu: apt-config [opciones] orde\n"
-"\n"
-"apt-config ye una ferramienta pa lleer el ficheru de configuración d'APT.\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opciones:\n"
-"  -h   Esti testu d'aida.\n"
-"  -c=? Llee esti ficheru de configuración\n"
-"  -o=? Conseña una opción de configuración arbitraria, p. ex.\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1069,31 +1236,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Inorar versión non disponible de '%s' del paquete '%s'"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
@@ -1114,190 +1256,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Error internu, l'iguador de problemes frañó coses"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Nun pue bloquiase'l direutoriu de descarga"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Por favor, usa:\n"
-"bzr get %s\n"
-"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
-"paquete.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Saltando'l ficheru yá descargáu '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
-
-#. 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"
-msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Fonte descargada %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Falló la descarga de dellos archivos."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Falló la orde de desempaquetáu '%s'.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Falló la orde build '%s'.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
-"construcción"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Fallu al procesar les dependencies de construcción"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s nun tien dependencies de construcción.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
-"paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
-"paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
-"enforma nuevu"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"La dependencia %s en %s nun puede satisfacese porque denguna versión "
-"disponible del paquete %s satisfaz los requisitos de versión"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
-"paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Fallu al procesar les dependencies de construcción"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Usu: apt-get [opciones] comandu\n"
 "     apt-get [opciones] install|remove pkg1 [pkg2 ...]\n"
@@ -1308,46 +1280,6 @@ msgstr ""
 "ya instalar.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opciones:\n"
-"  -h  Esti testu d'aida.\n"
-"  -q  Salida Log - ensín indicación de progresu\n"
-"  -qq Ensín salida excepto pa fallos\n"
-"  -d  Baxar sólo - NON instalar o desempaquetar los archivos\n"
-"  -s  Non aición. Facer una simulación ordenada\n"
-"  -y  Asumir Yes pa toles entruges y nun visualizar la petición\n"
-"  -f  Intentar correxir un sistema con dependencies frayaes\n"
-"  -m  Intentar siguir si los archivos nun tan disponibles\n"
-"  -u  Amosar una lilsta de paquetes que tan bien\n"
-"  -b  Facer el paquete fonte dempues d'algamalu\n"
-"  -V  Amosar númberos de versiones\n"
-"  -c=? Lleer esti ficheru de configuración\n"
-"  -o=? Afitar una opción de configuración arbitraria, p. ex. -o dir::cache=/"
-"tmp\n"
-"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt."
-"conf(5)\n"
-"pa más información y opciones.\n"
-"                       Esti APT tien Poderes de Super Vaca.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Algamar nueva llista de paquetes"
 
@@ -1426,11 +1358,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1504,20 +1433,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2013,17 +1931,13 @@ msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
 "\n"
@@ -2057,13 +1971,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
 "\n"
@@ -2085,26 +1993,10 @@ msgstr "¡Rexistru de paquetes desconocíu!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n"
-"\n"
-"apt-sortpkgs ye un preséu cenciellu pa tresnar ficheros de paquetes.\n"
-"La opción -s úsase pa indicar qué triba de ficheru ye.\n"
-"\n"
-"Opciones:\n"
-"-h   Esti testu d'aida.\n"
-"-s   Usa ordenamientu de ficheros fonte\n"
-"-c=? Llei esti ficheru de configuración\n"
-"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n"
-"cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3848,6 +3740,88 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculando l'anovamientu"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Usu: apt-cache [opciones] orde\n"
+#~ "     apt-cache [opciones] show paq1 [paq2 ...]\n"
+#~ "\n"
+#~ "apt-cache ye una ferramienta de baxu nivel usada pa remanar\n"
+#~ "ficheros de caché binarios d'APT y consultar información d'ellos\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opciones:\n"
+#~ "  -h   Esti testu d'aida.\n"
+#~ "  -p=? La cache de paquetes.\n"
+#~ "  -s=? La cache de fontes.\n"
+#~ "  -q   Desactiva l'indicador de progresu.\n"
+#~ "  -i   Amuesa sólo les dependencies importantes de la orde incumplida.\n"
+#~ "  -c=? Lleer esti ficheru de configuración\n"
+#~ "  -o=? Conseña una opción de configuración arbitraria, ex -o dir::cache=/"
+#~ "tmp\n"
+#~ "Ver les páxines del manual apt-cache(8) y apt.conf(5) pa más "
+#~ "información.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Usu: apt-config [opciones] orde\n"
+#~ "\n"
+#~ "apt-config ye una ferramienta pa lleer el ficheru de configuración "
+#~ "d'APT.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opciones:\n"
+#~ "  -h   Esti testu d'aida.\n"
+#~ "  -c=? Llee esti ficheru de configuración\n"
+#~ "  -o=? Conseña una opción de configuración arbitraria, p. ex.\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"
+#~ msgstr ""
+#~ "Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs ye un preséu cenciellu pa tresnar ficheros de paquetes.\n"
+#~ "La opción -s úsase pa indicar qué triba de ficheru ye.\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "-h   Esti testu d'aida.\n"
+#~ "-s   Usa ordenamientu de ficheros fonte\n"
+#~ "-c=? Llei esti ficheru de configuración\n"
+#~ "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n"
+#~ "cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Falló el procesu fíu"
 
diff --git a/po/bg.po b/po/bg.po
index 894df1705..1648e15bb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -178,6 +178,36 @@ msgstr "Пакетът „%s“ не е ин�талиран, така че не
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Избиране на „%s“ вме�то „%s“\n"
 
+#: 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 има Върховни Сили."
+
+#: 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 "ПРЕДУПРЕЖДЕ�ИЕ: Следните пакети не могат да бъдат удо�товерени!"
@@ -222,6 +252,10 @@ msgstr "�еу�пех при определ�нето на �вободното
 msgid "You don't have enough free space in %s."
 msgstr "��мате до�татъчно �вободно про�тран�тво в %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "�еу�пех при заключването на директори�та за изтегл�не"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при �чупени пакети!"
@@ -320,7 +354,7 @@ 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 "Изтегл�нето завърши в режим �амо на изтегл�не"
 
@@ -710,9 +744,252 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "��ма намерени пакети"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Пакетът %s не може да бъде намерен"
+
+#: 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 ""
+"Кешът не е �инхронизиран, не може да �е изпълни „x-ref“ на пакетен файл"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+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
+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 "(н�ма)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Отбиване на пакета: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Таблица � вер�иите:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Използване на пакет източник „%s“ вме�то „%s“\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Игнориране на не�ъще�твуваща вер�и� „%s“ на пакета „%s“"
+
+#: 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 "�еу�пех при намирането на изходен код на пакет %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"Пакетирането на „%s“ �е разработва в �и�тема за контрол на вер�иите „%s“ на "
+"адре�:\n"
+"%s\n"
+
+#: 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 ""
+"Използвайте:\n"
+"%s\n"
+"за да изтеглите по�ледните промени в пакета (евентуално в проце� на "
+"разработка).\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Пропу�кане на вече изтеглени� файл „%s“\n"
+
+#. 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 "�еобходимо е да �е изтегл�т %sB/%sB архиви изходен код.\n"
+
+#. 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 "�еобходимо е да �е изтегл�т %sB архиви изходен код.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Изтегл�не на изходен код %s\n"
+
+#: 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 ""
+"Пропу�кане на разпакетирането на вече разпакетирани� изходен код в %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Командата за разпакетиране „%s“ пропадна.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Проверете дали имате ин�талиран пакета „dpkg-dev“.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Командата за компилиране „%s“ пропадна.\n"
+
+#: 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 ""
+"Лип�ва информаци� за архитектурата %s. Прегледайте информаци�та за APT::"
+"Architectures в apt.conf(5)."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, 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"
+msgstr ""
+"�еу�пех при получаването на информаци� за зави�имо�тите за компилиране на %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s н�ма зави�имо�ти за компилиране.\n"
+
+#: 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 ""
+"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, %s не �е позвол�ва "
+"за пакети „%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
+"не може да бъде намерен"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"�еу�пех при удовлетвор�ването на зави�имо�т %s за пакета %s: Ин�талирани�т "
+"пакет %s е твърде нов"
+
+#: 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"
+msgstr ""
+"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже вер�и�та "
+"кандидат на пакета %s не може да удовлетвори изи�кването за вер�и�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
+"н�ма подход�щи вер�ии"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "�еу�пех при удовлетвор�ването на зави�имо�т %s за пакета %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Зави�имо�тите за компилиране на %s не можаха да бъдат удовлетворени."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "�еу�пех при обработката на зави�имо�тите за компилиране"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -818,100 +1095,20 @@ msgstr "Общо отчетено про�тран�тво: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Тази командата е о�тар�ла. Използвайте „apt-mark showauto“ вме�то не�."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Пакетът %s не може да бъде намерен"
-
-#: 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 ""
-"Кешът не е �инхронизиран, не може да �е изпълни „x-ref“ на пакетен файл"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Отбити пакети:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(не �а намерени)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Ин�талирана: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Кандидат: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(н�ма)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Отбиване на пакета: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Таблица � вер�иите:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Употреба: apt-cache [опции] команда\n"
-"          apt-cache [опции] show пакет1 [пакет2 ...]\n"
-"\n"
-"apt-cache е ин�трумент на ни�ко ниво за извличане на информаци� от\n"
-"двоичните кеш файлове на APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Опции:\n"
-"  -h   Този помощен тек�т.\n"
-"  -p=? Кешът за пакети.\n"
-"  -s=? Кешът за пакети � изходен код.\n"
-"  -q   Премахване на индикатора за напредък.\n"
-"  -i   Показване �амо на важни зави�имо�ти при командата „unmet“.\n"
-"  -c=? Указване на файл � на�тройки.\n"
-"  -o=? �а�тройване на произволна конфигурационна опци�, например -o dir::"
-"cache=/tmp\n"
-"За повече информаци� вижте наръчниците apt-cache(8) и apt.conf(5).\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Показване на запи�ите за пакети � изходен код"
 
@@ -943,7 +1140,11 @@ msgstr "Показване на на�тройките на политиката
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -989,7 +1190,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1026,35 +1226,10 @@ msgstr "Повторете този процеÑ� за оÑ�таналите диÑ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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 ""
-"Опции:\n"
-"  -h  Тази помощна информаци�\n"
-"  -q  Изход без информаци� за напредъка, подход�щ за �ъхран�ване\n"
-"  -qq Без изход, о�вен при грешки\n"
-"  -s  Симулаци�. Само �е извежда какво би било направено\n"
-"  -f  Четене/запи� на информаци�та за маркировката от указани� файл\n"
-"  -c=? Указване на файл � на�тройки\n"
-"  -o=? Указване на произволна на�тройка, напр. -o dir::cache=/tmp\n"
-"За повече информаци� прегледайте ръковод�твата apt-mark(8) и apt.conf(5)."
 
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
@@ -1064,24 +1239,9 @@ msgstr "�ргументите не �а по двойки"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Употреба: apt-config [опции] команда\n"
-"\n"
-"apt-config е опро�тен ин�трумент за четене на конфигурационни� файл на APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Опции:\n"
-"  -h   Този помощен тек�т.\n"
-"  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? �а�тройване на произволна конфигурационна опци�, т.е. -o dir::cache=/"
-"tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1092,31 +1252,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "�е �а намерен пакети, отговар�щ на регул�рни� израз „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Използване на пакет източник „%s“ вме�то „%s“\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Игнориране на не�ъще�твуваща вер�и� „%s“ на пакета „%s“"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "�еу�пех при намирането на пакет %s"
@@ -1139,194 +1274,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ �чупи нещо в �и�темата"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "�еу�пех при заключването на директори�та за изтегл�не"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Тр�бва да укажете поне един пакет за изтегл�не на изходни� му код"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "�еу�пех при намирането на изходен код на пакет %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"Пакетирането на „%s“ �е разработва в �и�тема за контрол на вер�иите „%s“ на "
-"адре�:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Използвайте:\n"
-"%s\n"
-"за да изтеглите по�ледните промени в пакета (евентуално в проце� на "
-"разработка).\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Пропу�кане на вече изтеглени� файл „%s“\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "�еобходимо е да �е изтегл�т %sB/%sB архиви изходен код.\n"
-
-#. 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"
-msgstr "�еобходимо е да �е изтегл�т %sB архиви изходен код.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Изтегл�не на изходен код %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "�еу�пех при изтегл�нето на н�кои архиви."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"Пропу�кане на разпакетирането на вече разпакетирани� изходен код в %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Проверете дали имате ин�талиран пакета „dpkg-dev“.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Командата за компилиране „%s“ пропадна.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Тр�бва да укажете поне един пакет за проверка на зави�имо�ти за компилиране"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Лип�ва информаци� за архитектурата %s. Прегледайте информаци�та за APT::"
-"Architectures в apt.conf(5)."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "�еу�пех при обработката на зави�имо�тите за компилиране"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-"�еу�пех при получаването на информаци� за зави�имо�тите за компилиране на %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s н�ма зави�имо�ти за компилиране.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, %s не �е позвол�ва "
-"за пакети „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
-"не може да бъде намерен"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"�еу�пех при удовлетвор�ването на зави�имо�т %s за пакета %s: Ин�талирани�т "
-"пакет %s е твърде нов"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже вер�и�та "
-"кандидат на пакета %s не може да удовлетвори изи�кването за вер�и�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Зави�имо�т %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
-"н�ма подход�щи вер�ии"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "�еу�пех при удовлетвор�ването на зави�имо�т %s за пакета %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Зави�имо�тите за компилиране на %s не можаха да бъдат удовлетворени."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "�еу�пех при обработката на зави�имо�тите за компилиране"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Употреба: apt-get [опции] команда\n"
 "          apt-get [опции] install|remove пакет1 [пакет2 ...]\n"
@@ -1337,45 +1298,6 @@ msgstr ""
 "и „install“.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Опции:\n"
-"  -h  Този помощен тек�т.\n"
-"  -q  Изход на �ъобщени�, подход�щи за журнал - без индикатор на напредъка\n"
-"  -qq Без извеждане на �ъобщени�, о�вен при грешки\n"
-"  -d  Само изтегл�не - БЕЗ ин�талиране или разпакетиране на архивите\n"
-"  -s  Без дей�твие. Симулиране на дей�тви�та.\n"
-"  -y  Отговар�не � „Да“ на в�ички въпро�и, без питане\n"
-"  -f  Опит за поправ�не на неудовлетворени зави�имо�ти\n"
-"  -m  Опит за продължаване дори и ако архивите �а неоткриваеми\n"
-"  -u  Показване и на �пи�ък � пакетите за актуализиране\n"
-"  -b  Компилиране на изходни� код на пакета �лед изтегл�нето му\n"
-"  -V  Показване на подробна информаци� за вер�иите\n"
-"  -c=? Четене на този конфигурационен файл\n"
-"  -o=? �а�тройване на произволна конфигурационна опци�,\n"
-"       напр. -o dir::cache=/tmp\n"
-"Вижте наръчниците за apt-get(8), sources.list(5) и apt.conf(5) за повече\n"
-"информаци� и опции.\n"
-"                           Това APT има Върховни Сили.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Изтегл�не на нови �пи�ъци � пакети"
 
@@ -1454,11 +1376,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1528,11 +1447,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n"
 "\n"
@@ -1541,28 +1463,6 @@ msgstr ""
 "на текущата маркировка.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Опции:\n"
-"  -h  Тази помощна информаци�\n"
-"  -q  Изход без информаци� за напредъка, подход�щ за �ъхран�ване\n"
-"  -qq Без изход, о�вен при грешки\n"
-"  -s  Симулаци�. Само �е извежда какво би било направено\n"
-"  -f  Четене/запи� на информаци�та за маркировката от указани� файл\n"
-"  -c=? Указване на файл � на�тройки\n"
-"  -o=? Указване на произволна на�тройка, напр. -o dir::cache=/tmp\n"
-"За повече информаци� прегледайте ръковод�твата apt-mark(8) и apt.conf(5)."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Маркиране на пакети като ин�талирани автоматично"
 
@@ -2052,17 +1952,13 @@ msgid "Merging available information"
 msgstr "Сме�ване на наличната информаци�"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
 "\n"
@@ -2092,17 +1988,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "�е може да �е извлече вер�и�та на debconf. Debconf ин�талиран ли е?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Употреба: apt-internal-solver\n"
 "\n"
@@ -2123,26 +2014,10 @@ msgstr "�епознат запи� за пакет!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
-"\n"
-"apt-sortpkgs е опро�тен ин�трумент за �ортиране на пакетни файлове. Опци�та\n"
-"„-s“ �е използва, за да покаже типа на файла.\n"
-"\n"
-"Опции:\n"
-"  -h   Този помощен тек�т.\n"
-"  -s   Използване на �ортиране по изходен код.\n"
-"  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? �а�тройване на произволна конфигурационна опци�, т.е. -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3908,6 +3783,134 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Изчи�л�ване на актуализаци�та"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Употреба: apt-cache [опции] команда\n"
+#~ "          apt-cache [опции] show пакет1 [пакет2 ...]\n"
+#~ "\n"
+#~ "apt-cache е ин�трумент на ни�ко ниво за извличане на информаци� от\n"
+#~ "двоичните кеш файлове на APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Опции:\n"
+#~ "  -h   Този помощен тек�т.\n"
+#~ "  -p=? Кешът за пакети.\n"
+#~ "  -s=? Кешът за пакети � изходен код.\n"
+#~ "  -q   Премахване на индикатора за напредък.\n"
+#~ "  -i   Показване �амо на важни зави�имо�ти при командата „unmet“.\n"
+#~ "  -c=? Указване на файл � на�тройки.\n"
+#~ "  -o=? �а�тройване на произволна конфигурационна опци�, например -o dir::"
+#~ "cache=/tmp\n"
+#~ "За повече информаци� вижте наръчниците apt-cache(8) и apt.conf(5).\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Опции:\n"
+#~ "  -h  Тази помощна информаци�\n"
+#~ "  -q  Изход без информаци� за напредъка, подход�щ за �ъхран�ване\n"
+#~ "  -qq Без изход, о�вен при грешки\n"
+#~ "  -s  Симулаци�. Само �е извежда какво би било направено\n"
+#~ "  -f  Четене/запи� на информаци�та за маркировката от указани� файл\n"
+#~ "  -c=? Указване на файл � на�тройки\n"
+#~ "  -o=? Указване на произволна на�тройка, напр. -o dir::cache=/tmp\n"
+#~ "За повече информаци� прегледайте ръковод�твата apt-mark(8) и apt.conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Употреба: apt-config [опции] команда\n"
+#~ "\n"
+#~ "apt-config е опро�тен ин�трумент за четене на конфигурационни� файл на "
+#~ "APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Опции:\n"
+#~ "  -h   Този помощен тек�т.\n"
+#~ "  -c=? Четене на този конфигурационен файл.\n"
+#~ "  -o=? �а�тройване на произволна конфигурационна опци�, т.е. -o dir::"
+#~ "cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Опции:\n"
+#~ "  -h  Тази помощна информаци�\n"
+#~ "  -q  Изход без информаци� за напредъка, подход�щ за �ъхран�ване\n"
+#~ "  -qq Без изход, о�вен при грешки\n"
+#~ "  -s  Симулаци�. Само �е извежда какво би било направено\n"
+#~ "  -f  Четене/запи� на информаци�та за маркировката от указани� файл\n"
+#~ "  -c=? Указване на файл � на�тройки\n"
+#~ "  -o=? Указване на произволна на�тройка, напр. -o dir::cache=/tmp\n"
+#~ "За повече информаци� прегледайте ръковод�твата apt-mark(8) и apt.conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs е опро�тен ин�трумент за �ортиране на пакетни файлове. "
+#~ "Опци�та\n"
+#~ "„-s“ �е използва, за да покаже типа на файла.\n"
+#~ "\n"
+#~ "Опции:\n"
+#~ "  -h   Този помощен тек�т.\n"
+#~ "  -s   Използване на �ортиране по изходен код.\n"
+#~ "  -c=? Четене на този конфигурационен файл.\n"
+#~ "  -o=? �а�тройване на произволна конфигурационна опци�, т.е. -o dir::"
+#~ "cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Проце�ът-потомък пропадна"
 
diff --git a/po/bs.po b/po/bs.po
index 7eec11b13..ac4cb3758 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -165,6 +165,36 @@ 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 "Paketi nisu pronađeni"
+
 #: apt-private/private-download.cc
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -209,6 +239,10 @@ 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 "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -299,7 +333,7 @@ msgstr "Da li želite nastaviti?"
 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 ""
 
@@ -667,9 +701,229 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Paketi nisu pronađeni"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ne mogu pronaći paket %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Datoteke paketa:"
+
+#: 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 ""
+
+#: 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
+msgid "%s -> %s with priority %d\n"
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr "  Instalirano:"
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+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
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr ""
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -777,81 +1031,17 @@ 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 "Ne mogu pronaći paket %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Datoteke paketa:"
-
-#: 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
-msgid "Pinned packages:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr ""
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalirano:"
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr ""
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr ""
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
@@ -886,7 +1076,11 @@ msgstr ""
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -933,7 +1127,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -969,24 +1162,9 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -997,23 +1175,9 @@ msgstr "Argumenti nisu u parovima"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Upotreba: apt-config [opcije] naredba\n"
-"\n"
-"apt-config je jednostavni alat za �itanje APT konfiguracijske datoteke\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opcije:\n"
-"  -h   Ovaj tekst pomoći.\n"
-"  -c=? Pro�itaj ovu konfiguracijsku datoteku\n"
-"  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1025,31 +1189,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
@@ -1069,160 +1208,6 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.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
-#: cmdline/apt-get.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
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
@@ -1232,30 +1217,10 @@ msgid ""
 "       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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid ""
-"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"
+"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
@@ -1338,11 +1303,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1416,20 +1378,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1919,14 +1870,9 @@ msgstr "Sastavljam dostupne informacije"
 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
@@ -1949,13 +1895,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 
 #: cmdline/apt-sortpkgs.cc
@@ -1966,14 +1906,9 @@ msgstr "Nepoznat zapis paketa\""
 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"
+"It sorts by default 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
@@ -3624,6 +3559,27 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Ra�unam nadogradnju"
 
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Upotreba: apt-config [opcije] naredba\n"
+#~ "\n"
+#~ "apt-config je jednostavni alat za �itanje APT konfiguracijske datoteke\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opcije:\n"
+#~ "  -h   Ovaj tekst pomoći.\n"
+#~ "  -c=? Pro�itaj ovu konfiguracijsku datoteku\n"
+#~ "  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Failed to exec gzip "
 #~ msgstr "Ne mogu izvršiti gzip"
 
diff --git a/po/ca.po b/po/ca.po
index 46d5813dd..879a5c827 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-10-19 13:30+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -173,6 +173,36 @@ msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n"
 
+#: 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 "Aquest APT té superpoders bovins."
+
+#: 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 "No s'han trobat paquets"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AV�S: No es poden autenticar els següents paquets!"
@@ -217,6 +247,10 @@ msgstr "No s'ha pogut determinar l'espai lliure en %s"
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "No és possible blocar el directori de descàrrega"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -317,7 +351,7 @@ msgstr "Voleu continuar?"
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: 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 "Baixada completa i en mode de només baixada"
 
@@ -711,9 +745,253 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "No s'han trobat paquets"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "No s'ha trobat el paquet %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Fitxers de paquets:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Paquets etiquetats:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(no trobat)"
+
+#. 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 "  Instaŀlat: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(cap)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Etiqueta del paquet: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Taula de versió:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Haureu d'especificar un paquet de codi font per a baixar"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "No es pot trobar un paquet de fonts per a %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"Avís: L'empaquetat de «%s» és mantingut amb el sistema de control de\n"
+"versions «%s» a:\n"
+"%s\n"
+
+#: 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 ""
+"Empreu:\n"
+"%s\n"
+"per obtenir les últimes actualitzacions (possiblement no publicades) del "
+"paquet.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "S'està ometent el fitxer ja baixat «%s»\n"
+
+#. 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 "Es necessita baixar %sB/%sB d'arxius font.\n"
+
+#. 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 "Es necessita baixar %sB d'arxius font.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Obtén el font %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "No s'ha pogut baixar alguns arxius."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "L'ordre de construir «%s» ha fallat.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"S'ha d'especificar un paquet per a verificar les dependències de construcció "
+"per a"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
+"APT::Architectures per a configurar-ho"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "No es poden processar les dependències de construcció"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr ""
+"No es pot obtenir informació sobre les dependències de construcció per a %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s no té dependències de construcció.\n"
+
+#: 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 ""
+"La dependència %s en %s no es pot satisfer perquè %s no és permès als "
+"paquets «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
+"%s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és "
+"massa nou"
+
+#: 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"
+msgstr ""
+"La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
+"paquet %s no pot satisfer els requeriments de versions"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
+"candidata"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "No es poden processar les dependències de construcció"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -820,100 +1098,20 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "No s'ha trobat el paquet %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Fitxers de paquets:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Paquets etiquetats:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(no trobat)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instaŀlat: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(cap)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Etiqueta del paquet: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Taula de versió:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Forma d'ús: apt-cache [opcions] ordre\n"
-"    apt-cache [opcions] show paquet1 [paquet2 …]\n"
-"\n"
-"apt-cache és una eina de baix nivell emprada per a consultar\n"
-"la informació dels fitxers binaris de memòria cau de l'APT.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -p=? La memòria cau de paquets.\n"
-"  -s=? La memòria cau de la font.\n"
-"  -q   Inhabilita l'indicador de progrés.\n"
-"  -i   Només mostra dependències importants amb l'opció «unmet».\n"
-"  -c=? Llegeix aquest fitxer de configuració.\n"
-"  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
-"Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més "
-"informació.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Mostra un registre d'un paquet font"
 
@@ -945,7 +1143,11 @@ msgstr "Mostra la configuració de política"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -991,7 +1193,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1028,24 +1229,9 @@ msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1056,23 +1242,9 @@ msgstr "Els arguments no són en parells"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Forma d'ús: apt-config [opcions] ordre\n"
-"\n"
-"apt-config és una eina simple per llegir el fitxer de configuració d'APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1083,31 +1255,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
@@ -1131,195 +1278,20 @@ msgstr ""
 "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "No és possible blocar el directori de descàrrega"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "No es pot trobar un paquet de fonts per a %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"Avís: L'empaquetat de «%s» és mantingut amb el sistema de control de\n"
-"versions «%s» a:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Empreu:\n"
-"%s\n"
-"per obtenir les últimes actualitzacions (possiblement no publicades) del "
-"paquet.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "S'està ometent el fitxer ja baixat «%s»\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
-
-#. 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"
-msgstr "Es necessita baixar %sB d'arxius font.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Obtén el font %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "No s'ha pogut baixar alguns arxius."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "L'ordre de construir «%s» ha fallat.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"S'ha d'especificar un paquet per a verificar les dependències de construcció "
-"per a"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
-"APT::Architectures per a configurar-ho"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "No es poden processar les dependències de construcció"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-"No es pot obtenir informació sobre les dependències de construcció per a %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s no té dependències de construcció.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"La dependència %s en %s no es pot satisfer perquè %s no és permès als "
-"paquets «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
-"%s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és "
-"massa nou"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
-"paquet %s no pot satisfer els requeriments de versions"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
-"candidata"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "No es poden processar les dependències de construcció"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Forma d'ús:  apt-get [opcions] ordre\n"
 "             apt-get [opcions] install|remove paq1 [paq2 …]\n"
@@ -1330,45 +1302,6 @@ msgstr ""
 "update i install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opcions:\n"
-"  -h  Aquest text d'ajuda\n"
-"  -q  Sortida enregistrable - sense indicador de progrés\n"
-"  -qq Sense sortida, llevat dels errors\n"
-"  -d  Només baixa - NO instaŀles o desempaquetes arxius\n"
-"  -s  No actues. Realitza les ordres en mode de simulació\n"
-"  -y  Assumeix «Sí» per a totes les preguntes i no preguntes\n"
-"  -f  Intenta corregir un sistema amb dependències trencades\n"
-"  -m  Intenta continuar si no es troben els arxius\n"
-"  -u  Mostra també una llista dels paquets actualitzats\n"
-"  -b  Construeix el paquet font després de baixar-lo\n"
-"  -V  Mostra els números de versió detallats\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de configuració arbitrària, p. ex.\n"
-"       -o dir::cache=/tmp\n"
-"Vegeu les pàgines de manual apt-get(8), sources.list(5) i apt.conf(5)\n"
-"per a obtenir més informació i opcions.\n"
-"                       Aquest APT té superpoders bovins.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Obtén llistes noves dels paquets"
 
@@ -1447,11 +1380,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1525,20 +1455,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2038,17 +1957,13 @@ msgid "Merging available information"
 msgstr "S'està fusionant la informació disponible"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
 "\n"
@@ -2081,13 +1996,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
 "\n"
@@ -2108,25 +2017,10 @@ msgstr "Registre del paquet desconegut!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
-"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -s   Empra l'ordenació de fitxers font\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3891,6 +3785,85 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "S'està calculant l'actualització"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Forma d'ús: apt-cache [opcions] ordre\n"
+#~ "    apt-cache [opcions] show paquet1 [paquet2 …]\n"
+#~ "\n"
+#~ "apt-cache és una eina de baix nivell emprada per a consultar\n"
+#~ "la informació dels fitxers binaris de memòria cau de l'APT.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opcions:\n"
+#~ "  -h   Aquest text d'ajuda.\n"
+#~ "  -p=? La memòria cau de paquets.\n"
+#~ "  -s=? La memòria cau de la font.\n"
+#~ "  -q   Inhabilita l'indicador de progrés.\n"
+#~ "  -i   Només mostra dependències importants amb l'opció «unmet».\n"
+#~ "  -c=? Llegeix aquest fitxer de configuració.\n"
+#~ "  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
+#~ "Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més "
+#~ "informació.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Forma d'ús: apt-config [opcions] ordre\n"
+#~ "\n"
+#~ "apt-config és una eina simple per llegir el fitxer de configuració d'APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opcions:\n"
+#~ "  -h   Aquest text d'ajuda.\n"
+#~ "  -c=? Llegeix aquest fitxer de configuració\n"
+#~ "  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\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"
+#~ msgstr ""
+#~ "Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
+#~ "\n"
+#~ "apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
+#~ "L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -h   Aquest text d'ajuda.\n"
+#~ "  -s   Empra l'ordenació de fitxers font\n"
+#~ "  -c=? Llegeix aquest fitxer de configuració\n"
+#~ "  -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Ha fallat el procés fill"
 
diff --git a/po/cs.po b/po/cs.po
index f7b112dae..ddcb38261 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2015-08-29 15:24+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -170,6 +170,36 @@ msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Pozn: Vybírám „%s“ místo „%s“\n"
 
+#: 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 "Tato APT má schopnosti svaté krávy."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Tento APT pomocník má schopnosti svatého �ehokoliv."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Nebyly nalezeny žádné balíky"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROV�N�: Následující balíky nemohou být autentizovány!"
@@ -215,6 +245,10 @@ msgstr "Nelze ur�it volné místo v %s"
 msgid "You don't have enough free space in %s."
 msgstr "V %s nemáte dostatek volného místa."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Nelze zamknout adresář pro stahování"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
@@ -313,7 +347,7 @@ msgstr "Chcete pokra�ovat?"
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: 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 "Stahování dokon�eno v režimu pouze stáhnout"
 
@@ -706,9 +740,245 @@ msgstr[2] "Existuje %i dalších záznamů. Zobrazíte je přepína�em „-a“
 msgid "not a real package (virtual)"
 msgstr "není skute�ný balík (virtuální)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nebyly nalezeny žádné balíky"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nelze najít balík %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Soubory balíku:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Cache není synchronizovaná, nelze se odkázat na soubor balíku"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Vypíchnuté balíky:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nenalezeno)"
+
+#. 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 "%s -> %s s prioritou %d\n"
+
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr "  Instalovaná verze: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidát: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(žádná)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Vypíchnutý balík: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabulka verzí:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nelze najít balík pro architekturu „%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nelze najít balík „%s“ s verzí „%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nelze najít balík „%s“ z vydání „%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Nelze najít verzi „%s“ balíku „%s“"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nelze najít zdrojový balík pro %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n"
+"%s\n"
+
+#: 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 ""
+"Pro stažení nejnovějších (možná dosud nevydaných) aktualizací balíku prosím "
+"použijte:\n"
+"%s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Přeskakuje se dříve stažený soubor „%s“\n"
+
+#. 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 "Nutno stáhnout %sB/%sB zdrojových archivů.\n"
+
+#. 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 "Nutno stáhnout %sB zdrojových archivů.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Stažení zdroje %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Stažení některých archivů selhalo."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Přeskakuje se rozbalení již rozbaleného zdroje v %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Zkontrolujte, zda je nainstalován balík „dpkg-dev“.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Příkaz pro sestavení „%s“ selhal.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
+"pro sestavení"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"O architektuře %s nejsou známy žádné informace. Pro nastavení si pře�těte "
+"�ást APT::Architectures v manuálové stránce apt.conf(5)"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr "Pro získání závislostí pro sestavení se používá adresář „%s“\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Pro získání závislostí pro sestavení se používá soubor „%s“\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nelze získat závislosti pro sestavení %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nemá žádné závislosti pro sestavení.\n"
+
+#: 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 ""
+"závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ "
+"dovolena"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový"
+
+#: 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"
+msgstr ""
+"závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s "
+"nesplňuje požadavek na verzi"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou "
+"verzi"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Selhalo splnění závislosti %s pro %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Závislosti pro sestavení %s nemohly být splněny."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Chyba při zpracování závislostí pro sestavení"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -817,95 +1087,18 @@ msgstr "Celkem přiřazeného místa: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nelze najít balík %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Soubory balíku:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Cache není synchronizovaná, nelze se odkázat na soubor balíku"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Vypíchnuté balíky:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nenalezeno)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr "%s -> %s s prioritou %d\n"
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalovaná verze: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidát: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(žádná)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Vypíchnutý balík: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabulka verzí:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Použití: apt-cache [volby] příkaz\n"
-"         apt-cache [volby] show balík1 [balík2 …]\n"
-"\n"
-"apt-cache je nízkoúrovňový nástroj pro získávání informací o balících.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Příkazy:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -p=? Vyrovnávací paměť balíků.\n"
-"  -s=? Vyrovnávací paměť zdrojů.\n"
-"  -q   Nezobrazí indikátor postupu.\n"
-"  -i   U příkazu unmet zobrazí pouze důležité závislosti.\n"
-"  -c=? Na�te daný konfigura�ní soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-"Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -939,11 +1132,12 @@ msgstr "Zobrazí nastavenou politiku"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Použití: apt [volby] příkaz\n"
-"\n"
-"Řádkové rozhraní pro apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -984,7 +1178,6 @@ msgstr "aktualizuje systém instalací/aktualizací balíků"
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "aktualizuje systém instalací/aktualizací/odstraněním balíků"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1022,35 +1215,10 @@ msgstr "Tento proces opakujte pro všechna zbývající média."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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 ""
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
-"  -qq  Nezobrazí nic než chyby\n"
-"  -s   Pouze simuluje prováděné akce\n"
-"  -f   Pře�te/zapíše ru�ní/automatické zna�ky z/do daného souboru\n"
-"  -c=? Na�te daný konfigura�ní soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-"Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)."
 
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
@@ -1060,23 +1228,9 @@ msgstr "Argumenty nejsou v párech"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Použití: apt-config [volby] příkaz\n"
-"\n"
-"apt-config je jednoduchý nástroj pro �tení konfigura�ního souboru APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -c=? Na�te tento konfigura�ní soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1088,31 +1242,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nelze najít balík pro architekturu „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nelze najít balík „%s“ s verzí „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nelze najít balík „%s“ z vydání „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Nelze najít verzi „%s“ balíku „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Nelze najít balík %s"
 
@@ -1134,188 +1263,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Nelze zamknout adresář pro stahování"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nelze najít zdrojový balík pro %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Pro stažení nejnovějších (možná dosud nevydaných) aktualizací balíku prosím "
-"použijte:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Přeskakuje se dříve stažený soubor „%s“\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Nutno stáhnout %sB/%sB zdrojových archivů.\n"
-
-#. 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"
-msgstr "Nutno stáhnout %sB zdrojových archivů.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Stažení zdroje %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Stažení některých archivů selhalo."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Přeskakuje se rozbalení již rozbaleného zdroje v %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Zkontrolujte, zda je nainstalován balík „dpkg-dev“.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
-"pro sestavení"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"O architektuře %s nejsou známy žádné informace. Pro nastavení si pře�těte "
-"�ást APT::Architectures v manuálové stránce apt.conf(5)"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr "Pro získání závislostí pro sestavení se používá adresář „%s“\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Pro získání závislostí pro sestavení se používá soubor „%s“\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nelze získat závislosti pro sestavení %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s nemá žádné závislosti pro sestavení.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ "
-"dovolena"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s "
-"nesplňuje požadavek na verzi"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou "
-"verzi"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Selhalo splnění závislosti %s pro %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Závislosti pro sestavení %s nemohly být splněny."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Chyba při zpracování závislostí pro sestavení"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Použití: apt-get [volby] příkaz\n"
 "         apt-get [volby] install|remove balík1 [balík2 …]\n"
@@ -1325,44 +1286,6 @@ msgstr ""
 "balíků. Nejpoužívanější příkazy jsou update a install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Volby:\n"
-"  -h   Tato nápověda\n"
-"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
-"  -qq  Nezobrazí nic než chyby\n"
-"  -d   Pouze stáhne - neinstaluje ani nerozbaluje archivy\n"
-"  -s   Pouze simuluje prováděné akce\n"
-"  -y   Na všechny otázky odpovídá automaticky Ano\n"
-"  -f   Zkusí opravit systém s porušenými závislostmi\n"
-"  -m   Zkusí pokra�ovat, i když se nepodaří najít archivy\n"
-"  -u   Zobrazí také seznam aktualizovaných balíků\n"
-"  -b   Po stažení zdrojového balíku jej i zkompiluje\n"
-"  -V   Zobrazí podrobná �ísla verzí\n"
-"  -c=? Na�te daný konfigura�ní soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-"Více voleb naleznete v manuálových stránkách apt-get(8), sources.list(5)\n"
-"a apt.conf(5).\n"
-"                       Tato APT má schopnosti svaté krávy.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Získá seznam nových balíků"
 
@@ -1436,11 +1359,13 @@ msgid "GetSrvRec failed for %s"
 msgstr "GetSrvRec %s selhalo"
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Použití: apt-helper [volby] příkaz\n"
 "         apt-helper [volby] download-file uri cílová_cesta\n"
@@ -1448,10 +1373,6 @@ msgstr ""
 "apt-helper je interní pomocník pro apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Tento APT pomocník má schopnosti svatého �ehokoliv."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "stáhne zadané uri do cílové cesty"
 
@@ -1518,11 +1439,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Použití: apt-mark [volby] {auto|manual} balík1 [balík2 …]\n"
 "\n"
@@ -1530,28 +1454,6 @@ msgstr ""
 "instalovaných ru�ně nebo automaticky. Také umí tyto zna�ky vypsat.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
-"  -qq  Nezobrazí nic než chyby\n"
-"  -s   Pouze simuluje prováděné akce\n"
-"  -f   Pře�te/zapíše ru�ní/automatické zna�ky z/do daného souboru\n"
-"  -c=? Na�te daný konfigura�ní soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-"Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Ozna�í dané balíky jako instalované automaticky"
 
@@ -2036,17 +1938,13 @@ msgid "Merging available information"
 msgstr "Slu�ují se dostupné informace"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
 "\n"
@@ -2073,17 +1971,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nelze ur�it verzi programu debconf. Je debconf nainstalován?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Použití: apt-internal-solver\n"
 "\n"
@@ -2104,25 +1997,10 @@ msgstr "Neznámý záznam o balíku!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n"
-"\n"
-"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n"
-"Volbou -s volíte typ souboru.\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda\n"
-"  -s   Setřídí zdrojový soubor\n"
-"  -c=? Na�te tento konfigura�ní soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3856,6 +3734,140 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Propo�ítává se aktualizace"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Použití: apt-cache [volby] příkaz\n"
+#~ "         apt-cache [volby] show balík1 [balík2 …]\n"
+#~ "\n"
+#~ "apt-cache je nízkoúrovňový nástroj pro získávání informací o balících.\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Příkazy:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Volby:\n"
+#~ "  -h   Tato nápověda.\n"
+#~ "  -p=? Vyrovnávací paměť balíků.\n"
+#~ "  -s=? Vyrovnávací paměť zdrojů.\n"
+#~ "  -q   Nezobrazí indikátor postupu.\n"
+#~ "  -i   U příkazu unmet zobrazí pouze důležité závislosti.\n"
+#~ "  -c=? Na�te daný konfigura�ní soubor\n"
+#~ "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+#~ "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Použití: apt [volby] příkaz\n"
+#~ "\n"
+#~ "Řádkové rozhraní pro apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Volby:\n"
+#~ "  -h   Tato nápověda.\n"
+#~ "  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
+#~ "  -qq  Nezobrazí nic než chyby\n"
+#~ "  -s   Pouze simuluje prováděné akce\n"
+#~ "  -f   Pře�te/zapíše ru�ní/automatické zna�ky z/do daného souboru\n"
+#~ "  -c=? Na�te daný konfigura�ní soubor\n"
+#~ "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+#~ "Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Použití: apt-config [volby] příkaz\n"
+#~ "\n"
+#~ "apt-config je jednoduchý nástroj pro �tení konfigura�ního souboru APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Volby:\n"
+#~ "  -h   Tato nápověda.\n"
+#~ "  -c=? Na�te tento konfigura�ní soubor\n"
+#~ "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Volby:\n"
+#~ "  -h   Tato nápověda.\n"
+#~ "  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
+#~ "  -qq  Nezobrazí nic než chyby\n"
+#~ "  -s   Pouze simuluje prováděné akce\n"
+#~ "  -f   Pře�te/zapíše ru�ní/automatické zna�ky z/do daného souboru\n"
+#~ "  -c=? Na�te daný konfigura�ní soubor\n"
+#~ "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+#~ "Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n"
+#~ "\n"
+#~ "apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n"
+#~ "Volbou -s volíte typ souboru.\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -h   Tato nápověda\n"
+#~ "  -s   Setřídí zdrojový soubor\n"
+#~ "  -c=? Na�te tento konfigura�ní soubor\n"
+#~ "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
 #~ msgid "Use --allow-insecure-repositories to force the update"
 #~ msgstr "Pro vynucení aktualizace použijte --allow-insecure-repositories"
 
diff --git a/po/cy.po b/po/cy.po
index dfc61434c..2d19b84ff 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -171,6 +171,36 @@ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
+#: 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 "Mae gan yr APT hwn bŵerau buwch hudol."
+
+#: 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 "Canfuwyd dim pecyn"
+
 #: apt-private/private-download.cc
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -217,6 +247,10 @@ msgstr "Does dim digon o le rhydd yn %s gennych"
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -314,7 +348,7 @@ msgstr "Ydych chi eisiau mynd ymlaen?"
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: 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 "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
@@ -701,9 +735,244 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Canfuwyd dim pecyn"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"
+
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "Package files:"
+msgstr "Ffeiliau Pecynnau:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "Pinned packages:"
+msgstr "Pecynnau wedi eu Pinio:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(heb ganfod)"
+
+#. 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 "  Wedi Sefydlu: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Ymgeisydd: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(dim)"
+
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "  Package pin: "
+msgstr "  Pin Pecyn: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "  Version table:"
+msgstr "  Tabl Fersiynnau:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: 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 "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+
+#: 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
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+
+#. 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 "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+
+#. 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 "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+
+#: 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 "Methodd y gorchymyn adeiladu '%s'.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
+"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -824,90 +1093,17 @@ msgstr "Cyfanswm Gofod Cyfrifwyd: "
 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 "Ni ellir lleoli'r pecyn %s"
-
-#: cmdline/apt-cache.cc
-#, fuzzy
-msgid "Package files:"
-msgstr "Ffeiliau Pecynnau:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-#, fuzzy
-msgid "Pinned packages:"
-msgstr "Pecynnau wedi eu Pinio:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(heb ganfod)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Wedi Sefydlu: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Ymgeisydd: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(dim)"
-
-#: cmdline/apt-cache.cc
-#, fuzzy
-msgid "  Package pin: "
-msgstr "  Pin Pecyn: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-#, fuzzy
-msgid "  Version table:"
-msgstr "  Tabl Fersiynnau:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
-"         apt-cache [opsiynnau] show pecyn1 [pecyn2 ...]\n"
-"\n"
-"Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
-"deuol APT, ac ymholi gwybodaeth ohonynt\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
@@ -942,7 +1138,11 @@ msgstr ""
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -989,7 +1189,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1029,24 +1228,9 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1057,23 +1241,9 @@ msgstr "Nid yw ymresymiadau mewn parau"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Defnydd: apt-config [opsiynnau] gorchymyn\n"
-"\n"
-"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -c=? Darllen y ffeil cyfluniad\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1084,31 +1254,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
@@ -1130,185 +1275,22 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-
-#. 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"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
-"newydd"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
-"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
-
-#: cmdline/apt-get.cc
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Defnydd: apt-get [opsiynnau] gorchymyn\n"
 "         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
@@ -1319,46 +1301,6 @@ msgstr ""
 "ddefnyddir amlaf.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn.\n"
-"  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
-"  -qq  Dim allbwn ar wahan i wallau\n"
-"  -d   Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
-"  -s   Peidio gweithredu. Gwneir efelychiad trefn.\n"
-"  -y   Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
-"  -f   Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
-"  -m   Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
-"  -u   Dangos rhestr o archifau a uwchraddir hefyd\n"
-"  -b   Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
-"  -V   Dangos rhifau fersiwn cyflawn\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-"\n"
-"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
-"fwy o wybodaeth ac opsiynnau.\n"
-"\n"
-"                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Cyrchu rhestrau pecynnau newydd"
 
@@ -1437,11 +1379,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1515,20 +1454,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2040,14 +1968,9 @@ msgstr "Yn cyfuno manylion Ar Gael"
 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 ""
 "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
 "\n"
@@ -2081,13 +2004,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
 "\n"
@@ -2105,29 +2022,13 @@ msgid "Unknown package record!"
 msgstr "Cofnod pecyn anhysbys!"
 
 #: cmdline/apt-sortpkgs.cc
-#, fuzzy
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -s   Defnyddio trefnu ffeil ffynhonell\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3871,6 +3772,65 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Yn Cyfrifo'r Uwchraddiad"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Defnydd: apt-cache [opsiynnau] gorchymyn\n"
+#~ "         apt-cache [opsiynnau] show pecyn1 [pecyn2 ...]\n"
+#~ "\n"
+#~ "Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
+#~ "deuol APT, ac ymholi gwybodaeth ohonynt\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Defnydd: apt-config [opsiynnau] gorchymyn\n"
+#~ "\n"
+#~ "Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opsiynnau:\n"
+#~ "  -h   Y testun cymorth hwn\n"
+#~ "  -c=? Darllen y ffeil cyfluniad\n"
+#~ "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+#~ "\n"
+#~ "Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir "
+#~ "yr\n"
+#~ "opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+#~ "\n"
+#~ "Opsiynnau:\n"
+#~ "  -h   Y testun cymorth hwn\n"
+#~ "  -s   Defnyddio trefnu ffeil ffynhonell\n"
+#~ "  -c=? Darllen y ffeil cyfluniad hwn\n"
+#~ "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Methodd proses plentyn"
 
diff --git a/po/da.po b/po/da.po
index 2f51dda80..fc02ff7fd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-07-06 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -172,6 +172,36 @@ msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
 
+#: 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 "Denne APT har »Super Cow Powers«."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Dette APT-hjælpeprogram har Super Meep Powers."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Fandt ingen pakker"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
@@ -216,6 +246,10 @@ msgstr "Kunne ikke bestemme ledig plads i %s"
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikke nok ledig plads i %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Kunne ikke låse nedhentningsmappen"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
@@ -312,7 +346,7 @@ msgstr "Vil du fortsætte?"
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: 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 "Nedhentning afsluttet i »hent-kun«-tilstand"
 
@@ -708,9 +742,246 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr "ikke en reel pakke (virtuel)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Fandt ingen pakker"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kunne ikke lokalisere pakken %s"
+
+# Overskriften til apt-cache policy,
+# forkorter "Package" væk. CH
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pakkefiler:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "»Pinned« pakker:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(ikke fundet)"
+
+#. 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 "  Installeret: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ingen)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pakke-pin: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versionstabel:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Kan ikke finde en pakke for arkitektur »%s«"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Kan ikke finde en pakke »%s« med version »%s«"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Kan ikke finde version »%s« for pakke »%s«"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Kunne ikke finde kildetekstpakken for %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
+"%s\n"
+
+#: 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 ""
+"Brug venligst:\n"
+"%s\n"
+"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Overspringer allerede hentet fil »%s«\n"
+
+#. 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 "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
+
+#. 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 "%sB skal hentes fra kildetekst-arkiverne.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Henter kildetekst %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Nogle arkiver kunne ikke hentes."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Udpakningskommandoen »%s« fejlede.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Opbygningskommandoen »%s« fejlede.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
+"Architectures for opsætning"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Kunne ikke behandler opbygningsafhængighederne"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s har ingen opbygningsafhængigheder.\n"
+
+#: 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 ""
+"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
+"ny"
+
+#: 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"
+msgstr ""
+"Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige "
+"kandidater for pakken %s kan tilfredsstille versionskravene"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
+"kandidatversion"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -819,98 +1090,18 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kunne ikke lokalisere pakken %s"
-
-# Overskriften til apt-cache policy,
-# forkorter "Package" væk. CH
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pakkefiler:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "»Pinned« pakker:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ikke fundet)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installeret: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ingen)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pakke-pin: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versionstabel:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Brug: apt-cache [tilvalg] kommando\n"
-"      apt-cache [tilvalg] show pakke1 [pakke2 ...]\n"
-"\n"
-"apt-cache er et lavniveauværktøj, brugt til at manipulere APTs\n"
-"binære mellemlagerfiler og hente oplysninger fra dem.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Kommandoer:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst.\n"
-"  -p=? Pakkemellemlageret.\n"
-"  -s=? Kildemellemlageret.\n"
-"  -q   Deaktiver fremgangsindikatoren.\n"
-"  -i   Vis kun vigtige afhængigheder for kommandoen »unmet«.\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-"Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -941,15 +1132,15 @@ msgid "Show policy settings"
 msgstr "Vis policy-indstillinger"
 
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Brug: apt [tilvalg] kommando\n"
-"\n"
-"CLI for apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -991,7 +1182,6 @@ msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 "full-upgrade - opgradere systemet ved at fjerne/installere/opgradere pakker"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1032,37 +1222,11 @@ msgstr "Gentag processen for resten af cd'erne i dit sæt."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Tilvalg:\n"
-"  -h  Denne hjælpetekst.\n"
-"  -q  Logbar uddata - ingen statusindikator\n"
-"  -qq Ingen uddata undtagen for fejl\n"
-"  -s  Ingen handling. Viser kun hvad der ville blive udført.\n"
-"  -f  læs/skriv auto/manuel markering i den givne fil\n"
-"  -c=? Læs denne konfigurationsfil\n"
-"  -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/"
-"tmp\n"
-"Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Parametre ikke angivet i par"
@@ -1071,23 +1235,9 @@ msgstr "Parametre ikke angivet i par"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Brug: apt-config [tilvalg] kommando\n"
-"\n"
-"apt-config er et simpelt værktøj til at læse APTs opsætningsfil\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst.\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1099,31 +1249,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Kan ikke finde en pakke for arkitektur »%s«"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Kan ikke finde en pakke »%s« med version »%s«"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Kan ikke finde version »%s« for pakke »%s«"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
@@ -1145,187 +1270,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Kunne ikke låse nedhentningsmappen"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Kunne ikke finde kildetekstpakken for %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Brug venligst:\n"
-"%s\n"
-"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Overspringer allerede hentet fil »%s«\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-
-#. 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"
-msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Henter kildetekst %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Nogle arkiver kunne ikke hentes."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Udpakningskommandoen »%s« fejlede.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Opbygningskommandoen »%s« fejlede.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
-"Architectures for opsætning"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Kunne ikke behandler opbygningsafhængighederne"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s har ingen opbygningsafhængigheder.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
-"ny"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige "
-"kandidater for pakken %s kan tilfredsstille versionskravene"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
-"kandidatversion"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Kunne ikke behandler opbygningsafhængighederne"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Brug: apt-get [tilvalg] kommando\n"
 "      apt-get [tilvalg] install|remove pakke1 [pakke2 ...]\n"
@@ -1336,44 +1294,6 @@ msgstr ""
 "install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Tilvalg:\n"
-"  -h  Denne hjælpetekst.\n"
-"  -q  Uddata, der kan logges - ingen fremgangsindikator\n"
-"  -qq Ingen uddata, kun fejl\n"
-"  -d  Hent kun - installér eller udpak IKKE arkiverne\n"
-"  -s  Gør intet. Simulér handlingen\n"
-"  -y  Antag »ja«-svar til alle spørgsmål uden at spørge\n"
-"  -f  Forsøg at fortsætte selvom integritetstjek fejler\n"
-"  -m  Forsøg at fortsætte selvom arkiverne ikke kan findes\n"
-"  -u  Vis også en liste over opgraderede pakker\n"
-"  -b  Byg kildetekstpakken efter at have hentet den\n"
-"  -V  Vis detaljerede versionsnumre\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv et arbitrært opsætningsvalg. F.eks. -o dir::cache=/tmp\n"
-"Se manualsiderne for apt-get(8), sources.list(5) og apt.conf(5)\n"
-"for flere oplysninger og tilvalg.\n"
-"                       Denne APT har »Super Cow Powers«.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Hent nye lister over pakker"
 
@@ -1447,11 +1367,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Brug: apt-helper [tilvalg] kommando\n"
 "      apt-helper [tilvalg] download-file uri target-path\n"
@@ -1459,10 +1381,6 @@ msgstr ""
 "apt-helper er et internt hjælpeprogram for apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Dette APT-hjælpeprogram har Super Meep Powers."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "hent den angivne uri til mål-sti"
 
@@ -1529,11 +1447,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n"
 "\n"
@@ -1542,29 +1463,6 @@ msgstr ""
 "markeringerne.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Tilvalg:\n"
-"  -h  Denne hjælpetekst.\n"
-"  -q  Logbar uddata - ingen statusindikator\n"
-"  -qq Ingen uddata undtagen for fejl\n"
-"  -s  Ingen handling. Viser kun hvad der ville blive udført.\n"
-"  -f  læs/skriv auto/manuel markering i den givne fil\n"
-"  -c=? Læs denne konfigurationsfil\n"
-"  -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/"
-"tmp\n"
-"Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Marker de givne pakker som automatisk installeret"
 
@@ -2057,17 +1955,13 @@ msgid "Merging available information"
 msgstr "Sammenfletter tilgængelighedsoplysninger"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Brug: apt-extracttemplates fil1 [fil2 ...]\n"
 "\n"
@@ -2095,17 +1989,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Brug: apt-internal-solver\n"
 "\n"
@@ -2127,25 +2016,10 @@ msgstr "Ukendt pakkeindgang!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
-"bruges til at angive filens type.\n"
-"\n"
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst\n"
-"  -s   Benyt kildefils-sortering\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3877,6 +3751,145 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Beregner opgraderingen"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Brug: apt-cache [tilvalg] kommando\n"
+#~ "      apt-cache [tilvalg] show pakke1 [pakke2 ...]\n"
+#~ "\n"
+#~ "apt-cache er et lavniveauværktøj, brugt til at manipulere APTs\n"
+#~ "binære mellemlagerfiler og hente oplysninger fra dem.\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Kommandoer:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Tilvalg:\n"
+#~ "  -h   Denne hjælpetekst.\n"
+#~ "  -p=? Pakkemellemlageret.\n"
+#~ "  -s=? Kildemellemlageret.\n"
+#~ "  -q   Deaktiver fremgangsindikatoren.\n"
+#~ "  -i   Vis kun vigtige afhængigheder for kommandoen »unmet«.\n"
+#~ "  -c=? Læs denne opsætningsfil\n"
+#~ "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
+#~ "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Brug: apt [tilvalg] kommando\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Tilvalg:\n"
+#~ "  -h  Denne hjælpetekst.\n"
+#~ "  -q  Logbar uddata - ingen statusindikator\n"
+#~ "  -qq Ingen uddata undtagen for fejl\n"
+#~ "  -s  Ingen handling. Viser kun hvad der ville blive udført.\n"
+#~ "  -f  læs/skriv auto/manuel markering i den givne fil\n"
+#~ "  -c=? Læs denne konfigurationsfil\n"
+#~ "  -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Brug: apt-config [tilvalg] kommando\n"
+#~ "\n"
+#~ "apt-config er et simpelt værktøj til at læse APTs opsætningsfil\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Tilvalg:\n"
+#~ "  -h   Denne hjælpetekst.\n"
+#~ "  -c=? Læs denne opsætningsfil\n"
+#~ "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Tilvalg:\n"
+#~ "  -h  Denne hjælpetekst.\n"
+#~ "  -q  Logbar uddata - ingen statusindikator\n"
+#~ "  -qq Ingen uddata undtagen for fejl\n"
+#~ "  -s  Ingen handling. Viser kun hvad der ville blive udført.\n"
+#~ "  -f  læs/skriv auto/manuel markering i den givne fil\n"
+#~ "  -c=? Læs denne konfigurationsfil\n"
+#~ "  -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -"
+#~ "s\n"
+#~ "bruges til at angive filens type.\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -h   Denne hjælpetekst\n"
+#~ "  -s   Benyt kildefils-sortering\n"
+#~ "  -c=? Læs denne opsætningsfil\n"
+#~ "  -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Barneprocessen fejlede"
 
diff --git a/po/de.po b/po/de.po
index be19313aa..e059ac534 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-09-19 13:04+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -175,6 +175,36 @@ msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt.\n"
 
+#: 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 "Dieses APT hat Super-Kuh-Kräfte."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Dieses APT-Hilfsprogramm hat Super-Road-Runner-Kräfte."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Keine Pakete gefunden"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
@@ -219,6 +249,10 @@ msgstr "Freier Platz in %s konnte nicht bestimmt werden."
 msgid "You don't have enough free space in %s."
 msgstr "Sie haben nicht genug Platz in %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
@@ -316,7 +350,7 @@ msgstr "Möchten Sie fortfahren?"
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden."
 
-#: 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 "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
@@ -724,9 +758,256 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr "kein reales Paket (virtuell)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Keine Pakete gefunden"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Paket %s kann nicht gefunden werden."
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Paketdateien:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht "
+"möglich"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Mit Pinning verwaltete Pakete:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nicht gefunden)"
+
+#. 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 "  Installiert: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Installationskandidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(keine)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Paket-Pinning: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versionstabelle:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Es kann kein Paket für Architektur »%s« gefunden werden"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Es kann kein Paket »%s« mit Version »%s« gefunden werden"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Es kann kein Paket »%s« in der Veröffentlichung »%s« gefunden werden"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Es kann keine Version »%s« des Pakets »%s« gefunden werden"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
+"sollen."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Quellpaket für %s kann nicht gefunden werden."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"HINWEIS: »%s«-Paketierung wird betreut im »%s«-Versionsverwaltungssystem "
+"auf:\n"
+"%s\n"
+
+#: 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 ""
+"Bitte verwenden Sie:\n"
+"%s\n"
+"um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
+"für das Paket abzurufen.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
+
+#. 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 "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
+
+#. 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 "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Quelle %s wird heruntergeladen.\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Einige Archive konnten nicht heruntergeladen werden."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
+"überprüft werden sollen."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
+"finden Sie unter apt.conf(5) APT::Architectures."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr ""
+"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s hat keine Bauabhängigkeiten.\n"
+
+#: 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 ""
+"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen "
+"nicht erlaubt ist."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
+"gefunden werden kann."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
+"ist zu neu."
+
+#: 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"
+msgstr ""
+"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da die Version des "
+"Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
+"erfüllen kann."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
+"Installationskandidat existiert."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -839,99 +1120,18 @@ msgstr ""
 "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark "
 "showauto«."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Paket %s kann nicht gefunden werden."
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Paketdateien:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht "
-"möglich"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Mit Pinning verwaltete Pakete:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nicht gefunden)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installiert: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Installationskandidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(keine)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Paket-Pinning: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versionstabelle:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Aufruf: apt-cache [Optionen] befehl\n"
-"        apt-cache [Optionen] show paket1 [paket2 ...]\n"
-"\n"
-"apt-cache ist ein untergeordnetes Werkzeug, um Informationen aus den\n"
-"binären Zwischenspeicher-Dateien von APT abzufragen.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Befehle:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Optionen:\n"
-"  -h   dieser Hilfe-Text\n"
-"  -p=? der Paket-Zwischenspeicher\n"
-"  -s=? der Quell-Zwischenspeicher\n"
-"  -q   Fortschrittsanzeige abschalten\n"
-"  -i   nur wichtige Abhängigkeiten für den »unmet«-Befehl ausgeben\n"
-"  -c=? diese Konfigurationsdatei lesen\n"
-"  -o=? eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-"Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n"
-"und apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -965,11 +1165,12 @@ msgstr "Policy-Einstellungen ausgeben"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Aufruf: apt [Optionen] Befehl\n"
-"\n"
-"Befehlszeilen-Schnittstelle (CLI) für apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1012,7 +1213,6 @@ msgstr ""
 "das System durch Entfernung/Installation/Aktualisierung der Pakete "
 "vollständig hochrüsten"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1060,37 +1260,11 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Optionen:\n"
-"  -h   dieser Hilfetext\n"
-"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-"  -qq  keine Ausgabe, außer bei Fehlern\n"
-"  -s   nichts tun, nur eine Simulation der Aktionen durchführen\n"
-"  -f   Autom./Manuell-Markierung in der angegebenen Datei lesen/schreiben\n"
-"  -c=? Diese Konfigurationsdatei benutzen\n"
-"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-"Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
-"weitergehender Informationen."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumente nicht paarweise"
@@ -1099,24 +1273,9 @@ msgstr "Argumente nicht paarweise"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Aufruf: apt-config [optionen] befehl\n"
-"\n"
-"apt-config ist ein einfaches Werkzeug, um die APT-Konfigurationsdatei zu "
-"lesen.\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Optionen:\n"
-"  -h    Dieser Hilfetext\n"
-"  -c=?  Diese Konfigurationsdatei lesen\n"
-"  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1128,31 +1287,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Es kann kein Paket für Architektur »%s« gefunden werden"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Es kann kein Paket »%s« mit Version »%s« gefunden werden"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Es kann kein Paket »%s« in der Veröffentlichung »%s« gefunden werden"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Es kann keine Version »%s« des Pakets »%s« gefunden werden"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
@@ -1174,197 +1308,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
-"sollen."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Quellpaket für %s kann nicht gefunden werden."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"HINWEIS: »%s«-Paketierung wird betreut im »%s«-Versionsverwaltungssystem "
-"auf:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Bitte verwenden Sie:\n"
-"%s\n"
-"um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
-"für das Paket abzurufen.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
-
-#. 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"
-msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Quelle %s wird heruntergeladen.\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Einige Archive konnten nicht heruntergeladen werden."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
-"überprüft werden sollen."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
-"finden Sie unter apt.conf(5) APT::Architectures."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s hat keine Bauabhängigkeiten.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen "
-"nicht erlaubt ist."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
-"gefunden werden kann."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
-"ist zu neu."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da die Version des "
-"Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
-"erfüllen kann."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
-"Installationskandidat existiert."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Aufruf: apt-get [Optionen] befehl\n"
 "        apt-get [Optionen] install|remove paket1 [paket2 ...]\n"
@@ -1375,44 +1332,6 @@ msgstr ""
 "sind update und install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Optionen:\n"
-"  -h   dieser Hilfetext\n"
-"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-"  -qq  keine Ausgabe, außer bei Fehlern\n"
-"  -d   nur herunterladen – Archive NICHT installieren oder entpacken\n"
-"  -s   nichts tun, nur eine Simulation der Aktionen durchführen\n"
-"  -y   für alle Antworten »Ja« annehmen und nicht nachfragen\n"
-"  -f   versuchen, ein System mit defekten Abhängigkeiten zu korrigieren\n"
-"  -m   versuchen fortzufahren, wenn Archive nicht auffindbar sind\n"
-"  -u   ebenfalls eine Liste der aktualisierten Pakete ausgeben\n"
-"  -b   ein Quellpaket nach dem Herunterladen bauen\n"
-"  -V   ausführliche Versionsnummern ausgeben\n"
-"  -c=? Diese Konfigurationsdatei benutzen\n"
-"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-"Siehe auch die Handbuchseiten apt-get(8), sources.list(5) und apt.conf(5)\n"
-"bezüglich weitergehender Informationen und Optionen.\n"
-"                                    Dieses APT hat Super-Kuh-Kräfte.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "neue Paketinformationen holen"
 
@@ -1488,11 +1407,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Aufruf: apt-helper [Optionen] Befehl\n"
 "        apt-helper [Optionen] download-file URI Zielpfad\n"
@@ -1500,10 +1421,6 @@ msgstr ""
 "apt-helper ist ein internes Hilfsprogramm für apt.\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Dieses APT-Hilfsprogramm hat Super-Road-Runner-Kräfte."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "den angegebenen URI in den Zielpfad herunterladen"
 
@@ -1571,11 +1488,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
@@ -1584,29 +1504,6 @@ msgstr ""
 "aufgelistet werden.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Optionen:\n"
-"  -h   dieser Hilfetext\n"
-"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-"  -qq  keine Ausgabe, außer bei Fehlern\n"
-"  -s   nichts tun, nur eine Simulation der Aktionen durchführen\n"
-"  -f   Autom./Manuell-Markierung in der angegebenen Datei lesen/schreiben\n"
-"  -c=? Diese Konfigurationsdatei benutzen\n"
-"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-"Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
-"weitergehender Informationen."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "das angegebene Paket als »Automatisch installiert« markieren"
 
@@ -2112,17 +2009,13 @@ msgid "Merging available information"
 msgstr "Verfügbare Informationen werden zusammengeführt."
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Aufruf: apt-extracttemplates datei1 [datei2 ...]\n"
 "\n"
@@ -2151,17 +2044,12 @@ msgstr ""
 "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Aufruf: apt-internal-solver\n"
 "\n"
@@ -2183,26 +2071,10 @@ msgstr "Unbekannter Paketeintrag!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n"
-"\n"
-"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n"
-"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich "
-"handelt.\n"
-"\n"
-"Optionen:\n"
-"  -h   Dieser Hilfetext\n"
-"  -s   Quelldateisortierung benutzen\n"
-"  -c=? Diese Konfigurationsdatei lesen\n"
-"  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3991,6 +3863,152 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Paketaktualisierung (Upgrade) wird berechnet"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Aufruf: apt-cache [Optionen] befehl\n"
+#~ "        apt-cache [Optionen] show paket1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-cache ist ein untergeordnetes Werkzeug, um Informationen aus den\n"
+#~ "binären Zwischenspeicher-Dateien von APT abzufragen.\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Befehle:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Optionen:\n"
+#~ "  -h   dieser Hilfe-Text\n"
+#~ "  -p=? der Paket-Zwischenspeicher\n"
+#~ "  -s=? der Quell-Zwischenspeicher\n"
+#~ "  -q   Fortschrittsanzeige abschalten\n"
+#~ "  -i   nur wichtige Abhängigkeiten für den »unmet«-Befehl ausgeben\n"
+#~ "  -c=? diese Konfigurationsdatei lesen\n"
+#~ "  -o=? eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n"
+#~ "und apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Aufruf: apt [Optionen] Befehl\n"
+#~ "\n"
+#~ "Befehlszeilen-Schnittstelle (CLI) für apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Optionen:\n"
+#~ "  -h   dieser Hilfetext\n"
+#~ "  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
+#~ "  -qq  keine Ausgabe, außer bei Fehlern\n"
+#~ "  -s   nichts tun, nur eine Simulation der Aktionen durchführen\n"
+#~ "  -f   Autom./Manuell-Markierung in der angegebenen Datei lesen/"
+#~ "schreiben\n"
+#~ "  -c=? Diese Konfigurationsdatei benutzen\n"
+#~ "  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+#~ "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
+#~ "weitergehender Informationen."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Aufruf: apt-config [optionen] befehl\n"
+#~ "\n"
+#~ "apt-config ist ein einfaches Werkzeug, um die APT-Konfigurationsdatei zu "
+#~ "lesen.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Optionen:\n"
+#~ "  -h    Dieser Hilfetext\n"
+#~ "  -c=?  Diese Konfigurationsdatei lesen\n"
+#~ "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/"
+#~ "tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Optionen:\n"
+#~ "  -h   dieser Hilfetext\n"
+#~ "  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
+#~ "  -qq  keine Ausgabe, außer bei Fehlern\n"
+#~ "  -s   nichts tun, nur eine Simulation der Aktionen durchführen\n"
+#~ "  -f   Autom./Manuell-Markierung in der angegebenen Datei lesen/"
+#~ "schreiben\n"
+#~ "  -c=? Diese Konfigurationsdatei benutzen\n"
+#~ "  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+#~ "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
+#~ "weitergehender Informationen."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. "
+#~ "Die\n"
+#~ "Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich "
+#~ "handelt.\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -h   Dieser Hilfetext\n"
+#~ "  -s   Quelldateisortierung benutzen\n"
+#~ "  -c=? Diese Konfigurationsdatei lesen\n"
+#~ "  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Kindprozess fehlgeschlagen"
 
diff --git a/po/dz.po b/po/dz.po
index 1f10b7c02..3a1d3ab91 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -173,6 +173,36 @@ msgstr "à½�ུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགà
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འ�ུ་འབད་ནི་སེམས་�ར་བཞག\n"
 
+#: 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 "ཉེན་བརྡ:འོག་གི་�ུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བ�ུབ་པས�"
@@ -218,6 +248,10 @@ msgstr "%s་ནང་བར་སྟོང་"
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་�ྱོད་ལུ་བར་སྟོང་དལ�་ལངམ་སྦེ་མིན་འདུག"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་ར�ྱབས་མ་ཚུགས་པས�"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -318,7 +352,7 @@ 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 "ཕབ་ལེན་�བས་ལམ་ར�ྱངམ་གཅིག་ནང་མཇུག་བསྡུ�་སྦེ་རང་ཕབ་ལེན་འབད�"
 
@@ -700,9 +734,234 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "�ུམ་སྒྲིལ་ཚུ་མ་�ོབ�"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%s�ུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་�ོབ�"
+
+#: 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 "�བ་གཟེར་བ�བ་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ:"
+
+#: 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
+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 "(ཅི་མེད�)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "�ུམ་སྒྲིལ་གྱི་�བ་གཟེར:"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "�ོན་རིམ་�ིག་�ྲམ�:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "འབྱུང་�ུངས་�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས�"
+
+#: 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 "%s་གི་དོན་ལུ་འབྱུང་�ུངས་�ུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འ�ོབ"
+
+#: 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 "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
+
+#. 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 "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་�ུངས་ཡིག་མཛོད་ཀྱི་%sB�\n"
+
+#. 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 "འབྱུང་�ུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས�\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "%s་འབྱུང་�ུངས་ལེན�\n"
+
+#: 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 "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ�\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "'dpkg-dev'་�ུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་ག�ང་འབད�\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མ�འ་རང་�ུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
+
+#: 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
+#, fuzzy, 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"
+msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "%s�ུམ་སྒྲིལ་འདི་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s�ུམ་སྒྲིལ་འདི་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་ས�ོང་ནི་འདི་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་�ུམ་"
+"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་ས�ོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་�ུམ་སྒརིལ་%s་གི་འ�ོན་རིམ་"
+"ཚུ་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་འ�ོན་རིམ་དགོས་མ�ོ་ཚུ་གི་རེ་བ་དོ་ས�ོང་མ་ཚུགས་པས�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "%s�ུམ་སྒྲིལ་འདི་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འ�ུས་ཤོར་བྱུང་ནུག"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས�"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན�"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -811,100 +1070,20 @@ 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 "%s�ུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་�ོབ�"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "�བ་གཟེར་བ�བ་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(མ་�ོབ�)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "གཞི་བཙུགས་འབད་ཡོདཔ�"
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "མི་ངོ:"
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ཅི་མེད�)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "�ུམ་སྒྲིལ་གྱི་�བ་གཟེར:"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "�ོན་རིམ་�ིག་�ྲམ�:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"ལག་ལེན�: apt-cache [options] command\n"
-"       apt-cache [options] show pkg1 [pkg2 ...]\n"
-"  apt-cacheའདི་གནས་རིམ་དམའ་དྲག་གི་ལག་ཆས་ APT's binary\n"
-"་ འདྲ་མཛོད་ཡིག་སྣོད་གཡོག་བཀོལ་དོན་ལུ་ལག་ལེན་འ�བ་ནི་དང་་དེ་ཚུ་ནང་ལས་བརྡ་དོན་འདྲི་དཔྱད་འབད་ནིའི་དོན་"
-"ལུ་ཨིན�\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"གདམ་�་ཚུ་:\n"
-"  -h   འདི་གིས་ཚིག་ཡིག་ལུ་ཆ་རོགས་འབད�་ཨིན�.\n"
-"  -p=? འདི་འབྱུང་�ུངས་འའདྲ་མཛོད་ཨིན�.\n"
-"  -s=? འདི་འབྱུང་�ུངས་འདྲ་མཛོད་ཨིན�.\n"
-"  -q   འདི་གིས་ ཡར་འཕེལ་བརྡ་སྟོན་པ་འདི་ལྕོགས་མིན་བཟོ�་ཨིན�.\n"
-"  -i  འདི་གིས་ མ་ཚང་པའི་བརྡ་བཀོད་ཚུ་གི་དོན་ལུ་ གལ་ཅན་གྱི་ཌེཔསི་ར�ྱངམ་ཅིག་སྟོན�.\n"
-"  -c=? འདི་གིས་ འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན�.\n"
-"  -o=? འདི་གིས་ མ�ུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་�་འདི་གཞི་སྒྲིག་འབད�་ཨིན་ དཔེར་ན་ eg -o dir::"
-"cache=/tmp\n"
-" ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་�ོག་ཤོག་ལེབ་ཚུ་བལྟ�.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "འདི་གིས་འབྱུང་�ུངས་ཀྱི་དྲན་�ོ་ཚུ་སྟོནམ་ཨིན�"
 
@@ -936,7 +1115,11 @@ msgstr "འདི་གིས་ སྲིད་བྱུས་སྒྲིགà¼
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -983,7 +1166,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1021,24 +1203,9 @@ msgstr "�ྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1049,23 +1216,9 @@ msgstr "སྒྲུབས་རྟགས་ཚུ་ཟུང་ནང་མི
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"ལག་ལེན:apt-config [གདམ་�་ཚུ་] བརྡ་བཀོད�\n"
-"\n"
-"apt-config་འདི་APT config་ཡིག་སྣོད་ལྷག་ནིའི་དོན་ལུ་འཇམ་སམ་ལག་ཆས་ཅིག་ཨིན�\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"གདམ་�་ཚུ:\n"
-"  -h   འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབད�་ཨིན�\n"
-"  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན�\n"
-"  -o=? མ�ུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབད�་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་བཟུམ�\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1076,31 +1229,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "འབྱུང་�ུངས་�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་�ུམ་སྒྲིལ་འཚོལ་མ་�ོབ�"
@@ -1121,176 +1249,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འ�ོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མ�ུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་�ལ་ཡོད�"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་ར�ྱབས་མ་ཚུགས་པས�"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "གི་དོན་ལུ་འབྱུང་�ུངས་ལེན་ནི་ལུ་ཉུང་མ�འ་རང་�ུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "%s་གི་དོན་ལུ་འབྱུང་�ུངས་�ུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འ�ོབ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་�ུངས་ཡིག་མཛོད་ཀྱི་%sB�\n"
-
-#. 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"
-msgstr "འབྱུང་�ུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས�\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "%s་འབྱུང་�ུངས་ལེན�\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོད�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ�\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "'dpkg-dev'་�ུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་ག�ང་འབད�\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འ�ུས་ཤོར་བྱུང་ཡོད�\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མ�འ་རང་�ུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "%s�ུམ་སྒྲིལ་འདི་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s�ུམ་སྒྲིལ་འདི་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་ས�ོང་ནི་འདི་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་�ུམ་"
-"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་ས�ོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་�ུམ་སྒརིལ་%s་གི་འ�ོན་རིམ་"
-"ཚུ་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་འ�ོན་རིམ་དགོས་མ�ོ་ཚུ་གི་རེ་བ་དོ་ས�ོང་མ་ཚུགས་པས�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "%s�ུམ་སྒྲིལ་འདི་འ�ོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འ�ུས་ཤོར་བྱུང་ནུག"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས�"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ཡོདཔ་ཨིན�"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "རྒྱབ་ས�ྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "ལག་ལེན་:apt-get [options] command\n"
 "apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1302,45 +1274,6 @@ msgstr ""
 " དུས་མ�ུན་དང་གཞི་བཙུགས་འབད་ནི་དེ་ཨིན�\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"གདམ་�་ཚུ་:\n"
-"  -h  འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབད�་ཨིན�\n"
-"  -q  དྲན་དེབ་འབད་བ�ུབ་པའི་ཨའུཊི་པུཊི་ -ཡར་འཕེལ་གྱི་བརྡ་སྟོན་མིན་འདུག\n"
-"  -qq འཛོལ་བ་ཚུ་གི་དོན་ལུ་ར�ྱངམ་ཅིག་མ་ག�ོགས་ཨའུཊི་པུཊི་མིན་འདུག\n"
-"  -d  ཕབ་ལེན་ར�ྱངམ་ཅིག་ཨིན་-  གཞི་བཙུགས་ཡང་ན་ཡིག་མཛོད་ཚུ་སྦུང་ཚན་བཟོ་བཤོལ་མ་འབད�\n"
-"  -s  བྱ་བ་མིན་འདུག   གོ་རིམ་མཚུངས་བཟོ་གི་ལས་འགན་འགྲུབ�\n"
-"  -y  འདྲི་དཔྱད་གེ་རང་ལུ་ཨིནམ་སྦེ་ཚོད་དཔག་བཞིནམ་ལས་ནུས་སྤེལ་མ་འབད�\n"
-"  -f  ཆིག་སྒྲིལ་ཞིབ་དཔྱད་འདི་འ�ུས་ཤོར་བྱུང་པ་ཅིན་ འཕྲོ་མ�ུད་འབད་ནི་ལུ་དཔའ་བཅམ�\n"
-"  -m  ཡིག་མཛོད་འདི་ཚུ་ག་ཡོད་འཚོལ་མ་�ོབ་པ་ཅིན་འཕྲོ་མ�ུད་ནི་ལུ་དཔའ་བཅམ�\n"
-"  -u  ཡར་བས�ྱེད་བཟོ་ཡོད་པའི་�ུམ་སྒྲིལ་འདི་ཡང་་སྟོན�\n"
-"  -b  འདི་ལེན་ཚར་བའི་ཤུལ་ལས འབྱུང་�ུངས་�ུམ་སྒྲིལ་འདི་བཟོ་བརྩིགས་འབད�\n"
-"  -V  བརྡ་དོན་ལེ་ཤཱ་གི་འ�ོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན�\n"
-"  -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n"
-"  -o=? མ�ུན་སྒྲིག་གདམ་�་གི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་  དཔེན་ན་-o dir::cache=/tmp\n"
-"བརྡ་དོན་དང་གདམ་�་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་  sources.list(5) དང་apt."
-"conf(5)ལག་�ོག་\n"
-"ཤོག་ལེབ་ཚུ་ལུ་བལྟ�\n"
-"                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད�\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "འདི་གིས་�ུམ་སྒྲིལ་ཚུ་གི་�ོ་ཡིག་གསརཔ་ཚུ་སླར་འདྲེན་འབད�་ཨིན�"
 
@@ -1419,11 +1352,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1497,20 +1427,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2010,17 +1929,13 @@ msgid "Merging available information"
 msgstr "འ�ོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ�"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2053,13 +1968,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2080,27 +1989,10 @@ msgstr "མ་ཤེས་པའི་�ུམ་སྒྲིལ་གི་ད
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs་ འདི་�ུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་  འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན� -s  "
-"གདམ་�་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་�ག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
-"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འ�བ་སྟེ་ཡོདཔ་ཨིན�\n"
-"\n"
-"གདམ་�་ཚུ:\n"
-"  -h   འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབད�་ཨིན�\n"
-"  -s  འདི་གིས་འབྱུང་�ུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འ�བ་ཨིན�\n"
-"  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན�\n"
-"  -o=? འདི་གིས་ མ�ུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་�་ཚུ་�ཞི་སྒྲིག་འབད�་ཨིན་   དཔེར་ན་-o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3816,6 +3708,87 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "ཡར་བས�ྱེད་རྩིས་བ�ོན་དོ་"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "ལག་ལེན�: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "  apt-cacheའདི་གནས་རིམ་དམའ་དྲག་གི་ལག་ཆས་ APT's binary\n"
+#~ "་ འདྲ་མཛོད་ཡིག་སྣོད་གཡོག་བཀོལ་དོན་ལུ་ལག་ལེན་འ�བ་ནི་དང་་དེ་ཚུ་ནང་ལས་བརྡ་དོན་འདྲི་དཔྱད་འབད་ནིའི་"
+#~ "དོན་ལུ་ཨིན�\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "གདམ་�་ཚུ་:\n"
+#~ "  -h   འདི་གིས་ཚིག་ཡིག་ལུ་ཆ་རོགས་འབད�་ཨིན�.\n"
+#~ "  -p=? འདི་འབྱུང་�ུངས་འའདྲ་མཛོད་ཨིན�.\n"
+#~ "  -s=? འདི་འབྱུང་�ུངས་འདྲ་མཛོད་ཨིན�.\n"
+#~ "  -q   འདི་གིས་ ཡར་འཕེལ་བརྡ་སྟོན་པ་འདི་ལྕོགས་མིན་བཟོ�་ཨིན�.\n"
+#~ "  -i  འདི་གིས་ མ་ཚང་པའི་བརྡ་བཀོད་ཚུ་གི་དོན་ལུ་ གལ་ཅན་གྱི་ཌེཔསི་ར�ྱངམ་ཅིག་སྟོན�.\n"
+#~ "  -c=? འདི་གིས་ འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན�.\n"
+#~ "  -o=? འདི་གིས་ མ�ུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་�་འདི་གཞི་སྒྲིག་འབད�་ཨིན་ དཔེར་ན་ eg -o dir::"
+#~ "cache=/tmp\n"
+#~ " ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་�ོག་ཤོག་ལེབ་ཚུ་བལྟ�.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "ལག་ལེན:apt-config [གདམ་�་ཚུ་] བརྡ་བཀོད�\n"
+#~ "\n"
+#~ "apt-config་འདི་APT config་ཡིག་སྣོད་ལྷག་ནིའི་དོན་ལུ་འཇམ་སམ་ལག་ཆས་ཅིག་ཨིན�\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "གདམ་�་ཚུ:\n"
+#~ "  -h   འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབད�་ཨིན�\n"
+#~ "  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན�\n"
+#~ "  -o=? མ�ུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབད�་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་བཟུམ�\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"
+#~ msgstr ""
+#~ "ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs་ འདི་�ུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་  འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན� -"
+#~ "s  གདམ་�་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་�ག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
+#~ "་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འ�བ་སྟེ་ཡོདཔ་ཨིན�\n"
+#~ "\n"
+#~ "གདམ་�་ཚུ:\n"
+#~ "  -h   འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབད�་ཨིན�\n"
+#~ "  -s  འདི་གིས་འབྱུང་�ུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འ�བ་ཨིན�\n"
+#~ "  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན�\n"
+#~ "  -o=? འདི་གིས་ མ�ུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་�་ཚུ་�ཞི་སྒྲིག་འབད�་ཨིན་   དཔེར་ན་-o dir::"
+#~ "cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འ�ུས་ཤོར་བྱུང་ནུག"
 
diff --git a/po/el.po b/po/el.po
index d3b75ac14..4421354df 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: Θανάσης �άτσης <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -184,6 +184,36 @@ msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Σημείωση, επιλέχθηκε το %s αντί του %s\n"
 
+#: 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 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακ�ιβώθηκαν!"
@@ -228,6 +258,10 @@ msgstr "Δεν μπόÏ�εσα να Ï€Ï�οσδιοÏ�ίσω τον ελεÏ�θεÏ�Î
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε α�κετό ελε�θε�ο χώ�ο στο  %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Αδ�νατο το κλείδωμα του καταλόγου μεταφό�τωσης"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτε�ικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
@@ -327,7 +361,7 @@ 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 "Ολοκλη�ώθηκε η μεταφό�τωση μόνο"
 
@@ -714,9 +748,242 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Δε β�έθηκαν πακέτα"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Αδυναμία εντοπισμο� του πακέτου %s"
+
+#: 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 ""
+"Η cache δεν είναι ενημε�ωμένη, αδυναμία πα�απομπής σε ένα α�χείο πακέτου"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+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
+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 "(κανένα)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr " Καθήλωση Πακέτου: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Πίνακας Έκδοσης:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Αδ�νατη η ε��εση του πακέτου %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Αδ�νατη η ε��εση του πακέτου %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Αδ�νατη η ε��εση του πακέτου %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n"
+
+#: 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 "Αδυναμία εντοπισμο� του κώδικά του πακέτου %s"
+
+#: 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 "Πα�άκαμψη του ήδη μεταφο�τωμένου α�χείου `%s`\n"
+
+#. 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 "Χ�ειάζεται να μεταφο�τωθο�ν %sB/%sB πηγαίου κώδικα.\n"
+
+#. 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 "Χ�ειάζεται να μεταφο�τωθο�ν %sB πηγαίου κώδικα.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Μεταφό�τωση Κωδικα %s\n"
+
+#: 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 "Πα�άκαμψη της αποσυμπίεσης ήδη μεταφο�τωμένου κώδικα στο %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
+
+#: 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
+#, fuzzy, 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"
+msgstr "Αδ�νατη η ε��εση πλη�οφο�ιών χτισίματος για το %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "το %s δεν έχει εξα�τήσεις χτισίματος.\n"
+
+#: 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 ""
+"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το %s δεν επιτ�έπεται στο "
+"πακέτο %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το πακέτο %s δεν β�έθηκε"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Αποτυχία ικανοποίησης %s εξα�τήσεων για το %s: Το εγκατεστημένο πακέτο %s "
+"είναι νεώτε�ο"
+
+#: 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"
+msgstr ""
+"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή δεν υπά�χουν διαθέσιμες "
+"εκδόσεις του πακέτου %s που να ικανοποιο�ν τις απαιτήσεις της έκδοσης"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το πακέτο %s δεν έχει "
+"υποψήφιαέκδοση"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Αποτυχία ικανοποίησης %s εξά�τησης για το %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Οι εξα�τήσεις χτισίματος για το %s δεν ικανοποιο�νται."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Αποτυχία επεξε�γασίας εξα�τήσεων χτισίματος"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -822,100 +1089,20 @@ 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 "Αδυναμία εντοπισμο� του πακέτου %s"
-
-#: 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 ""
-"Η cache δεν είναι ενημε�ωμένη, αδυναμία πα�απομπής σε ένα α�χείο πακέτου"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Καθηλωμένα Πακέτα:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(δε β�έθηκαν)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Εγκατεστημένα: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Υποψήφιο: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(κανένα)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr " Καθήλωση Πακέτου: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Πίνακας Έκδοσης:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Χ�ήση: apt-cache [επιλογές] εντολή\n"
-"       apt-cache [επιλογές] show pkg1 [pkg2 ...]\n"
-"\n"
-"το apt-cache είναι ένα χαμηλο� επιπέδου ε�γαλείο που χ�ησιμοποιείται για\n"
-"το χει�ισμό των δυαδικών α�χείων cache του APT, και να εξάγει πλη�οφο�ίες\n"
-"από αυτά\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Επιλογές:\n"
-"  -h   Αυτό το κείμενο βοήθειας.\n"
-"  -p=? Η cache πακέτων.\n"
-"  -s=? Η cache πηγών.\n"
-"  -q   Απενε�γοποίηση του δείκτη π�οόδου.\n"
-"  -i   Εμφάνιση μόνο των σημαντικών εξα�τήσεων για την εντολή unmet.\n"
-"  -c=? Ανάγνωση αυτο� του α�χείου �υθμίσεων\n"
-"  -o=? Χ�ήση μιας αυθαί�ετη επιλογής �υθμίσεων, πχ -o dir::cache=/tmp\n"
-"Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πλη�οφο�ίες.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Εμφάνιση εγγ�αφών για πηγαίο πακέτο"
 
@@ -947,7 +1134,11 @@ msgstr "Εμφάνιση π�οτε�αιοτήτων πηγών"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -994,7 +1185,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1032,24 +1222,9 @@ msgstr "Επαναλάβετε την διαδικασία για τα υπόλÎ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1060,19 +1235,8 @@ msgstr "Τα ο�ίσματα δεν είναι σε ζε�γη"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Χ�ήση: apt-config [επιλογές] εντολή\n"
-"\n"
-"το apt-config είναι ένα απλό ε�γαλείο για την ανάγνωση του α�χείου �υθμίσεων "
-"APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
 
 #: cmdline/apt-config.cc
@@ -1084,31 +1248,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Αδ�νατη η ε��εση του πακέτου %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Αδ�νατη η ε��εση του πακέτου %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Αδ�νατη η ε��εση του πακέτου %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδ�νατη η ε��εση του πακέτου %s"
@@ -1131,184 +1270,20 @@ msgstr ""
 "υλικό"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Αδ�νατο το κλείδωμα του καταλόγου μεταφό�τωσης"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Θα π�έπει να καθο�ίσετε τουλάχιστον ένα πακέτο για να μεταφο�τώσετε τον "
-"κωδικάτου"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Αδυναμία εντοπισμο� του κώδικά του πακέτου %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Πα�άκαμψη του ήδη μεταφο�τωμένου α�χείου `%s`\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Χ�ειάζεται να μεταφο�τωθο�ν %sB/%sB πηγαίου κώδικα.\n"
-
-#. 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"
-msgstr "Χ�ειάζεται να μεταφο�τωθο�ν %sB πηγαίου κώδικα.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Μεταφό�τωση Κωδικα %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Αποτυχία μεταφό�τωσης με�ικών α�χειοθηκών."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Πα�άκαμψη της αποσυμπίεσης ήδη μεταφο�τωμένου κώδικα στο %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Θα π�έπει να καθο�ίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξα�τήσεων του"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Αποτυχία επεξε�γασίας εξα�τήσεων χτισίματος"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Αδ�νατη η ε��εση πλη�οφο�ιών χτισίματος για το %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "το %s δεν έχει εξα�τήσεις χτισίματος.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το %s δεν επιτ�έπεται στο "
-"πακέτο %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το πακέτο %s δεν β�έθηκε"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Αποτυχία ικανοποίησης %s εξα�τήσεων για το %s: Το εγκατεστημένο πακέτο %s "
-"είναι νεώτε�ο"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή δεν υπά�χουν διαθέσιμες "
-"εκδόσεις του πακέτου %s που να ικανοποιο�ν τις απαιτήσεις της έκδοσης"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%s εξα�τήσεις για το %s δεν ικανοποιο�νται επειδή το πακέτο %s δεν έχει "
-"υποψήφιαέκδοση"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Αποτυχία ικανοποίησης %s εξά�τησης για το %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Οι εξα�τήσεις χτισίματος για το %s δεν ικανοποιο�νται."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Αποτυχία επεξε�γασίας εξα�τήσεων χτισίματος"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Υποστη�ιζόμενοι Οδηγοί:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Χ�ήση: apt-get [πα�άμετ�οι] εντολή\n"
 "       apt-get [πα�άμετ�οι] install|remove pkg1 [pkg2 ...]\n"
@@ -1319,44 +1294,6 @@ msgstr ""
 "και η install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Πα�άμετ�οι:\n"
-"  -h  Αυτό το βοηθητικό κείμενο.\n"
-"  -q  Χω�ίς αναλυτική ένδειξη π�οόδου (κατάλληλο για αποθήκευση της εξόδου)\n"
-"  -qq Χω�ίς λεπτομέ�ειες εκτός από τα λάθη\n"
-"  -d  Μεταφό�τωση μόνο - ΜΗ� αποσυμπιέσεις ή εγκαταστήσεις α�χεία\n"
-"  -s  Χω�ίς ενέ�γεια. Διενέ�γεια π�οσομοίωσης βημάτων εγκατάστασης\n"
-"  -y  Υπόθεσε �αι για όλες τις ε�ωτήσεις και μην πε�ιμένεις απάντηση\n"
-"  -f  Π�οσπάθησε να συνεχίσεις αν αποτ�χει ο έλεγχος ακε�αιότητας\n"
-"  -m  Π�οσπάθησε να συνεχίσεις αν υπά�χουν άγνωστα πακέτα\n"
-"  -u  Εμφάνισε επίσης ένα κατάλογο από αναβαθμιζόμενα πακέτα\n"
-"  -b  Χτίσε το πηγαίο πακέτο μετά την μεταφό�τωση του\n"
-"  -V  Εμφάνισε λεπτομε�είς α�ιθμο�ς εκδόσεων\n"
-"  -c=? Διάβασε αυτό το α�χείο �υθμίσεων\n"
-"  -o=? Θέσε μια αυθαί�ετη πα�άμετ�ο, πχ -o dir::cache=/tmp\n"
-"Δείτε τις σελίδες εγχει�ιδίου apt-get(8), sources.list(5) και apt.conf(5)\n"
-"για πε�ισσότε�ες πλη�οφο�ίες και επιλογές.\n"
-"                       This APT has Super Cow Powers.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Ανάκτηση νέων καταλόγων πακέτων"
 
@@ -1437,11 +1374,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1515,20 +1449,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2029,17 +1952,13 @@ msgid "Merging available information"
 msgstr "Σ�μπτυξη Διαθέσιμων Πλη�οφο�ιών"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Χ�ήση: apt-extracttemplates α�χείο1 [α�χείο2 ...]\n"
 "\n"
@@ -2072,13 +1991,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Χ�ήση: apt-extracttemplates α�χείο1 [α�χείο2 ...]\n"
 "\n"
@@ -2099,26 +2012,10 @@ msgstr "Άγνωστη εγγ�αφή πακέτου!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Χ�ήση: apt-sortpkgs [πα�άμετ�οι] file1 [file2 ...]\n"
-"\n"
-"το apt-sortpkgs είναι ένα απλό ε�γαλείο για να ταξινομήσετε α�χεία πηγαίου "
-"κώδικα. Η επιλογή\n"
-"-s δείχνει τον τ�πο του α�χείου.\n"
-"\n"
-"Πα�άμετ�οι:\n"
-"  -h   Αυτό το κείμενο βοήθειας\n"
-"  -s   Χ�ήση του τ�που α�χείου\n"
-"  -c=? Ανάγνωση αυτο� του α�χείου �υθμίσεων\n"
-"  -o=? Θέσε μια αυθαί�ετη πα�άμετ�ο,πχ -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3844,6 +3741,116 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Υπολογισμός της αναβάθμισης"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Χ�ήση: apt-cache [επιλογές] εντολή\n"
+#~ "       apt-cache [επιλογές] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "το apt-cache είναι ένα χαμηλο� επιπέδου ε�γαλείο που χ�ησιμοποιείται για\n"
+#~ "το χει�ισμό των δυαδικών α�χείων cache του APT, και να εξάγει "
+#~ "πλη�οφο�ίες\n"
+#~ "από αυτά\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Επιλογές:\n"
+#~ "  -h   Αυτό το κείμενο βοήθειας.\n"
+#~ "  -p=? Η cache πακέτων.\n"
+#~ "  -s=? Η cache πηγών.\n"
+#~ "  -q   Απενε�γοποίηση του δείκτη π�οόδου.\n"
+#~ "  -i   Εμφάνιση μόνο των σημαντικών εξα�τήσεων για την εντολή unmet.\n"
+#~ "  -c=? Ανάγνωση αυτο� του α�χείου �υθμίσεων\n"
+#~ "  -o=? Χ�ήση μιας αυθαί�ετη επιλογής �υθμίσεων, πχ -o dir::cache=/tmp\n"
+#~ "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πλη�οφο�ίες.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Χ�ήση: apt-config [επιλογές] εντολή\n"
+#~ "\n"
+#~ "το apt-config είναι ένα απλό ε�γαλείο για την ανάγνωση του α�χείου "
+#~ "�υθμίσεων APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Πα�άμετ�οι:\n"
+#~ "  -h  Αυτό το βοηθητικό κείμενο.\n"
+#~ "  -q  Χω�ίς αναλυτική ένδειξη π�οόδου (κατάλληλο για αποθήκευση της "
+#~ "εξόδου)\n"
+#~ "  -qq Χω�ίς λεπτομέ�ειες εκτός από τα λάθη\n"
+#~ "  -d  Μεταφό�τωση μόνο - ΜΗ� αποσυμπιέσεις ή εγκαταστήσεις α�χεία\n"
+#~ "  -s  Χω�ίς ενέ�γεια. Διενέ�γεια π�οσομοίωσης βημάτων εγκατάστασης\n"
+#~ "  -y  Υπόθεσε �αι για όλες τις ε�ωτήσεις και μην πε�ιμένεις απάντηση\n"
+#~ "  -f  Π�οσπάθησε να συνεχίσεις αν αποτ�χει ο έλεγχος ακε�αιότητας\n"
+#~ "  -m  Π�οσπάθησε να συνεχίσεις αν υπά�χουν άγνωστα πακέτα\n"
+#~ "  -u  Εμφάνισε επίσης ένα κατάλογο από αναβαθμιζόμενα πακέτα\n"
+#~ "  -b  Χτίσε το πηγαίο πακέτο μετά την μεταφό�τωση του\n"
+#~ "  -V  Εμφάνισε λεπτομε�είς α�ιθμο�ς εκδόσεων\n"
+#~ "  -c=? Διάβασε αυτό το α�χείο �υθμίσεων\n"
+#~ "  -o=? Θέσε μια αυθαί�ετη πα�άμετ�ο, πχ -o dir::cache=/tmp\n"
+#~ "Δείτε τις σελίδες εγχει�ιδίου apt-get(8), sources.list(5) και apt."
+#~ "conf(5)\n"
+#~ "για πε�ισσότε�ες πλη�οφο�ίες και επιλογές.\n"
+#~ "                       This APT has Super Cow Powers.\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"
+#~ msgstr ""
+#~ "Χ�ήση: apt-sortpkgs [πα�άμετ�οι] file1 [file2 ...]\n"
+#~ "\n"
+#~ "το apt-sortpkgs είναι ένα απλό ε�γαλείο για να ταξινομήσετε α�χεία "
+#~ "πηγαίου κώδικα. Η επιλογή\n"
+#~ "-s δείχνει τον τ�πο του α�χείου.\n"
+#~ "\n"
+#~ "Πα�άμετ�οι:\n"
+#~ "  -h   Αυτό το κείμενο βοήθειας\n"
+#~ "  -s   Χ�ήση του τ�που α�χείου\n"
+#~ "  -c=? Ανάγνωση αυτο� του α�χείου �υθμίσεων\n"
+#~ "  -o=? Θέσε μια αυθαί�ετη πα�άμετ�ο,πχ -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Η απογονική διε�γασία απέτυχε"
 
diff --git a/po/es.po b/po/es.po
index 40a6e5a38..b50012e79 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-11-20 02:25+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -228,6 +228,36 @@ msgstr "El paquete «%s» no está instalado, no se eliminará\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, seleccionando «%s» en lugar de «%s»\n"
 
+#: 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 "Este APT tiene poderes de Super Vaca."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Este Ayudante de APT tiene poderes de Super Llanto."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "No se encontró ningún paquete"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
@@ -272,6 +302,10 @@ msgstr "No se pudo determinar el espacio libre en %s"
 msgid "You don't have enough free space in %s."
 msgstr "No tiene suficiente espacio libre en %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "No se puede bloquear el directorio de descarga"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
@@ -370,7 +404,7 @@ msgstr "¿Desea continuar?"
 msgid "Some files failed to download"
 msgstr "No se pudieron descargar algunos archivos"
 
-#: 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 "Descarga completa y en modo de solo descarga"
 
@@ -761,9 +795,252 @@ msgstr[1] "Hay %i registros adicionales. Utilice la opción «-a» para verlos."
 msgid "not a real package (virtual)"
 msgstr "no es un paquete real (virtual)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "No se encontró ningún paquete"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "No se ha podido localizar el paquete %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Archivos de paquetes:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Paquetes con pin:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(no encontrado)"
+
+#. 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 "  Instalados: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidato: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pin del paquete: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabla de versión:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "No se pudo encontrar ningún paquete para la arquitectura «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "No se pudo encontrar el paquete «%s» en la versión «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "No se pudo encontrar el paquete «%s» en la versión de publicación «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "No se pudo encontrar la versión «%s» del paquete «%s»"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Debe especificar al menos un paquete para obtener su código fuente"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "No se pudo encontrar el paquete de fuentes para %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"NOTA: el empaquetamiento de «%s» se mantiene en el sistema de control de "
+"versiones «%s» en:\n"
+"%s\n"
+
+#: 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 ""
+"Utilice:\n"
+"%s\n"
+"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
+"del paquete.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omitiendo el fichero ya descargado «%s»\n"
+
+#. 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 "Se necesita descargar %sB/%sB de archivos fuente.\n"
+
+#. 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 "Se necesita descargar %sB de archivos fuente.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Fuente obtenida %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "No se pudieron obtener algunos archivos."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+"Omitiendo desempaquetamiento de paquetes fuente ya desempaquetados en %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Falló la orden de desempaquetamiento «%s».\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Falló la orden de construcción «%s».\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Debe especificar al menos un paquete para verificar sus dependencias de "
+"construcción"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"No hay información disponible de arquitectura para %s. Vea apt.conf(5) APT::"
+"Arquitecturas para la configuración"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "No se pudieron procesar las dependencias de construcción"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "No se pudo obtener información de dependencias de construcción para %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s no tiene dependencias de construcción.\n"
+
+#: 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 ""
+"La dependencia %s para %s no puede satisfacerse porque no se permite %s en "
+"los paquetes «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque no se puede encontrar "
+"el paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
+"demasiado nuevo"
+
+#: 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"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque la versión presentada "
+"del paquete %s no puede satisfacer los requisitos de versión"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
+"tiene ninguna versión presentada"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "No se pudieron procesar las dependencias de construcción"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -873,98 +1150,18 @@ msgstr "Espacio registrado total: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Esta orden está desfasada. Utilice «apt-mark showauto» en su lugar."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "No se ha podido localizar el paquete %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Archivos de paquetes:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Paquetes con pin:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(no encontrado)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalados: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidato: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ninguno)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pin del paquete: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabla de versión:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Modo de uso: apt-cache [opciones] orden\n"
-"             apt-cache [opciones] show paq1 [paq2 ...]\n"
-"\n"
-"apt-cache es una herramienta de bajo nivel que se utiliza para consultar\n"
-"información sobre los archivos binarios de caché de APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Órdenes:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -p=? La caché de paquetes.\n"
-"  -s=? La caché de fuentes.\n"
-"  -q   Desactiva el indicador de progreso.\n"
-"  -i   Muestra solo dependencias importantes para la orden incumplida.\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p.ej. -o dir::"
-"cache=/tmp\n"
-"Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -998,11 +1195,12 @@ msgstr "Muestra parámetros de las normas"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Uso: apt [opciones] orden\n"
-"\n"
-"Interfaz de línea de órdenes (CLI) para apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1043,7 +1241,6 @@ msgstr "actualiza el sistema instalando/actualizando paquetes"
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "actualiza el sistema eliminando/instalando/actualizando paquetes"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1086,48 +1283,11 @@ msgstr "Repita este proceso para el resto de los CDs del conjunto."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Uso: apt-cdrom [opciones] orden\n"
-"\n"
-"apt-cdrom es una herramienta para agregar CDROM para las fuentes de\n"
-"APT. El punto de montaje del CDROM y la información del dispositivo\n"
-"se extrae de apt.conf y /etc/fstab.\n"
-"\n"
-"Comandos:\n"
-"   add - Agrega un CDROM\n"
-"   ident - Reporta la identificación del CDROM\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda\n"
-"  -d   Punto de montaje del CD-ROM\n"
-"  -r   Renombra un CD-ROM reconocido\n"
-"  -m   No monta\n"
-"  -f   Modo rápido, no comprueba archivos de paquetes\n"
-"  -a   A través de modo de búsqueda\n"
-"  -c=? Lee esto archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, ej -o dir::\n"
-"cache=/tmp\n"
-"Ver fstab(5)\n"
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumentos no emparejados"
@@ -1136,25 +1296,9 @@ msgstr "Argumentos no emparejados"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Uso: apt-config [opciones] orden\n"
-"\n"
-"apt-config es una herramienta sencilla para leer el archivo de configuración "
-"de APT.\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -c=? Lee este fichero de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
-"       cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1166,31 +1310,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "No se pudo encontrar ningún paquete para la arquitectura «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "No se pudo encontrar el paquete «%s» en la versión «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "No se pudo encontrar el paquete «%s» en la versión de publicación «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "No se pudo encontrar la versión «%s» del paquete «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
@@ -1213,194 +1332,20 @@ msgstr ""
 "Error interno, el sistema de solución de problemas rompió algunas cosas"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "No se puede bloquear el directorio de descarga"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Debe especificar al menos un paquete para obtener su código fuente"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "No se pudo encontrar el paquete de fuentes para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"NOTA: el empaquetamiento de «%s» se mantiene en el sistema de control de "
-"versiones «%s» en:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Utilice:\n"
-"%s\n"
-"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
-"del paquete.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Omitiendo el fichero ya descargado «%s»\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Se necesita descargar %sB/%sB de archivos fuente.\n"
-
-#. 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"
-msgstr "Se necesita descargar %sB de archivos fuente.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Fuente obtenida %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "No se pudieron obtener algunos archivos."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"Omitiendo desempaquetamiento de paquetes fuente ya desempaquetados en %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Falló la orden de desempaquetamiento «%s».\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Falló la orden de construcción «%s».\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Debe especificar al menos un paquete para verificar sus dependencias de "
-"construcción"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"No hay información disponible de arquitectura para %s. Vea apt.conf(5) APT::"
-"Arquitecturas para la configuración"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "No se pudieron procesar las dependencias de construcción"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "No se pudo obtener información de dependencias de construcción para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s no tiene dependencias de construcción.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"La dependencia %s para %s no puede satisfacerse porque no se permite %s en "
-"los paquetes «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"La dependencia %s para %s no puede satisfacerse porque no se puede encontrar "
-"el paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
-"demasiado nuevo"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"La dependencia %s para %s no puede satisfacerse porque la versión presentada "
-"del paquete %s no puede satisfacer los requisitos de versión"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
-"tiene ninguna versión presentada"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "No se pudieron procesar las dependencias de construcción"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Uso: apt-get [opciones] orden\n"
 "     apt-get [opciones] install|remove paq1 [paq2 ...]\n"
@@ -1410,47 +1355,6 @@ msgstr ""
 "instalar paquetes. Las órdenes más utilizadas son update e install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opciones:\n"
-"  -h  Este texto de ayuda.\n"
-"  -q  Salida registrable - sin indicador de progreso\n"
-"  -qq Sin salida, excepto si hay errores\n"
-"  -d  Sólo descarga - NO instala o desempaqueta los archivos\n"
-"  -s  No actúa. Realiza una simulación\n"
-"  -y  Asume Sí para todas las consultas y no pregunta\n"
-"  -f  Intenta corregir el sistema si tiene dependencias incumplidas en ese "
-"momento\n"
-"  -m  Intenta continuar si los archivos no son localizables\n"
-"  -u  Muestra también una lista de paquetes actualizados\n"
-"  -b  Construye el paquete fuente después de obtenerlo\n"
-"  -V  Muesta números de versión detallados\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. \n"
-"       -o dir::cache=/tmp\n"
-"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt."
-"conf(5)\n"
-"para más información y opciones.\n"
-"                       Este APT tiene poderes de Super Vaca.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Descarga nuevas listas de paquetes"
 
@@ -1524,11 +1428,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Uso: apt-helper [opciones] orden\n"
 "     apt-helper [opciones] fichero-descarga uri ruta-destino\n"
@@ -1536,10 +1442,6 @@ msgstr ""
 "apt-helper es un ayudante interno de apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Este Ayudante de APT tiene poderes de Super Llanto."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "descarga la uri proporcionada a la ruta de destino"
 
@@ -1606,11 +1508,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
 "\n"
@@ -1619,29 +1524,6 @@ msgstr ""
 "marcas.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Opciones:\n"
-"  -h  Este texto de ayuda.\n"
-"  -q  Salida registrable - sin indicador de progreso\n"
-"  -qq Sin salida, expceto si hay errores\n"
-"  -s  No actúa. Realiza una simulación.\n"
-"  -f  Lee y escribe la marca auto/manual en el fichero proporcionado\n"
-"  -c=? Lee este fichero de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej.\n"
-"       -o dir::cache=/tmp\n"
-"Ver las páginas de manual de apt-mark(8) y apt.conf(5) para más información."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Marca los paquetes proporcionados como instalados automáticamente"
 
@@ -2135,17 +2017,13 @@ msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
 "\n"
@@ -2174,17 +2052,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
 "\n"
@@ -2206,26 +2079,10 @@ msgstr "¡Registro de paquete desconocido!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Uso: apt-sortpkgs [opciones] archivo1 [archivo2 ...]\n"
-"\n"
-"apt-sortpkgs es una herramienta sencilla para ordenar archivos de paquetes.\n"
-"La opción -s se utiliza para indicar qué tipo de archivo es.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -s   Utiliza ordenamiento de archivos fuente\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
-"cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3999,6 +3856,161 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculando la actualización"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Modo de uso: apt-cache [opciones] orden\n"
+#~ "             apt-cache [opciones] show paq1 [paq2 ...]\n"
+#~ "\n"
+#~ "apt-cache es una herramienta de bajo nivel que se utiliza para consultar\n"
+#~ "información sobre los archivos binarios de caché de APT\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Órdenes:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opciones:\n"
+#~ "  -h   Este texto de ayuda.\n"
+#~ "  -p=? La caché de paquetes.\n"
+#~ "  -s=? La caché de fuentes.\n"
+#~ "  -q   Desactiva el indicador de progreso.\n"
+#~ "  -i   Muestra solo dependencias importantes para la orden incumplida.\n"
+#~ "  -c=? Lee este archivo de configuración\n"
+#~ "  -o=? Establece una opción de configuración arbitraria, p.ej. -o dir::"
+#~ "cache=/tmp\n"
+#~ "Vea las páginas del manual apt-cache(8) y apt.conf(5) para más "
+#~ "información.\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Uso: apt [opciones] orden\n"
+#~ "\n"
+#~ "Interfaz de línea de órdenes (CLI) para apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Uso: apt-cdrom [opciones] orden\n"
+#~ "\n"
+#~ "apt-cdrom es una herramienta para agregar CDROM para las fuentes de\n"
+#~ "APT. El punto de montaje del CDROM y la información del dispositivo\n"
+#~ "se extrae de apt.conf y /etc/fstab.\n"
+#~ "\n"
+#~ "Comandos:\n"
+#~ "   add - Agrega un CDROM\n"
+#~ "   ident - Reporta la identificación del CDROM\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -h   Este texto de ayuda\n"
+#~ "  -d   Punto de montaje del CD-ROM\n"
+#~ "  -r   Renombra un CD-ROM reconocido\n"
+#~ "  -m   No monta\n"
+#~ "  -f   Modo rápido, no comprueba archivos de paquetes\n"
+#~ "  -a   A través de modo de búsqueda\n"
+#~ "  -c=? Lee esto archivo de configuración\n"
+#~ "  -o=? Establece una opción de configuración arbitraria, ej -o dir::\n"
+#~ "cache=/tmp\n"
+#~ "Ver fstab(5)\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Uso: apt-config [opciones] orden\n"
+#~ "\n"
+#~ "apt-config es una herramienta sencilla para leer el archivo de "
+#~ "configuración de APT.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opciones:\n"
+#~ "  -h   Este texto de ayuda.\n"
+#~ "  -c=? Lee este fichero de configuración\n"
+#~ "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
+#~ "       cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Opciones:\n"
+#~ "  -h  Este texto de ayuda.\n"
+#~ "  -q  Salida registrable - sin indicador de progreso\n"
+#~ "  -qq Sin salida, expceto si hay errores\n"
+#~ "  -s  No actúa. Realiza una simulación.\n"
+#~ "  -f  Lee y escribe la marca auto/manual en el fichero proporcionado\n"
+#~ "  -c=? Lee este fichero de configuración\n"
+#~ "  -o=? Establece una opción de configuración arbitraria, p. ej.\n"
+#~ "       -o dir::cache=/tmp\n"
+#~ "Ver las páginas de manual de apt-mark(8) y apt.conf(5) para más "
+#~ "informació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"
+#~ msgstr ""
+#~ "Uso: apt-sortpkgs [opciones] archivo1 [archivo2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs es una herramienta sencilla para ordenar archivos de "
+#~ "paquetes.\n"
+#~ "La opción -s se utiliza para indicar qué tipo de archivo es.\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -h   Este texto de ayuda.\n"
+#~ "  -s   Utiliza ordenamiento de archivos fuente\n"
+#~ "  -c=? Lee este archivo de configuración\n"
+#~ "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
+#~ "cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Falló el proceso hijo"
 
diff --git a/po/eu.po b/po/eu.po
index 2b9c5e000..af506991e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -172,6 +172,36 @@ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
+#: 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 honek Super Behiaren Ahalmenak ditu."
+
+#: 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 "Ez da paketerik aurkitu"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
@@ -216,6 +246,10 @@ msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 msgid "You don't have enough free space in %s."
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Ezin da deskarga direktorioa blokeatu"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
@@ -313,7 +347,7 @@ msgstr "Aurrera jarraitu nahi al duzu?"
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: 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 "Deskarga amaituta eta deskarga soileko moduan"
 
@@ -701,9 +735,240 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Ez da paketerik aurkitu"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ezin da %s paketea lokalizatu"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pakete Fitxategiak:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
+"pakete fitxategi bati"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pin duten Paketeak:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(ez da aurkitu)"
+
+#. 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 "  Instalatuta: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Hautagaia: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(bat ere ez)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Paketearen pin-a:"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Bertsio taula:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Ezin izan da %s paketea aurkitu"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
+
+#: 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 "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
+
+#: 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 "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
+
+#. 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 "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
+
+#. 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 "Iturburu artxiboetako %sB eskuratu behar dira.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Eskuratu %s iturburua\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Huts egin du zenbat artxibo lortzean."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s: ez du eraikitze mendekotasunik.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
+"paketea berriegia da"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
+"betetzen dituen %3$s paketearen bertsio erabilgarririk"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -810,98 +1075,18 @@ msgstr "Guztira erregistratutako lekua: "
 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 "Ezin da %s paketea lokalizatu"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pakete Fitxategiak:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
-"pakete fitxategi bati"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pin duten Paketeak:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ez da aurkitu)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalatuta: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Hautagaia: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(bat ere ez)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Paketearen pin-a:"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Bertsio taula:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Erabilera: apt-cache [aukerak] komandoa\n"
-"           apt-cache [aukerak] show pak1 [pak2 ...]\n"
-"\n"
-"APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n"
-"den behe-mailako tresna bat da, apt-cache.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Aukerak:\n"
-"  -h   Laguntza testu hau.\n"
-"  -p=? Paketearen katxea.\n"
-"  -s=? Iturburuaren katxea.\n"
-"  -q   Desgaitu progresio adierazlea.\n"
-"  -i   Mendekotasun nagusiak soilik erakutsi.\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-"Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -935,7 +1120,11 @@ msgstr "Gidalerroen ezarpenak erakusten ditu"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -981,7 +1170,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1020,24 +1208,9 @@ msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1048,23 +1221,9 @@ msgstr "Parekatu gabeko argumentuak"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Erabilera: apt-config [aukerak] komandoa\n"
-"\n"
-"apt-config APT konfigurazio fitxategia irakurtzeko tresna soil bat da\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Aukerak:\n"
-"  -h   Laguntza testu hau.\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1075,31 +1234,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Ezin izan da %s paketea aurkitu"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Ezin izan da %s paketea aurkitu"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Ezin izan da %s paketea aurkitu"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
@@ -1120,181 +1254,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Ezin da deskarga direktorioa blokeatu"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
-
-#. 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"
-msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Eskuratu %s iturburua\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Huts egin du zenbat artxibo lortzean."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s: ez du eraikitze mendekotasunik.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
-"paketea berriegia da"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
-"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Erabilera: apt-get [aukerak] komandoa\n"
 "           apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n"
@@ -1305,44 +1278,6 @@ msgstr ""
 "dira: update eta install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Aukerak:\n"
-"  -h  Laguntza testu hau.\n"
-"  -q  Egunkarian erregistratzeko irteera - progresio adierazlerik gabe\n"
-"  -qq Irteerarik ez, erroreentzat izan ezik\n"
-"  -d  Deskargatu bakarrik - EZ instalatu edo deskonprimitu artxiboak\n"
-"  -s  Ekintzarik ez. Simulazio bat egiten du\n"
-"  -y  Galdera guztiei Bai erantzun, galdetu gabe\n"
-"  -f  Saiatu jarraitzen, osotasun egiaztapenak huts egiten badu\n"
-"  -m  Saiatu jarraitzen, artxiboak ezin badira lokalizatu\n"
-"  -u  Erakutsi bertsio-berritutako paketeen zerrenda ere\n"
-"  -b  Sortu iturburu paketea lortu ondoren\n"
-"  -V  Erakutsi bertsio-zenbaki xeheak\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n"
-"Informazio eta aukera gehiago nahi izanez gero, ikus apt-get(8), \n"
-"sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
-"                       APT honek Super Behiaren Ahalmenak ditu.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Eskuratu pakete zerrenda berriak"
 
@@ -1421,11 +1356,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1499,20 +1431,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2012,17 +1933,13 @@ msgid "Merging available information"
 msgstr "Eskuragarrien datuak biltzen"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
 "\n"
@@ -2055,13 +1972,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
 "\n"
@@ -2082,25 +1993,10 @@ msgstr "Pakete erregistro ezezaguna!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
-"\n"
-"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
-"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -s   Erabili iturburu fitxategien ordenatzea\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3811,6 +3707,88 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Berriketak kalkulatzen"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Erabilera: apt-cache [aukerak] komandoa\n"
+#~ "           apt-cache [aukerak] show pak1 [pak2 ...]\n"
+#~ "\n"
+#~ "APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko "
+#~ "erabiltzen\n"
+#~ "den behe-mailako tresna bat da, apt-cache.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Aukerak:\n"
+#~ "  -h   Laguntza testu hau.\n"
+#~ "  -p=? Paketearen katxea.\n"
+#~ "  -s=? Iturburuaren katxea.\n"
+#~ "  -q   Desgaitu progresio adierazlea.\n"
+#~ "  -i   Mendekotasun nagusiak soilik erakutsi.\n"
+#~ "  -c=? Irakurri konfigurazio fitxategi hau\n"
+#~ "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/"
+#~ "tmp\n"
+#~ "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Erabilera: apt-config [aukerak] komandoa\n"
+#~ "\n"
+#~ "apt-config APT konfigurazio fitxategia irakurtzeko tresna soil bat da\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Aukerak:\n"
+#~ "  -h   Laguntza testu hau.\n"
+#~ "  -c=? Irakurri konfigurazio fitxategi hau\n"
+#~ "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/"
+#~ "tmp\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"
+#~ msgstr ""
+#~ "Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
+#~ "\n"
+#~ "apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
+#~ "motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -h   Laguntza testu hau\n"
+#~ "  -s   Erabili iturburu fitxategien ordenatzea\n"
+#~ "  -c=? Irakurri konfigurazio fitxategi hau\n"
+#~ "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Prozesu umeak huts egin du"
 
diff --git a/po/fi.po b/po/fi.po
index 0991ecdfa..19f06041b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -172,6 +172,36 @@ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Huomautus, valitaan %s eikä %s\n"
 
+#: 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 "Yhtään pakettia ei löytynyt"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
@@ -216,6 +246,10 @@ msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 msgid "You don't have enough free space in %s."
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Noutokansiota ei saatu lukittua"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
@@ -313,7 +347,7 @@ msgstr "Haluatko jatkaa?"
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: 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 "Nouto on valmis ja määrätty vain nouto"
 
@@ -701,9 +735,237 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Yhtään pakettia ei löytynyt"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Pakettia %s ei löydy"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pakettitiedostot:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Paketit joissa tunniste:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(ei löydy)"
+
+#. 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 "  Asennettu: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Ehdokas: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ei mitään)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Paketin tunnistenumero: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versiotaulukko:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Pakettia %s ei löytynyt"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Pakettia %s ei löytynyt"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Pakettia %s ei löytynyt"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
+
+#: 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 "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
+
+#: 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 "Ohitetaan jo noudettu tiedosto \"%s\"\n"
+
+#. 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 "On noudettava %st/%st lähdekoodiarkistoja.\n"
+
+#. 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 "On noudettava %st lähdekoodiarkistoja.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Nouda lähdekoodi %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Purkukomento \"%s\" ei onnistunut.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
+"uusi"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
+"ei vastaa versioriippuvuuksia"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -810,98 +1072,20 @@ msgstr "Käytetty tila yhteensä: "
 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 "Pakettia %s ei löydy"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pakettitiedostot:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Paketit joissa tunniste:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ei löydy)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Asennettu: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Ehdokas: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ei mitään)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Paketin tunnistenumero: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versiotaulukko:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Käyttö : apt-cache [valitsimet] komento\n"
-"         apt-cache [valitsimet] show pkt1 [pkt2 ...]\n"
-"\n"
-"apt-cache on alemman tason työkalu APT:n konekielisten\n"
-"välimuistitiedostojen käsittelyyn ja tutkimiseen\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -p=? Pakettivarasto\n"
-"  -s=? Lähdevälimuisti\n"
-"  -q   Poista edistymisen ilmaisin\n"
-"  -i   Näytä vain tärkeät riippuvuudet unmet-komennossa\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-"Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Näytä lähdetietueet"
 
@@ -933,7 +1117,11 @@ msgstr "Näytä mistä asennuspaketteja haetaan"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -979,7 +1167,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1017,24 +1204,9 @@ msgstr "Toista tämä lopuille rompuille kasassasi."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1045,23 +1217,9 @@ msgstr "Parametrit eivät ole pareittain"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Käyttö: apt-config [valitsimet] komento\n"
-"\n"
-"apt-config on yksinkertainen työkalu APT:n asetustiedoston lukemiseen\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1072,31 +1230,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Pakettia %s ei löytynyt"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Pakettia %s ei löytynyt"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Pakettia %s ei löytynyt"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
@@ -1117,180 +1250,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Noutokansiota ei saatu lukittua"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-
-#. 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"
-msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Nouda lähdekoodi %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
-"uusi"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
-"ei vastaa versioriippuvuuksia"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Käyttö: apt-get [valitsimet] komento\n"
 "       apt-get [valitsimet] install|remove pkt1 [pkt2 ...]\n"
@@ -1301,44 +1274,6 @@ msgstr ""
 "install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Valitsimet:\n"
-"  -h  Tämä ohje\n"
-"  -q  Lokiin sopiva tulostus - edistymisen ilmaisin jätetään pois\n"
-"  -qq Ei lainkaan tulostusta paitsi virheistä\n"
-"  -d  Vain nouto - paketteja EI asenneta tai pureta\n"
-"  -s  Älä tee mitään. Oikean toiminnan simulaatio\n"
-"  -y  Vastataan Kyllä kaikkiin kysymyksiin eikä kehoitetta näytetä\n"
-"  -f  Yritä jatkaa jos eheystarkastus löysi virheen\n"
-"  -m  Yritä jatkaa jos arkistojen sijainti ei selviä\n"
-"  -u  Näytä luettelo myös päivitetyistä paketeista\n"
-"  -b  Käännä lähdekoodipaketti noudon jälkeen\n"
-"  -V  Näytä pitkät versionumerot\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-"Katso apt-get(8), sources.list(5) ja apt.conf(5) käsikirjasivuilta\n"
-"lisätietoja ja lisää valitsimia.\n"
-"                       This APT has Super Cow Powers.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Nouda uusi pakettiluettelo"
 
@@ -1417,11 +1352,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1495,20 +1427,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2005,17 +1926,13 @@ msgid "Merging available information"
 msgstr "Yhdistetään saatavuustiedot"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
 "\n"
@@ -2048,13 +1965,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
 "\n"
@@ -2075,25 +1986,10 @@ msgstr "Tuntematon pakettitietue!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n"
-"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -s   Käytä lähdetiedostolajittelua\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3803,6 +3699,121 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Käsitellään päivitystä"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Käyttö : apt-cache [valitsimet] komento\n"
+#~ "         apt-cache [valitsimet] show pkt1 [pkt2 ...]\n"
+#~ "\n"
+#~ "apt-cache on alemman tason työkalu APT:n konekielisten\n"
+#~ "välimuistitiedostojen käsittelyyn ja tutkimiseen\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Valitsimet:\n"
+#~ "  -h   Tämä ohje\n"
+#~ "  -p=? Pakettivarasto\n"
+#~ "  -s=? Lähdevälimuisti\n"
+#~ "  -q   Poista edistymisen ilmaisin\n"
+#~ "  -i   Näytä vain tärkeät riippuvuudet unmet-komennossa\n"
+#~ "  -c=? Lue tämä asetustiedosto\n"
+#~ "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+#~ "Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Käyttö: apt-config [valitsimet] komento\n"
+#~ "\n"
+#~ "apt-config on yksinkertainen työkalu APT:n asetustiedoston lukemiseen\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Valitsimet:\n"
+#~ "  -h   Tämä ohje\n"
+#~ "  -c=? Lue tämä asetustiedosto\n"
+#~ "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Valitsimet:\n"
+#~ "  -h  Tämä ohje\n"
+#~ "  -q  Lokiin sopiva tulostus - edistymisen ilmaisin jätetään pois\n"
+#~ "  -qq Ei lainkaan tulostusta paitsi virheistä\n"
+#~ "  -d  Vain nouto - paketteja EI asenneta tai pureta\n"
+#~ "  -s  Älä tee mitään. Oikean toiminnan simulaatio\n"
+#~ "  -y  Vastataan Kyllä kaikkiin kysymyksiin eikä kehoitetta näytetä\n"
+#~ "  -f  Yritä jatkaa jos eheystarkastus löysi virheen\n"
+#~ "  -m  Yritä jatkaa jos arkistojen sijainti ei selviä\n"
+#~ "  -u  Näytä luettelo myös päivitetyistä paketeista\n"
+#~ "  -b  Käännä lähdekoodipaketti noudon jälkeen\n"
+#~ "  -V  Näytä pitkät versionumerot\n"
+#~ "  -c=? Lue tämä asetustiedosto\n"
+#~ "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+#~ "Katso apt-get(8), sources.list(5) ja apt.conf(5) käsikirjasivuilta\n"
+#~ "lisätietoja ja lisää valitsimia.\n"
+#~ "                       This APT has Super Cow Powers.\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"
+#~ msgstr ""
+#~ "Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n"
+#~ "Valitsimella -s ilmaistaan minkälainen tiedosto on.\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -h   Tämä ohje\n"
+#~ "  -s   Käytä lähdetiedostolajittelua\n"
+#~ "  -c=? Lue tämä asetustiedosto\n"
+#~ "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Lapsiprosessi kaatui"
 
diff --git a/po/fr.po b/po/fr.po
index 79d103809..65be3f561 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2013-12-15 16:45+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -176,6 +176,36 @@ msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimÃ
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Note : sélection de « %s » au lieu de « %s »\n"
 
+#: 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 "Cet APT a les « Super Cow Powers »"
+
+#: 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 "Aucun paquet n'a été trouvé"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
@@ -220,6 +250,10 @@ msgstr "Impossible de déterminer l'espace disponible sur %s"
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Impossible de verrouiller le répertoire de téléchargement"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
@@ -324,7 +358,7 @@ msgstr "Souhaitez-vous continuer ?"
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: 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 "Téléchargement achevé et dans le mode téléchargement uniquement"
 
@@ -725,9 +759,254 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr "pas un véritable paquet (virtuel)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Aucun paquet n'a été trouvé"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossible de trouver le paquet %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Fichiers du paquet :"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Le cache est désynchronisé, impossible de référencer un fichier"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Paquets épinglés :"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(non trouvé)"
+
+#. 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 "  Installé : "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidat : "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(aucun)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Épinglage de paquet : "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr " Table de version :"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Impossible de trouver de paquet correspondant à l'architecture « %s »"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr ""
+"Impossible de trouver de paquet «%s » correspondant à la version « %s »"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr ""
+"Impossible de trouver de paquet « %s » correspondant à la publication « %s »"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Impossible de trouver la version « %s » du paquet « %s »"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Vous devez spécifier au moins un paquet source"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Impossible de trouver une source de paquet pour %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"Note : la maintenance du paquet de « %s » est réalisée dans le système de "
+"suivi de versions « %s » à l'adresse :\n"
+"%s\n"
+
+#: 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 ""
+"Veuillez utiliser la commande :\n"
+"%s\n"
+"pour récupérer les dernières mises à jour (éventuellement non encore "
+"publiées) du paquet.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
+
+#. 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 "Nécessité de prendre %so/%so dans les sources.\n"
+
+#. 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 "Nécessité de prendre %so dans les sources.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Récupération des sources %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Échec lors de la récupération de quelques archives."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "La commande de décompactage « %s » a échoué.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "La commande de construction « %s » a échoué.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
+"construction"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Aucune information sur l'architecture n'est disponible pour %s. Veuillez "
+"consulter la section à propos de APT::Architectures dans la page de manuel "
+"apt.conf(5)."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Impossible d'activer les dépendances de construction"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Impossible d'obtenir les dépendances de construction pour %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s n'a pas de dépendance de construction.\n"
+
+#: 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 ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
+"autorisé avec les paquets « %s »."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
+"peut être trouvé"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
+"est trop récent"
+
+#: 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"
+msgstr ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
+"disponible du paquet %s ne peut satisfaire les prérequis de version."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
+"n'a pas de version disponible."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Impossible d'activer les dépendances de construction"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -833,101 +1112,20 @@ msgstr "Total de l'espace attribué : "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossible de trouver le paquet %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Fichiers du paquet :"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Le cache est désynchronisé, impossible de référencer un fichier"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Paquets épinglés :"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(non trouvé)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installé : "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidat : "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(aucun)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Épinglage de paquet : "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr " Table de version :"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Usage : apt-cache [options] commande\n"
-"        apt-cache [options] show pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache est un outil de bas niveau pour obtenir des informations\n"
-"des fichiers de cache binaires d'APT.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Options :\n"
-"  -h    Ce texte d'aide\n"
-"  -p=?  Le cache des paquets\n"
-"  -s=?  Le cache des sources\n"
-"  -q    Enlève l'indicateur de progression\n"
-"  -i    Affiche seulement les dépendances importantes pour la commande "
-"« unmet »\n"
-"  -c=?  Lit ce fichier de configuration\n"
-"  -o=?  Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-"Veuillez consulter les pages de manuel de apt-cache(8) et apt.conf(5) pour "
-"plus\n"
-"d'informations.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Affiche les enregistrements des sources"
 
@@ -959,11 +1157,12 @@ msgstr "Affiche l'épinglage (Pin) en vigueur"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Utilisation : apt [options] commande\n"
-"\n"
-"Interface Ligne de Commande (CLI) pour apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1004,7 +1203,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1049,39 +1247,11 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Options:\n"
-"  -h  Affiche la présente aide.\n"
-"  -q  Affichage journalisable - pas de barre de progression\n"
-"  -qq Pas d'affichage à part les erreurs\n"
-"  -s  Mode simulation : aucune action effectuée.\n"
-"      Affiche simplement ce qui serait effectué.\n"
-"  -f  lecture/écriture des états dans le fichier indiqué\n"
-"  -c=? lecture du fichier de configuration indiqué\n"
-"  -o=? utilisation d'une option de configuration,\n"
-"       p. ex. -o dir::cache=/tmp\n"
-"Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
-"pour plus d'informations."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Les paramètres ne sont pas appariés"
@@ -1090,23 +1260,9 @@ msgstr "Les paramètres ne sont pas appariés"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Usage : apt-config [options] commande\n"
-"\n"
-"apt-config est un outil simple pour lire le fichier de configuration d'APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Options :\n"
-"   -h   Ce texte d'aide\n"
-"   -c=? Lit ce fichier de configuration\n"
-"   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1118,33 +1274,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Impossible de trouver de paquet correspondant à l'architecture « %s »"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr ""
-"Impossible de trouver de paquet «%s » correspondant à la version « %s »"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr ""
-"Impossible de trouver de paquet « %s » correspondant à la publication « %s »"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Impossible de trouver la version « %s » du paquet « %s »"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
@@ -1168,195 +1297,20 @@ msgstr ""
 "parties"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Impossible de verrouiller le répertoire de téléchargement"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Vous devez spécifier au moins un paquet source"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Impossible de trouver une source de paquet pour %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"Note : la maintenance du paquet de « %s » est réalisée dans le système de "
-"suivi de versions « %s » à l'adresse :\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Veuillez utiliser la commande :\n"
-"%s\n"
-"pour récupérer les dernières mises à jour (éventuellement non encore "
-"publiées) du paquet.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Nécessité de prendre %so/%so dans les sources.\n"
-
-#. 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"
-msgstr "Nécessité de prendre %so dans les sources.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Récupération des sources %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Échec lors de la récupération de quelques archives."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "La commande de décompactage « %s » a échoué.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "La commande de construction « %s » a échoué.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
-"construction"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Aucune information sur l'architecture n'est disponible pour %s. Veuillez "
-"consulter la section à propos de APT::Architectures dans la page de manuel "
-"apt.conf(5)."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Impossible d'activer les dépendances de construction"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Impossible d'obtenir les dépendances de construction pour %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s n'a pas de dépendance de construction.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
-"autorisé avec les paquets « %s »."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
-"peut être trouvé"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
-"est trop récent"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
-"disponible du paquet %s ne peut satisfaire les prérequis de version."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
-"n'a pas de version disponible."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Impossible d'activer les dépendances de construction"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Usage : apt-get [options] commandes\n"
 "        apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1367,45 +1321,6 @@ msgstr ""
 "fréquemment employées sont update et install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Options :\n"
-"  -h Ce texte d'aide\n"
-"  -q Message de sortie enregistrable - aucun indicateur de progression\n"
-"  -qq Aucun message de sortie, exceptés les messages d'erreur\n"
-"  -d Simple téléchargement - n'installe pas ou ne décompacte pas les "
-"archives\n"
-"  -s N'agit pas. Réalise uniquement une simulation de commande\n"
-"  -y Répond oui à toutes les questions et n'interroge pas l'utilisateur\n"
-"  -f Tente de poursuivre si le contrôle d'intégrité échoue\n"
-"  -m Tente de poursuivre si les archives ne sont pas localisables\n"
-"  -u Affiche une liste des paquets mis à jour\n"
-"  -b Compile le paquet source après l'avoir récupéré\n"
-"  -V Affiche les numéros des versions de façon détaillée\n"
-"  -c=? Lit ce fichier de configuration\n"
-"  -o=? Place une option de configuration arbitraire, ex. -o dir::cache=/tmp\n"
-"Reportez-vous aux pages de manuels d'apt-get(8), sources.list(5) et\n"
-"apt.conf(5) pour plus d'informations et d'options.\n"
-"                      Cet APT a les « Super Cow Powers »\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Récupère les nouvelles listes de paquets"
 
@@ -1486,11 +1401,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1562,11 +1474,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n"
 "\n"
@@ -1575,31 +1490,6 @@ msgstr ""
 "Cette commande permet également d'afficher cet état.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Options:\n"
-"  -h  Affiche la présente aide.\n"
-"  -q  Affichage journalisable - pas de barre de progression\n"
-"  -qq Pas d'affichage à part les erreurs\n"
-"  -s  Mode simulation : aucune action effectuée.\n"
-"      Affiche simplement ce qui serait effectué.\n"
-"  -f  lecture/écriture des états dans le fichier indiqué\n"
-"  -c=? lecture du fichier de configuration indiqué\n"
-"  -o=? utilisation d'une option de configuration,\n"
-"       p. ex. -o dir::cache=/tmp\n"
-"Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
-"pour plus d'informations."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "marquer les paquets indiqués comme installés automatiquement"
 
@@ -2098,17 +1988,13 @@ msgid "Merging available information"
 msgstr "Fusion des informations disponibles"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Usage : apt-extracttemplates fichier1 [fichier2 ...]\n"
 "\n"
@@ -2137,17 +2023,12 @@ msgstr ""
 "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Utilisation: apt-internal-solver\n"
 "\n"
@@ -2171,26 +2052,10 @@ msgstr "Enregistrement de paquet inconnu !"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
-"\n"
-"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
-"employée pour indiquer le type de fichier dont il s'agit.\n"
-"\n"
-"Options :\n"
-"  -h   Ce texte d'aide\n"
-"  -s   Trie le fichier source\n"
-"  -c=? Lit ce fichier de configuration\n"
-"  -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3983,6 +3848,149 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calcul de la mise à jour"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Usage : apt-cache [options] commande\n"
+#~ "        apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache est un outil de bas niveau pour obtenir des informations\n"
+#~ "des fichiers de cache binaires d'APT.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Options :\n"
+#~ "  -h    Ce texte d'aide\n"
+#~ "  -p=?  Le cache des paquets\n"
+#~ "  -s=?  Le cache des sources\n"
+#~ "  -q    Enlève l'indicateur de progression\n"
+#~ "  -i    Affiche seulement les dépendances importantes pour la commande "
+#~ "« unmet »\n"
+#~ "  -c=?  Lit ce fichier de configuration\n"
+#~ "  -o=?  Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
+#~ "Veuillez consulter les pages de manuel de apt-cache(8) et apt.conf(5) "
+#~ "pour plus\n"
+#~ "d'informations.\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Utilisation : apt [options] commande\n"
+#~ "\n"
+#~ "Interface Ligne de Commande (CLI) pour apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Options:\n"
+#~ "  -h  Affiche la présente aide.\n"
+#~ "  -q  Affichage journalisable - pas de barre de progression\n"
+#~ "  -qq Pas d'affichage à part les erreurs\n"
+#~ "  -s  Mode simulation : aucune action effectuée.\n"
+#~ "      Affiche simplement ce qui serait effectué.\n"
+#~ "  -f  lecture/écriture des états dans le fichier indiqué\n"
+#~ "  -c=? lecture du fichier de configuration indiqué\n"
+#~ "  -o=? utilisation d'une option de configuration,\n"
+#~ "       p. ex. -o dir::cache=/tmp\n"
+#~ "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
+#~ "pour plus d'informations."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Usage : apt-config [options] commande\n"
+#~ "\n"
+#~ "apt-config est un outil simple pour lire le fichier de configuration "
+#~ "d'APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Options :\n"
+#~ "   -h   Ce texte d'aide\n"
+#~ "   -c=? Lit ce fichier de configuration\n"
+#~ "   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Options:\n"
+#~ "  -h  Affiche la présente aide.\n"
+#~ "  -q  Affichage journalisable - pas de barre de progression\n"
+#~ "  -qq Pas d'affichage à part les erreurs\n"
+#~ "  -s  Mode simulation : aucune action effectuée.\n"
+#~ "      Affiche simplement ce qui serait effectué.\n"
+#~ "  -f  lecture/écriture des états dans le fichier indiqué\n"
+#~ "  -c=? lecture du fichier de configuration indiqué\n"
+#~ "  -o=? utilisation d'une option de configuration,\n"
+#~ "       p. ex. -o dir::cache=/tmp\n"
+#~ "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
+#~ "pour plus d'informations."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
+#~ "employée pour indiquer le type de fichier dont il s'agit.\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -h   Ce texte d'aide\n"
+#~ "  -s   Trie le fichier source\n"
+#~ "  -c=? Lit ce fichier de configuration\n"
+#~ "  -o=? Place une option de configuration arbitraire, p. ex. -o dir::"
+#~ "cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Échec du processus fils"
 
diff --git a/po/gl.po b/po/gl.po
index d88702558..d47db8474 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -175,6 +175,36 @@ msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, seleccione «%s» no canto de «%s»\n"
 
+#: 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 "Este APT ten poderes da Super Vaca."
+
+#: 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 "Non se atopou ningún paquete"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
@@ -219,6 +249,10 @@ msgstr "Non foi posíbel determinar o espazo libre en %s"
 msgid "You don't have enough free space in %s."
 msgstr "Non hai espazo libre abondo en %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Non é posíbel bloquear o directorio de descargas"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -318,7 +352,7 @@ msgstr "Quere continuar?"
 msgid "Some files failed to download"
 msgstr "Non foi posíbel descargar algúns ficheiros"
 
-#: 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 "Completouse a descarga no modo de só descargas"
 
@@ -713,9 +747,249 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Non se atopou ningún paquete"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Non foi posíbel atopar o paquete %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Ficheiros de paquetes:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"A caché está sen sincronizar, non se pode facer referencia a un ficheiro de "
+"paquetes"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Paquetes inmobilizados:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(non se atopou)"
+
+#. 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 "  Instalado: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidato: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ningún)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Inmobilizado: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Táboa de versións:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Tome «%s» como paquete fonte no canto de «%s»\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Non sé posíbel atopar un paquete fonte para %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
+"%s\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"Empregue:\n"
+"%s\n"
+"para obter as últimas actualizacións (posibelmente non publicadas) do "
+"paquete.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omítese o ficheiro xa descargado «%s»\n"
+
+#. 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 "Ten que recibir %sB/%sB de arquivos de fonte.\n"
+
+#. 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 "Ten que recibir %sB de arquivos de fonte.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Obter fonte %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Non se puideron obter algúns arquivos."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Fallou a orde de desempaquetado «%s».\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Fallou a orde de construción de «%s».\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Ten que especificar polo menos un paquete para comprobarlle as dependencias "
+"de compilación"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Non se puideron procesar as dependencias de construción"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s non ten dependencias de compilación.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
+"paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
+"paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
+"é novo de máis"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
+"dispoñíbel do paquete %s satisfai os requirimentos de versión"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
+"paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Non se puideron satisfacer as dependencias de construción de %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Non se puideron procesar as dependencias de construción"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -821,102 +1095,20 @@ msgstr "Espazo total contabilizado: "
 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 "Non foi posíbel atopar o paquete %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Ficheiros de paquetes:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"A caché está sen sincronizar, non se pode facer referencia a un ficheiro de "
-"paquetes"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Paquetes inmobilizados:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(non se atopou)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalado: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidato: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ningún)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Inmobilizado: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Táboa de versións:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Uso: apt-cache [opcións] orde\n"
-"     apt-cache [opcións] show paquete1 [paquete2 ...]\n"
-"\n"
-"apt-cache é unha ferramenta de baixo nivel usada para consultar\n"
-"informacións dos ficheiros binarios da cache do APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Options:\n"
-"  -h   Este texto de axuda.\n"
-"  -p=? A cache do paquete.\n"
-"  -s=? A cache da fonte.\n"
-"  -q   Desactiva o indicador de progreso.\n"
-"  -i   Mostra soamente dependencias importantes para a orde unmet.\n"
-"  -c=? Ler este ficheiro de configuración\n"
-"  -o=? Define unha opción arbitraria de configuración, ex. -o dir::cache=/"
-"tmp\n"
-"Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais "
-"información.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Mostra rexistros da fonte"
 
@@ -948,7 +1140,11 @@ msgstr "Mostra configuracións da política"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -994,7 +1190,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1031,24 +1226,9 @@ msgstr "Repita este proceso para o resto de CD do seu conxunto."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1059,24 +1239,9 @@ msgstr "Os argumentos non van en parellas"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Uso: apt-config [opcións] orde\n"
-"\n"
-"apt-config é unha ferramenta simple para ler a configuración de APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opcións:\n"
-"  -h   Este texto de axuda.\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
-"tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1087,31 +1252,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Tome «%s» como paquete fonte no canto de «%s»\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
@@ -1132,190 +1272,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Non é posíbel bloquear o directorio de descargas"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Non sé posíbel atopar un paquete fonte para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Empregue:\n"
-"%s\n"
-"para obter as últimas actualizacións (posibelmente non publicadas) do "
-"paquete.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Omítese o ficheiro xa descargado «%s»\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
-
-#. 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"
-msgstr "Ten que recibir %sB de arquivos de fonte.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Obter fonte %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Non se puideron obter algúns arquivos."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Fallou a orde de desempaquetado «%s».\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Fallou a orde de construción de «%s».\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Ten que especificar polo menos un paquete para comprobarlle as dependencias "
-"de compilación"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Non se puideron procesar as dependencias de construción"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s non ten dependencias de compilación.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
-"paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
-"paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
-"é novo de máis"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
-"dispoñíbel do paquete %s satisfai os requirimentos de versión"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
-"paquete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Non se puideron satisfacer as dependencias de construción de %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Non se puideron procesar as dependencias de construción"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Uso: apt-get [opcións] orde\n"
 "     apt-get [opcións] install|remove paquete1 [paquete2 ...]\n"
@@ -1326,45 +1296,6 @@ msgstr ""
 "son actualizadas e instaladas. \n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opçións:\n"
-"  -h  Este texto de axuda\n"
-"  -q  Saída rexistrábel - sen indicador de progreso\n"
-"  -qq Sen saída, agás para os erros \n"
-"  -d  Só descarga - NON instala ou desempaqueta os arquivos\n"
-"  -s  Sen acción. Fai unha simulación\n"
-"  -y  Asume Si para todas as preguntas e non as presenta\n"
-"  -f  Tenta corrixir un sistema con dependencias non cumpridas\n"
-"  -m  Tenta continuar se os arquivos non son localizados\n"
-"  -u  Mostra tamén unha lista de paquetes actualizados\n"
-"  -b  Constrúe o paquete fonte despois de descargalo\n"
-"  -V  Mostra os números detallados da versión\n"
-"  -c=? Ler este ficheiro de configuración\n"
-"  -o=? Define unha opción arbitraria de configuración, p.ex. -o dir::cache=/"
-"tmp\n"
-"Vexa as páxinas do manual sobre apt-get(8), sources.list(5) e apt.conf(5) \n"
-"para obter mais información e opcións\n"
-"                       Este APT ten poderes da Super Vaca.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Recupera unha nova lista de paquetes"
 
@@ -1443,11 +1374,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1521,20 +1449,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2033,17 +1950,13 @@ msgid "Merging available information"
 msgstr "Mesturando a información sobre paquetes dispoñíbeis"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Uso: apt-extracttemplates fich1 [fich2 ...]\n"
 "\n"
@@ -2077,13 +1990,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Uso: apt-extracttemplates fich1 [fich2 ...]\n"
 "\n"
@@ -2105,26 +2012,10 @@ msgstr "Rexistro de paquete descoñecido!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
-"\n"
-"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n"
-"A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -s   Emprega ordenamento por ficheiros fonte\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3887,6 +3778,89 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculando a anovación"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Uso: apt-cache [opcións] orde\n"
+#~ "     apt-cache [opcións] show paquete1 [paquete2 ...]\n"
+#~ "\n"
+#~ "apt-cache é unha ferramenta de baixo nivel usada para consultar\n"
+#~ "informacións dos ficheiros binarios da cache do APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Options:\n"
+#~ "  -h   Este texto de axuda.\n"
+#~ "  -p=? A cache do paquete.\n"
+#~ "  -s=? A cache da fonte.\n"
+#~ "  -q   Desactiva o indicador de progreso.\n"
+#~ "  -i   Mostra soamente dependencias importantes para a orde unmet.\n"
+#~ "  -c=? Ler este ficheiro de configuración\n"
+#~ "  -o=? Define unha opción arbitraria de configuración, ex. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais "
+#~ "información.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Uso: apt-config [opcións] orde\n"
+#~ "\n"
+#~ "apt-config é unha ferramenta simple para ler a configuración de APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opcións:\n"
+#~ "  -h   Este texto de axuda.\n"
+#~ "  -c=? Le este ficheiro de configuración\n"
+#~ "  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::"
+#~ "cache=/tmp\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"
+#~ msgstr ""
+#~ "Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de "
+#~ "paquetes.\n"
+#~ "A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -h   Este texto de axuda\n"
+#~ "  -s   Emprega ordenamento por ficheiros fonte\n"
+#~ "  -c=? Le este ficheiro de configuración\n"
+#~ "  -o=? Estabelece unha opción de configuración; por exemplo, -o dir::"
+#~ "cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "O proceso fillo fallou"
 
diff --git a/po/hu.po b/po/hu.po
index ceeaa1bbf..700d55240 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-06-25 17:09+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -174,6 +174,36 @@ msgstr "A(z) „%s� csomag nincs telepítve, így nem lett törölve\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Megjegyzés: „%s� kijelölése „%s� helyett\n"
 
+#: 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 "Ez az APT a SzuperTehén Hatalmával rendelkezik."
+
+#: 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 "Nem találhatók csomagok"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
@@ -218,6 +248,10 @@ msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
 msgid "You don't have enough free space in %s."
 msgstr "Nincs elég szabad hely itt: %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Nem lehet zárolni a letöltési könyvtárat"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
@@ -313,7 +347,7 @@ msgstr "Folytatni akarja?"
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: 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 "A letöltés befejeződött a „csak letöltés� módban"
 
@@ -704,9 +738,252 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nem találhatók csomagok"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ez a csomag nem található: %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Csomagfájlok:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomagfájlra"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Rögzített csomagok:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nem található)"
+
+#. 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 "  Telepítve: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Jelölt: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(nincs)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Csomagrögzítés: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Verziótáblázat:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "„%s� kiválasztása forráscsomagként „%s� helyett\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""
+"A(z) „%2$s� csomag el nem érhető „%1$s� verziójának figyelmen kívül hagyása"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nem található forráscsomag ehhez: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"MEGJEGYZÉS: a(z) „%s� csomagolása a(z) „%s� verziókövető rendszerben van "
+"karbantartva:\n"
+"%s\n"
+
+#: 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 ""
+"Használja a következő parancsot:\n"
+"%s\n"
+"a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "A már letöltött „%s� fájl kihagyása\n"
+
+#. 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 "Letöltendő forrásadat-mennyiség: %sB/%sB.\n"
+
+#. 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 "Letöltendő forrásadat-mennyiség: %sB.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Forrás letöltése: %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Nem sikerült néhány archívumot letölteni."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "„%s� kibontási parancs nem sikerült.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Ellenőrizze, hogy a „dpkg-dev� csomag telepítve van-e.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "„%s� elkészítési parancs nem sikerült.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni "
+"kell"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal "
+"kapcsolatban lásd az apt.conf(5) APT::Architectures részét."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Nem sikerült az építési függőségeket feldolgozni"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nem lehet %s fordítási függőségeinek információit letölteni"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Nincs fordítási függősége a következőnek: %s.\n"
+
+#: 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 ""
+"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem "
+"engedélyezett a(z) „%4$s� csomagokon"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem "
+"található"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl "
+"friss"
+
+#: 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"
+msgstr ""
+"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető "
+"verziója nem elégíti ki a verziókövetelményeket"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs "
+"jelölt verziója"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s építési függőségei nem elégíthetők ki."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -812,98 +1089,18 @@ msgstr "Nyilvántartott terület összesen: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto�-t."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ez a csomag nem található: %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Csomagfájlok:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomagfájlra"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Rögzített csomagok:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nem található)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Telepítve: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Jelölt: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(nincs)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Csomagrögzítés: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Verziótáblázat:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Használat: apt-cache [kapcsolók] parancs\n"
-"           apt-cache [kapcsolók] show pkg1 [pkg2 ...]\n"
-"\n"
-"Az apt-cache egy alacsony szintű eszköz információk lekérdezésére\n"
-"az APT bináris gyorsítótár-fájljaiból\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Parancsok:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Kapcsolók:\n"
-"  -h   Ez a súgó szöveg. \n"
-"  -p=? A csomag-gyorsítótár.\n"
-"  -s=? A forrás-gyorsítótár.\n"
-"  -q   Letiltja az állapotjelzőt.\n"
-"  -i   Csak a fontos függőségeket jeleníti meg az unmet parancsnál.\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/tmp\n"
-"Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további "
-"információkért.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -937,7 +1134,11 @@ msgstr "Megjeleníti a policy beállításokat"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -983,7 +1184,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1020,37 +1220,11 @@ msgstr "Ismételje meg a folyamatot készlete többi CD-jével is."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Kapcsolók:\n"
-"  -h  Ez a súgó szöveg.\n"
-"  -q  Naplózható kimenet - nincs folyamatjelző\n"
-"  -qq Nincs kimenet, kivéve a hibákat\n"
-"  -s  Szimulációs mód. Csak kiírja, mi történne.\n"
-"  -f  auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/tmp\n"
-"Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
-"információkért."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Az argumentumok nincsenek párban"
@@ -1059,23 +1233,9 @@ msgstr "Az argumentumok nincsenek párban"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Használat: apt-config [kapcsolók] parancs\n"
-"\n"
-"Az apt-config egy egyszerű eszköz az APT konfigurációs fájl olvasására\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Kapcsolók:\n"
-"  -h   Ez a súgó szöveg\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1086,32 +1246,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nem található csomag a(z) „%s� reguláris kifejezéssel"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "„%s� kiválasztása forráscsomagként „%s� helyett\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-"A(z) „%2$s� csomag el nem érhető „%1$s� verziójának figyelmen kívül hagyása"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
@@ -1134,193 +1268,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, a problémamegoldó hibát okozott"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Nem lehet zárolni a letöltési könyvtárat"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nem található forráscsomag ehhez: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"MEGJEGYZÉS: a(z) „%s� csomagolása a(z) „%s� verziókövető rendszerben van "
-"karbantartva:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Használja a következő parancsot:\n"
-"%s\n"
-"a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "A már letöltött „%s� fájl kihagyása\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n"
-
-#. 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"
-msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Forrás letöltése: %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Nem sikerült néhány archívumot letölteni."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "„%s� kibontási parancs nem sikerült.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Ellenőrizze, hogy a „dpkg-dev� csomag telepítve van-e.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "„%s� elkészítési parancs nem sikerült.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni "
-"kell"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal "
-"kapcsolatban lásd az apt.conf(5) APT::Architectures részét."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Nem sikerült az építési függőségeket feldolgozni"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nem lehet %s fordítási függőségeinek információit letölteni"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem "
-"engedélyezett a(z) „%4$s� csomagokon"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem "
-"található"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl "
-"friss"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető "
-"verziója nem elégíti ki a verziókövetelményeket"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs "
-"jelölt verziója"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s építési függőségei nem elégíthetők ki."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Nem sikerült az építési függőségeket feldolgozni"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Használat: apt-get [kapcsolók] parancs\n"
 "           apt-get [kapcsolók] install|remove pkg1 [pkg2 ...]\n"
@@ -1330,46 +1291,6 @@ msgstr ""
 "telepítéséhez. A leggyakrabban használt parancsok az update és az install. \n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opciók:\n"
-"   -h Ez a súgó szöveg.\n"
-"   -q Naplózható kimenet - nincs folyamatjelző\n"
-"   -qq Nincs kimenet, kivéve a hibákat\n"
-"   -d Csak letöltés - NEM telepíti vagy bontja ki az archívokat\n"
-"   -s Szimulációs mód.\n"
-"   -y Felteszi, hogy minden kérdésre igen a válasz, és nem kérdez\n"
-"   -f Próbálja folytatni, akkor is ha a sértetlenségi teszt hibát jelez\n"
-"   -m Próbálja folytatni, akkor is ha egyes archívumok nem találhatók\n"
-"   -u Megjeleníti a frissített csomagok listáját is\n"
-"   -b Megépíti a forráscsomagot miután letöltötte\n"
-"   -V Részletes verziószámok\n"
-"   -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"   -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
-"tmp\n"
-"Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyvlapokat "
-"további\n"
-"információkért és opciókért.\n"
-"                       Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Frissíti a csomaglistákat"
 
@@ -1449,11 +1370,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1523,11 +1441,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n"
 "\n"
@@ -1536,29 +1457,6 @@ msgstr ""
 "is.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Kapcsolók:\n"
-"  -h  Ez a súgó szöveg.\n"
-"  -q  Naplózható kimenet - nincs folyamatjelző\n"
-"  -qq Nincs kimenet, kivéve a hibákat\n"
-"  -s  Szimulációs mód. Csak kiírja, mi történne.\n"
-"  -f  auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/tmp\n"
-"Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
-"információkért."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Az adott csomagok megjelölése automatikusan telepítettként"
 
@@ -2048,17 +1946,13 @@ msgid "Merging available information"
 msgstr "Elérhető információk egyesítése"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Használat:apt-extracttemplates fájl1 [fájl2 ...]\n"
 "\n"
@@ -2087,17 +1981,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Használat: apt-internal-solver\n"
 "\n"
@@ -2119,26 +2008,10 @@ msgstr "Ismeretlen csomagbejegyzés!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
-"\n"
-"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
-"kapcsolót\n"
-"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n"
-"\n"
-"Kapcsolók:\n"
-"  -h  Ez a súgó szöveg\n"
-"  -s  Forrásfájlrendezést használ\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3887,6 +3760,141 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Frissítés kiszámítása"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Használat: apt-cache [kapcsolók] parancs\n"
+#~ "           apt-cache [kapcsolók] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "Az apt-cache egy alacsony szintű eszköz információk lekérdezésére\n"
+#~ "az APT bináris gyorsítótár-fájljaiból\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Parancsok:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Kapcsolók:\n"
+#~ "  -h   Ez a súgó szöveg. \n"
+#~ "  -p=? A csomag-gyorsítótár.\n"
+#~ "  -s=? A forrás-gyorsítótár.\n"
+#~ "  -q   Letiltja az állapotjelzőt.\n"
+#~ "  -i   Csak a fontos függőségeket jeleníti meg az unmet parancsnál.\n"
+#~ "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további "
+#~ "információkért.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Kapcsolók:\n"
+#~ "  -h  Ez a súgó szöveg.\n"
+#~ "  -q  Naplózható kimenet - nincs folyamatjelző\n"
+#~ "  -qq Nincs kimenet, kivéve a hibákat\n"
+#~ "  -s  Szimulációs mód. Csak kiírja, mi történne.\n"
+#~ "  -f  auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n"
+#~ "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
+#~ "információkért."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Használat: apt-config [kapcsolók] parancs\n"
+#~ "\n"
+#~ "Az apt-config egy egyszerű eszköz az APT konfigurációs fájl olvasására\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Kapcsolók:\n"
+#~ "  -h   Ez a súgó szöveg\n"
+#~ "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/"
+#~ "tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Kapcsolók:\n"
+#~ "  -h  Ez a súgó szöveg.\n"
+#~ "  -q  Naplózható kimenet - nincs folyamatjelző\n"
+#~ "  -qq Nincs kimenet, kivéve a hibákat\n"
+#~ "  -s  Szimulációs mód. Csak kiírja, mi történne.\n"
+#~ "  -f  auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n"
+#~ "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
+#~ "információkért."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
+#~ "\n"
+#~ "Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
+#~ "kapcsolót\n"
+#~ "lehet használni annak jelzésére hogy ez milyen típusú fájl.\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -h  Ez a súgó szöveg\n"
+#~ "  -s  Forrásfájlrendezést használ\n"
+#~ "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Hiba a gyermekfolyamatnál"
 
diff --git a/po/it.po b/po/it.po
index e7cf51435..afa50e843 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2015-04-07 16:51+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -174,6 +174,36 @@ msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n"
 
+#: 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 "Questo APT ha i poteri della Super Mucca."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Questo APT ha super poteri."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Nessun pacchetto trovato"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
@@ -218,6 +248,10 @@ msgstr "Impossibile determinare lo spazio libero in %s"
 msgid "You don't have enough free space in %s."
 msgstr "Spazio libero in %s insufficiente."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Impossibile bloccare la directory di scaricamento"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -319,7 +353,7 @@ msgstr "Continuare?"
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
-#: 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 "Scaricamento completato e in modalità solo scaricamento"
 
@@ -715,9 +749,252 @@ msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
 msgid "not a real package (virtual)"
 msgstr "non un vero pacchetto (virtuale)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nessun pacchetto trovato"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossibile trovare il pacchetto %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "File dei pacchetti:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pacchetti con gancio:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(non trovato)"
+
+#. 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 "  Installato: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidato: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(nessuno)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Gancio del pacchetto: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabella versione:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Impossibile trovare un pacchetto per l'architettura \"%s\""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Impossibile trovare un pacchetto \"%s\" con versione \"%s\""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Impossibile trovare un pacchetto \"%s\" con release \"%s\""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Impossibile trovare la versione \"%s\" del pacchetto \"%s\""
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Impossibile trovare un pacchetto sorgente per %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"Nota: il processo di pacchettizzazione di \"%s\" è mantenuto\n"
+"all'interno del sistema di controllo della versione \"%s\" presso:\n"
+"%s\n"
+
+#: 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 ""
+"Utilizzare:\n"
+"%s\n"
+"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
+"pacchetto.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
+
+#. 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 "È necessario recuperare %sB/%sB di sorgenti.\n"
+
+#. 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 "È necessario scaricare %sB di sorgenti.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Recupero sorgente %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Recupero di alcuni archivi non riuscito."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Comando di estrazione \"%s\" non riuscito.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Comando \"%s\" di generazione non riuscito.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"È necessario specificare almeno un pacchetto di cui controllare le "
+"dipendenze di generazione"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Informazioni sull'architettura non disponibili per %s. Consultare apt."
+"conf(5) APT::Architectures per l'impostazione"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Elaborazione delle dipendenze di generazione non riuscita"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s non ha dipendenze di generazione.\n"
+
+#: 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 ""
+"La dipendenza %s per %s non può essere soddisfatta perché %s non è "
+"consentito su pacchetti \"%s\""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
+"non può essere trovato"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
+"è troppo recente"
+
+#: 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"
+msgstr ""
+"La dipendenza %s per %s non può essere soddisfatta perché la versione "
+"candidata del pacchetto %s non può soddisfare i requisiti di versione"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
+"non ha una versione candidata"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -829,98 +1106,18 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossibile trovare il pacchetto %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "File dei pacchetti:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pacchetti con gancio:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(non trovato)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installato: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidato: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(nessuno)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Gancio del pacchetto: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabella versione:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Uso: apt-cache [OPZIONI] COMANDO\n"
-"     apt-cache [OPZIONI] show PKG1 [PKG2 ...]\n"
-"\n"
-"apt-cache è uno strumento di basso livello usato per cercare informazioni\n"
-"nei file di cache dei binari di APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Comandi:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -p=? La cache dei pacchetti\n"
-"  -s=? La cache dei sorgenti\n"
-"  -q   Disabilita l'indicatore di avanzamento\n"
-"  -i   Mostra solo dipendenze importanti per il comando unmet\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n"
-"apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -954,11 +1151,12 @@ msgstr "Mostra le preferenze adottate"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Uso: apt [OPZIONI] COMANDO\n"
-"\n"
-"Interfaccia a riga di comando per apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1003,7 +1201,6 @@ msgstr ""
 "Esegue l'avanzamento di versione del sistema rimuovendo, installando e "
 "aggiornando i pacchetti"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1045,37 +1242,11 @@ msgstr "Ripetere questo processo per il resto dei CD."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -q   Output registrabile, nessun indicatore di avanzamento\n"
-"  -qq  Nessun output eccetto gli errori\n"
-"  -s   Nessuna azione, stampa solamente cosa verrebbe fatto\n"
-"  -f   Legge/Scrivere la segnalazione nel file fornito\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
-"Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
-"apt.conf(5)."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argomenti non in coppia"
@@ -1084,23 +1255,9 @@ msgstr "Argomenti non in coppia"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Uso: apt-config [OPZIONI] COMANDO\n"
-"\n"
-"apt-config è uno strumento per leggere il file di configurazione di APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opzioni\n"
-"  -h   Mostra questo aiuto\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1112,31 +1269,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Impossibile trovare un pacchetto per l'architettura \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Impossibile trovare un pacchetto \"%s\" con versione \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Impossibile trovare un pacchetto \"%s\" con release \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Impossibile trovare la versione \"%s\" del pacchetto \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
@@ -1158,194 +1290,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Impossibile bloccare la directory di scaricamento"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Impossibile trovare un pacchetto sorgente per %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"Nota: il processo di pacchettizzazione di \"%s\" è mantenuto\n"
-"all'interno del sistema di controllo della versione \"%s\" presso:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Utilizzare:\n"
-"%s\n"
-"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
-"pacchetto.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
-
-#. 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"
-msgstr "È necessario scaricare %sB di sorgenti.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Recupero sorgente %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Recupero di alcuni archivi non riuscito."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Comando \"%s\" di generazione non riuscito.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"È necessario specificare almeno un pacchetto di cui controllare le "
-"dipendenze di generazione"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Informazioni sull'architettura non disponibili per %s. Consultare apt."
-"conf(5) APT::Architectures per l'impostazione"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s non ha dipendenze di generazione.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"La dipendenza %s per %s non può essere soddisfatta perché %s non è "
-"consentito su pacchetti \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
-"non può essere trovato"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
-"è troppo recente"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"La dipendenza %s per %s non può essere soddisfatta perché la versione "
-"candidata del pacchetto %s non può soddisfare i requisiti di versione"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
-"non ha una versione candidata"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Uso: apt-get [OPZIONI] COMANDO\n"
 "     apt-get [OPZIONI] install|remove PKG1 [PKG2 ...]\n"
@@ -1355,45 +1313,6 @@ msgstr ""
 "e installare pacchetti. I comandi più usati sono update e install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opzioni:\n"
-"  -h  Mostra questo aiuto\n"
-"  -q  Output registrabile, nessun indicatore di avanzamento\n"
-"  -qq Nessun output eccetto gli errori\n"
-"  -d  Scarica solamente, NON installa o decomprime gli archivi\n"
-"  -s  Nessuna azione, simula i passi in ordine\n"
-"  -y  Assume una risposta affermativa a tutte le domande e non chiede "
-"conferma\n"
-"  -f  Tenta di continuare se il controllo di integrità non riesce\n"
-"  -m  Tenta di continuare se gli archivi non sono localizzabili\n"
-"  -u  Mostra anche un elenco dei pacchetti aggiornati\n"
-"  -b  Genera il pacchetto sorgente dopo averlo recuperato\n"
-"  -V  Mostra prolissamente i numeri di versione\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
-"Per maggiori informazioni e opzioni, consultare le pagine di manuale\n"
-"apt-get(8), sources.list(5) e apt.conf(5).\n"
-"                       Questo APT ha i poteri della Super Mucca.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Scarica l'elenco aggiornato dei pacchetti"
 
@@ -1467,11 +1386,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Uso: apt-helper [OPZIONI] COMANDO\n"
 "     apt-helper [OPZIONI] download-file uri percorso\n"
@@ -1479,10 +1400,6 @@ msgstr ""
 "apt-helper è un programma d'aiuto interno per apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Questo APT ha super poteri."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "Scarica l'URI fornito in percorso"
 
@@ -1549,11 +1466,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n"
 "\n"
@@ -1563,29 +1483,6 @@ msgstr ""
 "segnalazioni.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -q   Output registrabile, nessun indicatore di avanzamento\n"
-"  -qq  Nessun output eccetto gli errori\n"
-"  -s   Nessuna azione, stampa solamente cosa verrebbe fatto\n"
-"  -f   Legge/Scrivere la segnalazione nel file fornito\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
-"Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
-"apt.conf(5)."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Segna i pacchetti forniti come installati automaticamente"
 
@@ -2083,17 +1980,13 @@ msgid "Merging available information"
 msgstr "Unione delle informazioni disponibili"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
 "\n"
@@ -2121,17 +2014,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Impossibile trovare la versione di debconf. È installato?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Uso: apt-internal-solver\n"
 "\n"
@@ -2152,25 +2040,10 @@ msgstr "Record del pacchetto sconosciuto."
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
-"\n"
-"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n"
-"L'opzione -s è usata per indicare il tipo di file.\n"
-"\n"
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -s   Ordina per pacchetto sorgente\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3951,6 +3824,146 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calcolo dell'aggiornamento"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Uso: apt-cache [OPZIONI] COMANDO\n"
+#~ "     apt-cache [OPZIONI] show PKG1 [PKG2 ...]\n"
+#~ "\n"
+#~ "apt-cache è uno strumento di basso livello usato per cercare "
+#~ "informazioni\n"
+#~ "nei file di cache dei binari di APT\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Comandi:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opzioni:\n"
+#~ "  -h   Mostra questo aiuto\n"
+#~ "  -p=? La cache dei pacchetti\n"
+#~ "  -s=? La cache dei sorgenti\n"
+#~ "  -q   Disabilita l'indicatore di avanzamento\n"
+#~ "  -i   Mostra solo dipendenze importanti per il comando unmet\n"
+#~ "  -c=? Legge come configurazione il file specificato\n"
+#~ "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
+#~ "Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) "
+#~ "e \n"
+#~ "apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Uso: apt [OPZIONI] COMANDO\n"
+#~ "\n"
+#~ "Interfaccia a riga di comando per apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Opzioni:\n"
+#~ "  -h   Mostra questo aiuto\n"
+#~ "  -q   Output registrabile, nessun indicatore di avanzamento\n"
+#~ "  -qq  Nessun output eccetto gli errori\n"
+#~ "  -s   Nessuna azione, stampa solamente cosa verrebbe fatto\n"
+#~ "  -f   Legge/Scrivere la segnalazione nel file fornito\n"
+#~ "  -c=? Legge come configurazione il file specificato\n"
+#~ "  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
+#~ "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
+#~ "apt.conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Uso: apt-config [OPZIONI] COMANDO\n"
+#~ "\n"
+#~ "apt-config è uno strumento per leggere il file di configurazione di APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opzioni\n"
+#~ "  -h   Mostra questo aiuto\n"
+#~ "  -c=? Legge come configurazione il file specificato\n"
+#~ "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Opzioni:\n"
+#~ "  -h   Mostra questo aiuto\n"
+#~ "  -q   Output registrabile, nessun indicatore di avanzamento\n"
+#~ "  -qq  Nessun output eccetto gli errori\n"
+#~ "  -s   Nessuna azione, stampa solamente cosa verrebbe fatto\n"
+#~ "  -f   Legge/Scrivere la segnalazione nel file fornito\n"
+#~ "  -c=? Legge come configurazione il file specificato\n"
+#~ "  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
+#~ "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
+#~ "apt.conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n"
+#~ "L'opzione -s è usata per indicare il tipo di file.\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -h   Mostra questo aiuto\n"
+#~ "  -s   Ordina per pacchetto sorgente\n"
+#~ "  -c=? Legge come configurazione il file specificato\n"
+#~ "  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Creazione processo figlio non riuscita"
 
diff --git a/po/ja.po b/po/ja.po
index 4729e7c81..647db9875 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.9.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-12-12 22:33+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -174,6 +174,36 @@ msgstr "パッケージ '%s' �インストール�れ�������削
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "'%2$s' �代�り� '%1$s' をソースパッケージ����出�����\n"
 
+#: 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 � Super Cow Powers 化�れ����。"
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "�� APT helper � Super Meep Powers 化�れ����。"
+
+#: 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 "警告: 以下�パッケージ��証�れ����ん!"
@@ -218,6 +248,10 @@ msgstr "%s �空�領域を測定����ん"
 msgid "You don't have enough free space in %s."
 msgstr "%s �充分�空�スペース��り��ん。"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "ダウンロードディレクトリをロック����ん"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー�InstallPackages �壊れ�パッケージ�呼�出�れ���!"
@@ -314,7 +348,7 @@ 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 "ダウンロードオンリーモード�パッケージ�ダウンロード�完了����"
 
@@ -701,9 +735,251 @@ msgstr[0] ""
 msgid "not a real package (virtual)"
 msgstr "実際�パッケージ���り��ん (仮想)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "パッケージ�見��り��ん"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "パッケージ %s �見��り��ん"
+
+#: 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 "Pin �れ�パッケージ:"
+
+#: 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
+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 "(��)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  パッケージ Pin: "
+
+#. 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 "アーキテク�ャ '%s' 用�パッケージ�見��り��ん���"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "パッケージ '%s' ��ージョン '%s' �見��り��ん���"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "リリース '%2$s' ��パッケージ '%1$s' �見��り��ん���"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "'%2$s' �代�り� '%1$s' をソースパッケージ����出�����\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "パッケージ '%2$s' ��ージョン '%1$s' �見��り��ん���"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"ソースを�得�る��少���も 1 ��パッケージ�を指定�る必���り��"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "%s �ソースパッケージ�見��り��ん"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"注�: '%s' パッケージ�以下�場所� '%s' �ージョン制御システム��守�れ��"
+"��:\n"
+"%s\n"
+
+#: 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 ""
+"パッケージ�最新� (��リリース�れ�����も�れ��) 更新を�得�る�"
+"��\n"
+"%s\n"
+"を使用������。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "���ダウンロード�れ�ファイル '%s' をスキップ���\n"
+
+#. 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 "%2$sB 中 %1$sB �ソースアーカイブを�得�る必���り��。\n"
+
+#. 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 "%sB �ソースアーカイブを�得�る必���り��。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "ソース %s を�得\n"
+
+#: 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 "��� %s �展開�れ�ソース��る���展開をスキップ���\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "展開コマンド '%s' �失敗����。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+"'dpkg-dev' パッケージ�インストール�れ��る��を確�������。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "ビルドコマンド '%s' �失敗����。\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"ビルド�存関係を�ェック�るパッケージを少���も 1 �指定�る必���り��"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"%s �利用�能�アーキテク�ャ情報��り��ん。セットアップ���� apt."
+"conf(5) � APT::Architectures を�照������。"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, 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"
+msgstr "%s �ビルド�存情報を�得����ん"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s ��ビルド�存情報�指定�れ����ん。\n"
+
+#: 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 ""
+"パッケージ %3$s � '%4$s' パッケージ�許�れ�������%2$s �対�る %1$s "
+"��存関係を満���������ん"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"パッケージ %3$s �見��ら�����%2$s �対�る %1$s ��存関係を満����"
+"�����ん"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"%2$s ��存関係 %1$s を満���������ん: インストール�れ� %3$s パッ"
+"ケージ�新�����"
+
+#: 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"
+msgstr ""
+"パッケージ %3$s �候補�ージョン��ージョン������求を満�����"
+"��%2$s �対�る %1$s ��存関係を満���������ん"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"パッケージ %3$s �候補�ージョン�存在������%2$s �対�る %1$s ��存関"
+"係を満���������ん"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%2$s ��存関係 %1$s を満���������ん: %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s �ビルド�存関係を満���������ん���。"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "ビルド�存関係�処��失敗����"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -812,96 +1088,18 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "��コマンド�時代�れ��。'apt-mark showauto' を代�り�使用������。"
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "パッケージ %s �見��り��ん"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "Pin �れ�パッケージ:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(見��り��ん)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  インストール�れ��る�ージョン: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  候補: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(��)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  パッケージ Pin: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  �ージョンテーブル:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"使用方法: apt-cache [オプション] コマンド\n"
-"          apt-cache [オプション] show pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache � APT ��イナリキャッシュファイルを�作��り����ら情\n"
-"報を検索��り�る���低レベル�ツール��\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "コマンド:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"オプション:\n"
-"  -h   ��ヘルプを表示�る\n"
-"  -p=? パッケージキャッシュ\n"
-"  -s=? ソースキャッシュ\n"
-"  -q   プログレス表示を���\n"
-"  -i   umnet コマンド�����存情報��を表示�る\n"
-"  -c=? 指定��設定ファイルを読�込む\n"
-"  -o=? 指定��設定オプションを読�込む (例: -o dir::cache=/tmp)\n"
-"詳細��apt-cache(8) や apt.conf(5) �マニュアルページを�照������。\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -935,11 +1133,12 @@ msgstr "�リシー設定情報を表示�る"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"使用法: apt [オプション] コマンド\n"
-"\n"
-"apt 用コマンドラインインターフェイス\n"
 
 #. query
 #: cmdline/apt.cc
@@ -980,7 +1179,6 @@ msgstr "パッケージをインストール/æ›´æ–°ã�—ã�¦ã‚·ã‚¹ãƒ†ãƒ ã‚’アッãƒ
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "パッケージを削除/インストール/更新��システムをアップグレード"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1023,37 +1221,11 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"オプション:\n"
-"  -h  ��ヘルプを表示�る\n"
-"  -q  ログファイル�出力�能�形���る - プログレス表示を���\n"
-"  -qq エラー以外�表示���\n"
-"  -s  実際��実行���。実行シミュレーション��行�\n"
-"  -f  指定�ファイルを使��自動/手動�マーキングを読�書��る\n"
-"  -c=? 指定��設定ファイルを読�込む\n"
-"  -o=? 任��設定オプションを指定�る (例 -o dir::cache=/tmp)\n"
-"�ら�る情報������マニュアルページ apt-mark(8) �よ� apt.conf(5) を�"
-"照������。"
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "引数�ペア���り��ん"
@@ -1062,23 +1234,9 @@ msgstr "引数�ペア���り��ん"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"使用方法: apt-config [オプション] コマンド\n"
-"\n"
-"apt-config � APT �設定ファイルを読�込む���簡��ツール��\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"オプション:\n"
-"  -h   ��ヘルプを表示�る\n"
-"  -c=? 指定��設定ファイルを読�込む\n"
-"  -o=? 指定��設定オプションを�用�る (例: -o dir::cache=/tmp)\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1090,31 +1248,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "アーキテク�ャ '%s' 用�パッケージ�見��り��ん���"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "パッケージ '%s' ��ージョン '%s' �見��り��ん���"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "リリース '%2$s' ��パッケージ '%1$s' �見��り��ん���"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "'%2$s' �代�り� '%1$s' をソースパッケージ����出�����\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "パッケージ '%2$s' ��ージョン '%1$s' �見��り��ん���"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s �見��り��ん"
 
@@ -1136,194 +1269,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー��題リゾル��何�を破壊����"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "ダウンロードディレクトリをロック����ん"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"ソースを�得�る��少���も 1 ��パッケージ�を指定�る必���り��"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "%s �ソースパッケージ�見��り��ん"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"注�: '%s' パッケージ�以下�場所� '%s' �ージョン制御システム��守�れ��"
-"��:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"パッケージ�最新� (��リリース�れ�����も�れ��) 更新を�得�る�"
-"��\n"
-"%s\n"
-"を使用������。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "���ダウンロード�れ�ファイル '%s' をスキップ���\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%2$sB 中 %1$sB �ソースアーカイブを�得�る必���り��。\n"
-
-#. 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"
-msgstr "%sB �ソースアーカイブを�得�る必���り��。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "ソース %s を�得\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "�����アーカイブ��得�失敗����。"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "��� %s �展開�れ�ソース��る���展開をスキップ���\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "展開コマンド '%s' �失敗����。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-"'dpkg-dev' パッケージ�インストール�れ��る��を確�������。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "ビルドコマンド '%s' �失敗����。\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"ビルド�存関係を�ェック�るパッケージを少���も 1 �指定�る必���り��"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"%s �利用�能�アーキテク�ャ情報��り��ん。セットアップ���� apt."
-"conf(5) � APT::Architectures を�照������。"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "ビルド�存関係�処��失敗����"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "%s �ビルド�存情報を�得����ん"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s ��ビルド�存情報�指定�れ����ん。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"パッケージ %3$s � '%4$s' パッケージ�許�れ�������%2$s �対�る %1$s "
-"��存関係を満���������ん"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"パッケージ %3$s �見��ら�����%2$s �対�る %1$s ��存関係を満����"
-"�����ん"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"%2$s ��存関係 %1$s を満���������ん: インストール�れ� %3$s パッ"
-"ケージ�新�����"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"パッケージ %3$s �候補�ージョン��ージョン������求を満�����"
-"��%2$s �対�る %1$s ��存関係を満���������ん"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"パッケージ %3$s �候補�ージョン�存在������%2$s �対�る %1$s ��存関"
-"係を満���������ん"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s ��存関係 %1$s を満���������ん: %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s �ビルド�存関係を満���������ん���。"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "ビルド�存関係�処��失敗����"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "サ�ート�れ��るモジュール:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "使用法: apt-get [オプション] コマンド\n"
 "        apt-get [オプション] install|remove パッケージ�1 [パッケージ�"
@@ -1335,44 +1294,6 @@ msgstr ""
 "� install ��。\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"オプション:\n"
-"  -h  ��ヘルプを表示�る\n"
-"  -q  ログファイル�出力�能�形���る - プログレス表示を���\n"
-"  -qq エラー以外�表示���\n"
-"  -d  ダウンロード��行� - アーカイブ�インストールや展開�行���\n"
-"  -s  実際��実行���。実行シミュレーション��行�\n"
-"  -y  ���������� Yes �答��プロンプト�返���\n"
-"  -f  整�性�ェック�失敗��も処�を続行�る\n"
-"  -m  アーカイブ�存在���場�も続行�る\n"
-"  -u  アップグレード�れるパッケージも表示�る\n"
-"  -b  ソースパッケージを�得��ビルドを行�\n"
-"  -V  冗長��ージョンナン�を表示�る\n"
-"  -c=? 指定��設定ファイルを読�込む\n"
-"  -o=? 任��設定オプションを指定�る (例 -o dir::cache=/tmp)\n"
-"�ら�る情報やオプション������マニュアルページ\n"
-"apt-get(8)�sources.list(5)�apt.conf(5) を�照������。\n"
-"                        �� APT � Super Cow Powers 化�れ����。\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "新��パッケージリストを�得�る"
 
@@ -1448,11 +1369,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "使用法: apt-helper [オプション] コマンド\n"
 "        apt-helper [オプション] download-file uri 目標パス\n"
@@ -1460,10 +1383,6 @@ msgstr ""
 "apt-helper � apt �内部ヘルパー��\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "�� APT helper � Super Meep Powers 化�れ����。"
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "指定�� uri を目標パス�ダウンロード�る"
 
@@ -1530,11 +1449,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Usage: apt-mark [オプション] {auto|manual} パッケージ1 [パッケージ2 ...]\n"
 "\n"
@@ -1542,29 +1464,6 @@ msgstr ""
 "�る簡��コマンドラインインターフェイス��。マーク�一覧表示も����。\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"オプション:\n"
-"  -h  ��ヘルプを表示�る\n"
-"  -q  ログファイル�出力�能�形���る - プログレス表示を���\n"
-"  -qq エラー以外�表示���\n"
-"  -s  実際��実行���。実行シミュレーション��行�\n"
-"  -f  指定�ファイルを使��自動/手動�マーキングを読�書��る\n"
-"  -c=? 指定��設定ファイルを読�込む\n"
-"  -o=? 任��設定オプションを指定�る (例 -o dir::cache=/tmp)\n"
-"�ら�る情報������マニュアルページ apt-mark(8) �よ� apt.conf(5) を�"
-"照������。"
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "指定�パッケージを自動�インストール�れ�も����マーク�る"
 
@@ -2048,17 +1947,13 @@ msgid "Merging available information"
 msgstr "入手�能情報をマージ�����"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "使用方法: apt-extracttemplates ファイル�1 [ファイル�2 ...]\n"
 "\n"
@@ -2087,17 +1982,12 @@ msgstr ""
 "debconf ��ージョンを�得����ん。debconf �インストール�れ�����?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "使用方法: apt-internal-solver\n"
 "\n"
@@ -2118,25 +2008,10 @@ msgstr "�明�パッケージレコード��!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"使用方法: apt-sortpkgs [オプション] ファイル�1 [ファイル�2 ...]\n"
-"\n"
-"apt-sortpkgs �パッケージファイルをソート�る���簡��ツール��。\n"
-"-s オプション�ファイル�種類を示����使用�れ��。\n"
-"\n"
-"オプション:\n"
-"  -h   ��ヘルプを表示�る\n"
-"  -s   ソースファイルソートを使用�る\n"
-"  -c=? 指定��設定ファイルを読�込む\n"
-"  -o=? 指定��設定オプションを�用�る (例: -o dir::cache=/tmp)\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3888,6 +3763,144 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "アップグレードパッケージを検出�����"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "使用方法: apt-cache [オプション] コマンド\n"
+#~ "          apt-cache [オプション] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache � APT ��イナリキャッシュファイルを�作��り����ら情\n"
+#~ "報を検索��り�る���低レベル�ツール��\n"
+
+#~ msgid "Commands:"
+#~ msgstr "コマンド:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "オプション:\n"
+#~ "  -h   ��ヘルプを表示�る\n"
+#~ "  -p=? パッケージキャッシュ\n"
+#~ "  -s=? ソースキャッシュ\n"
+#~ "  -q   プログレス表示を���\n"
+#~ "  -i   umnet コマンド�����存情報��を表示�る\n"
+#~ "  -c=? 指定��設定ファイルを読�込む\n"
+#~ "  -o=? 指定��設定オプションを読�込む (例: -o dir::cache=/tmp)\n"
+#~ "詳細��apt-cache(8) や apt.conf(5) �マニュアルページを�照�����"
+#~ "�。\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "使用法: apt [オプション] コマンド\n"
+#~ "\n"
+#~ "apt 用コマンドラインインターフェイス\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "オプション:\n"
+#~ "  -h  ��ヘルプを表示�る\n"
+#~ "  -q  ログファイル�出力�能�形���る - プログレス表示を���\n"
+#~ "  -qq エラー以外�表示���\n"
+#~ "  -s  実際��実行���。実行シミュレーション��行�\n"
+#~ "  -f  指定�ファイルを使��自動/手動�マーキングを読�書��る\n"
+#~ "  -c=? 指定��設定ファイルを読�込む\n"
+#~ "  -o=? 任��設定オプションを指定�る (例 -o dir::cache=/tmp)\n"
+#~ "�ら�る情報������マニュアルページ apt-mark(8) �よ� apt.conf(5) を"
+#~ "�照������。"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "使用方法: apt-config [オプション] コマンド\n"
+#~ "\n"
+#~ "apt-config � APT �設定ファイルを読�込む���簡��ツール��\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "オプション:\n"
+#~ "  -h   ��ヘルプを表示�る\n"
+#~ "  -c=? 指定��設定ファイルを読�込む\n"
+#~ "  -o=? 指定��設定オプションを�用�る (例: -o dir::cache=/tmp)\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "オプション:\n"
+#~ "  -h  ��ヘルプを表示�る\n"
+#~ "  -q  ログファイル�出力�能�形���る - プログレス表示を���\n"
+#~ "  -qq エラー以外�表示���\n"
+#~ "  -s  実際��実行���。実行シミュレーション��行�\n"
+#~ "  -f  指定�ファイルを使��自動/手動�マーキングを読�書��る\n"
+#~ "  -c=? 指定��設定ファイルを読�込む\n"
+#~ "  -o=? 任��設定オプションを指定�る (例 -o dir::cache=/tmp)\n"
+#~ "�ら�る情報������マニュアルページ apt-mark(8) �よ� apt.conf(5) を"
+#~ "�照������。"
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "使用方法: apt-sortpkgs [オプション] ファイル�1 [ファイル�2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs �パッケージファイルをソート�る���簡��ツール��。\n"
+#~ "-s オプション�ファイル�種類を示����使用�れ��。\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -h   ��ヘルプを表示�る\n"
+#~ "  -s   ソースファイルソートを使用�る\n"
+#~ "  -c=? 指定��設定ファイルを読�込む\n"
+#~ "  -o=? 指定��設定オプションを�用�る (例: -o dir::cache=/tmp)\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "�プロセス�失敗����"
 
diff --git a/po/km.po b/po/km.po
index 8ee41f67b..15af20795 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -175,6 +175,36 @@ msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
+#: 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 "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទា�់ភាព�្រឹម�្រូវកញ្ចប់�ាងក្រោមបានឡើយ !"
@@ -220,6 +250,10 @@ msgstr "មិន​អាច​កំណ�់​ទំហំ​ទំន�រ
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំន�រ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "មិន​អាច​ចាក់​សោ​��​ទាញ​យក​បាន​ឡើយ"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​�ាងក្នុង កញ្ចប់​ដំឡើង​�្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​�ូច !"
@@ -316,7 +350,7 @@ 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 "បានបញ្ចប់ការទាញ​យក​ ហើយ​�ែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
@@ -694,9 +728,231 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "រក​កញ្ចប់​មិន​ឃើញ"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "មិន​អាច​កំណ�់​ទី�ាំង​កញ្ចប់ %s បានឡើយ"
+
+#: 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 "ឃ្លាំង​សម្ងា�់​ឋិ�នៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទ�"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+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
+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 "(គ្មាន)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  �្ទាស់​កញ្ចប់ ៖ "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  �ារាង​កំណែ ៖"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "មិនអាច�្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: 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 "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
+
+#: 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 "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
+
+#. 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 "�្រូវការ​យក​ %sB/%sB នៃ​ប�ណ្ណសារ​ប្រភព ។\n"
+
+#. 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 "�្រូវការ​យក​ %sB នៃ​ប�ណ្ណសារ​ប្រភព​ ។\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
+
+#: 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 "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ�យ​ ។\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "ពិនិ�្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ�យ​ ។\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "�្រូវ�ែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិ�្យ builddeps សម្រាប់"
+
+#: 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
+#, fuzzy, 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"
+msgstr "មិន​អាច​សាងសង់​​ព��៌មាន​ភាពអស្រ�យ​សម្រាប់ %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s មិនមានភាពអាស្រ�យ​ស្�ាបនាឡើយ​ ។\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "%s ភាពអស្រ�យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ព�ញចិ�្�​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s ភាពអស្រ�យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ព�ញចិ�្�​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "បរាជ�យ​ក្នុងការ​�ម្រូវចិ�្�ភាពអាស្រ�យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺ�្មីព�ក"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"ភាពអាស្រ�យ %s សម្រាប់ %s មិនអាច​�ម្រូវចិ�្�បានទ� ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​�ម្រូវចិ�្�​"
+"�ម្រូវការ​កំណែបានឡើយ"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "%s ភាពអស្រ�យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ព�ញចិ�្�​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "បរាជ�យ​ក្នុងការ​�ម្រូវចិ�្�ភាពអាស្រ�យ %s សម្រាប់ %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "ភាពអាស្រ�យ​ដែល​បង្កើ�​ %s មិន​អាច​បំព�ញ​ស�ចក្ដី​�្រូវការ​បាន​ទ� ។"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "បាន​បរាជ�យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើ�​ភាព​អាស្រ�យ"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -805,96 +1061,18 @@ 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 "មិន​អាច​កំណ�់​ទី�ាំង​កញ្ចប់ %s បានឡើយ"
-
-#: 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 "ឃ្លាំង​សម្ងា�់​ឋិ�នៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទ�"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "កញ្ចប់​ដែល​បាន​�្ទាស់ ៖"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(រក​មិន​ឃើញ)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  បាន​ដំឡើង ៖ "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  សាកល្បង ៖ "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(គ្មាន)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  �្ទាស់​កញ្ចប់ ៖ "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  �ារាង​កំណែ ៖"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"ការ​ប្រើប្រាស់ ៖ apt-cache [options] ពាក្យ​បញ្ជា\n"
-"       apt-cache [options] show pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache គឺ​ជា​ឧបករណ�​កម្រិ�ទាប​​ដែល​ប្រើ​សម្រាប់​រៀបចំ​ប្រព�ន្ធ​គោល​ពីរ​របស់  APT\n"
-"ឯកសារ​ឃ្លាំង​សម្ងា�់ និង ​ព��៌មាន​សំណួរ​ពី​ពួក​វា\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"ជម្រើស​ ៖\n"
-"  -h   ន�ះ​ជា​អ�្�ជំនួយ​\n"
-"  -p=? ឃ្លាំងសម្ងា�់​កញ្ចប់​ ។\n"
-"  -s=? ឃ្លាំងសម្ងា�់​ប្រភព ។\n"
-"  -q   ទ្រនិច​ចង្អុល​វឌ្�នភាព មិន​អនុញ្ញា�​ ។\n"
-"  -i   បាន​�ែ​បង្ហាញ ព��៌មាន​ deps ដែល​សំ�ាន់​សម្រាប់ពាក្យ​បញ្ជាដែល​�ុស​គ្នា  ​​​។\n"
-"  -c=? អាន​ការកំណ�់​រចនាសម្ព�ន្ធ​ឯកសារ​ន�ះ \n"
-"  -o=? កំណ�់​ជម្រើស​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​�ាម​ចិ�្� ឧ. eg -o dir::cache=/tmp\n"
-"មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព��៌មាន​បន្�ែម​​មាន​ក្នុង​ទំព�រ​សៀវភៅដៃ​ ។\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -928,7 +1106,11 @@ msgstr "បង្ហាញ ការរៀបចំ​គោលការណáŸ�â€
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -975,7 +1157,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1013,24 +1194,9 @@ msgstr "ធ្វើដំណើរការ​ន�ះ​ម្�ង​ទៀ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1041,23 +1207,9 @@ msgstr "​អាគុយម៉ង់​មិន​មាន​គូ​ទ�
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"ការ​ប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-config [ជម្រើស] \n"
-"\n"
-"apt-config ជា​ឧបករណ�​សាមញ្ញ​សម្រាប់​អាន​ឯកសារ​កំណ�់រចនាសម្ព�ន្ធ​ APT \n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"ជម្រើស​\n"
-"  -h   អ�្�នទ​ជំនួយ​ន�ះ​\n"
-"  -c=? អាន​ឯកសារ​ការកំណ�់​រចនាសម្ព�ន្ធ​ន�ះ \n"
-"  -o=? កំណ�់​ជម្រើស​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​�ាម​ចិ�្� ឧ. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1068,31 +1220,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "មិនអាច�្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទ�"
@@ -1113,174 +1240,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​�ាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យ�ូច​ឧបករណ�"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "មិន​អាច​ចាក់​សោ​��​ទាញ​យក​បាន​ឡើយ"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "យ៉ាងហោចណាស់​�្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "�្រូវការ​យក​ %sB/%sB នៃ​ប�ណ្ណសារ​ប្រភព ។\n"
-
-#. 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"
-msgstr "�្រូវការ​យក​ %sB នៃ​ប�ណ្ណសារ​ប្រភព​ ។\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "បរាជ�យ​ក្នុងការទៅប្រមូលយក​ប�ណ្ណសារ​មួយចំនួន ។"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ�យ​ ។\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "ពិនិ�្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ�យ​ ។\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "�្រូវ�ែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិ�្យ builddeps សម្រាប់"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "បាន​បរាជ�យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើ�​ភាព​អាស្រ�យ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "មិន​អាច​សាងសង់​​ព��៌មាន​ភាពអស្រ�យ​សម្រាប់ %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s មិនមានភាពអាស្រ�យ​ស្�ាបនាឡើយ​ ។\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "%s ភាពអស្រ�យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ព�ញចិ�្�​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s ភាពអស្រ�យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ព�ញចិ�្�​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "បរាជ�យ​ក្នុងការ​�ម្រូវចិ�្�ភាពអាស្រ�យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺ�្មីព�ក"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"ភាពអាស្រ�យ %s សម្រាប់ %s មិនអាច​�ម្រូវចិ�្�បានទ� ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​�ម្រូវចិ�្�​"
-"�ម្រូវការ​កំណែបានឡើយ"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "%s ភាពអស្រ�យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ព�ញចិ�្�​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "បរាជ�យ​ក្នុងការ​�ម្រូវចិ�្�ភាពអាស្រ�យ %s សម្រាប់ %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "ភាពអាស្រ�យ​ដែល​បង្កើ�​ %s មិន​អាច​បំព�ញ​ស�ចក្ដី​�្រូវការ​បាន​ទ� ។"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "បាន​បរាជ�យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើ�​ភាព​អាស្រ�យ"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "របៀបប្រើ ៖ ពាក្យបញ្ជា apt-get [options]\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,44 +1264,6 @@ msgstr ""
 "និង ដំឡើង ។\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"ជម្រើស ៖\n"
-"  -h  អ�្�បទ​ជំនួយ​ន�ះ ៖\n"
-"  -q  ទិន្នផល​ដែល​អាច​ចុះកំណ�់ហ��ុបាន - មិនមាន​ទ្រនិចបង្ហាញ​ដំណើរការឡើយ\n"
-"  -qq គ្មាន​លទ្ធផល​ទ� លើកលែង�ែ​កំហុស\n"
-"  -d  ទាញយក�ែប៉ុណ្ណោះ - កុំដំឡើង​ ឬ ស្រាយ​ប�ណ្ណសារ\n"
-"  -s  No-act. ធ្វើការ​ក្លែង​ការរៀប​�ាមលំដាប់\n"
-"  -y  សន្ម�​�ា បាទ/ចាស ទៅគ្រប់�ម្រូវការ ហើយកុំ​រំលឹក\n"
-"  -f  ប៉ុនប៉ង​ធ្វើការបន្�​ ប្រសិនបើ​ការពិនិ�្យ​ភាព�្រឹម�្រូវ​បរាជ�យ\n"
-"  -m  ប៉ុនប៉ង​ធ្វើការបន្�​ ប្រសិនបើ​ប�ណ្ណសារ​មិនអាច​ដាក់ទី�ាំងបាន\n"
-"  -u  បង្ហាញ​បញ្ជី​កញ្ចប់​ដែល​បានធ្វើឲ្យប្រសើរ​ផងដែរ\n"
-"  -b  ស្�ាបនា​កញ្ចប់ប្រភព បន្ទាប់ពី​ទៅប្រមូលយកវា\n"
-"  -V  បង្ហាញ​ល��កំណែ​ជា​អក្សរ\n"
-"  -c=? អាន​ឯកសារកំណ�់​រចនា​សម្ព�ន្ធ​ន�ះ\n"
-"  -o=? កំណ�់​ជម្រើស​កំណ�់រចនាសម្ព�ន្ធ​�ាមចិ�្�​មួយ ឧទ. -o dir::cache=/tmp\n"
-"សូមមើល 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-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "ទៅយក​បញ្ជី​កញ្ចប់​�្មី"
 
@@ -1407,11 +1342,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1485,20 +1417,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1987,17 +1908,13 @@ msgid "Merging available information"
 msgstr "បញ្ចូល​​ព��៌មាន​ដែលមាន​ចូល​គ្នា"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2030,13 +1947,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2057,25 +1968,10 @@ msgstr "មិន​ស្គាល់​កំណ�់​�្រា​កញ
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs ជា​ឧបករណ�​ធម្ម�ា​ដើម្បី​�ម្រៀប​ឯកសារ​កញ្ចប់ ។  ជម្រើស​ -s បាន​ប្រើ​\n"
-"សម្រាប់​ចង្អុល​ប្រភ�ទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
-"\n"
-"ជម្រើស​\n"
-"  -h   អ�្�បទ​ជំនួយ​ន�ះ​\n"
-"  -s   ប្រើ​ការ​�ម្រៀប​ឯកសារ​ប្រភព\n"
-"  -c=? អាន​ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធន�ះ​\n"
-"  -o=? កំណ�់​ជម្រើស​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​�ាម​ចិ�្� ឧ. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3779,6 +3675,121 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "ការ​ប្រើប្រាស់ ៖ apt-cache [options] ពាក្យ​បញ្ជា\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache គឺ​ជា​ឧបករណ�​កម្រិ�ទាប​​ដែល​ប្រើ​សម្រាប់​រៀបចំ​ប្រព�ន្ធ​គោល​ពីរ​របស់  APT\n"
+#~ "ឯកសារ​ឃ្លាំង​សម្ងា�់ និង ​ព��៌មាន​សំណួរ​ពី​ពួក​វា\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "ជម្រើស​ ៖\n"
+#~ "  -h   ន�ះ​ជា​អ�្�ជំនួយ​\n"
+#~ "  -p=? ឃ្លាំងសម្ងា�់​កញ្ចប់​ ។\n"
+#~ "  -s=? ឃ្លាំងសម្ងា�់​ប្រភព ។\n"
+#~ "  -q   ទ្រនិច​ចង្អុល​វឌ្�នភាព មិន​អនុញ្ញា�​ ។\n"
+#~ "  -i   បាន​�ែ​បង្ហាញ ព��៌មាន​ deps ដែល​សំ�ាន់​សម្រាប់ពាក្យ​បញ្ជាដែល​�ុស​គ្នា  ​​​។\n"
+#~ "  -c=? អាន​ការកំណ�់​រចនាសម្ព�ន្ធ​ឯកសារ​ន�ះ \n"
+#~ "  -o=? កំណ�់​ជម្រើស​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​�ាម​ចិ�្� ឧ. eg -o dir::cache=/tmp\n"
+#~ "មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព��៌មាន​បន្�ែម​​មាន​ក្នុង​ទំព�រ​សៀវភៅដៃ​ ។\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "ការ​ប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-config [ជម្រើស] \n"
+#~ "\n"
+#~ "apt-config ជា​ឧបករណ�​សាមញ្ញ​សម្រាប់​អាន​ឯកសារ​កំណ�់រចនាសម្ព�ន្ធ​ APT \n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "ជម្រើស​\n"
+#~ "  -h   អ�្�នទ​ជំនួយ​ន�ះ​\n"
+#~ "  -c=? អាន​ឯកសារ​ការកំណ�់​រចនាសម្ព�ន្ធ​ន�ះ \n"
+#~ "  -o=? កំណ�់​ជម្រើស​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​�ាម​ចិ�្� ឧ. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "ជម្រើស ៖\n"
+#~ "  -h  អ�្�បទ​ជំនួយ​ន�ះ ៖\n"
+#~ "  -q  ទិន្នផល​ដែល​អាច​ចុះកំណ�់ហ��ុបាន - មិនមាន​ទ្រនិចបង្ហាញ​ដំណើរការឡើយ\n"
+#~ "  -qq គ្មាន​លទ្ធផល​ទ� លើកលែង�ែ​កំហុស\n"
+#~ "  -d  ទាញយក�ែប៉ុណ្ណោះ - កុំដំឡើង​ ឬ ស្រាយ​ប�ណ្ណសារ\n"
+#~ "  -s  No-act. ធ្វើការ​ក្លែង​ការរៀប​�ាមលំដាប់\n"
+#~ "  -y  សន្ម�​�ា បាទ/ចាស ទៅគ្រប់�ម្រូវការ ហើយកុំ​រំលឹក\n"
+#~ "  -f  ប៉ុនប៉ង​ធ្វើការបន្�​ ប្រសិនបើ​ការពិនិ�្យ​ភាព�្រឹម�្រូវ​បរាជ�យ\n"
+#~ "  -m  ប៉ុនប៉ង​ធ្វើការបន្�​ ប្រសិនបើ​ប�ណ្ណសារ​មិនអាច​ដាក់ទី�ាំងបាន\n"
+#~ "  -u  បង្ហាញ​បញ្ជី​កញ្ចប់​ដែល​បានធ្វើឲ្យប្រសើរ​ផងដែរ\n"
+#~ "  -b  ស្�ាបនា​កញ្ចប់ប្រភព បន្ទាប់ពី​ទៅប្រមូលយកវា\n"
+#~ "  -V  បង្ហាញ​ល��កំណែ​ជា​អក្សរ\n"
+#~ "  -c=? អាន​ឯកសារកំណ�់​រចនា​សម្ព�ន្ធ​ន�ះ\n"
+#~ "  -o=? កំណ�់​ជម្រើស​កំណ�់រចនាសម្ព�ន្ធ​�ាមចិ�្�​មួយ ឧទ. -o dir::cache=/tmp\n"
+#~ "សូមមើល 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"
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs ជា​ឧបករណ�​ធម្ម�ា​ដើម្បី​�ម្រៀប​ឯកសារ​កញ្ចប់ ។  ជម្រើស​ -s បាន​ប្រើ​\n"
+#~ "សម្រាប់​ចង្អុល​ប្រភ�ទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
+#~ "\n"
+#~ "ជម្រើស​\n"
+#~ "  -h   អ�្�បទ​ជំនួយ​ន�ះ​\n"
+#~ "  -s   ប្រើ​ការ​�ម្រៀប​ឯកសារ​ប្រភព\n"
+#~ "  -c=? អាន​ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធន�ះ​\n"
+#~ "  -o=? កំណ�់​ជម្រើស​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​�ាម​ចិ�្� ឧ. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ�យ​"
 
diff --git a/po/ko.po b/po/ko.po
index 0a8f308cb..96de737df 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -169,6 +169,36 @@ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "주�, '%2$s' 대신� '%1$s' 패키지를 선�합니다\n"
 
+#: 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는 Super Cow Powers로 무장했습니다."
+
+#: 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 "경고: 다� 패키지를 ��할 수 없습니다!"
@@ -213,6 +243,10 @@ msgstr "%s� 여유 공간� �기를 파악할 수 없습니다"
 msgid "You don't have enough free space in %s."
 msgstr "%s 안� 충분한 여유 공간� 없습니다."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "다운로드 디렉터리를 잠글 수 없습니다"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. �가진 패키지�서 InstallPackages를 호출했습니다!"
@@ -313,7 +347,7 @@ 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 "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
@@ -692,9 +726,244 @@ msgstr[0] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "패키지가 없습니다"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%s 패키지를 찾� 수 없습니다"
+
+#: 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 "핀 패키지:"
+
+#: 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
+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 "(없�)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  패키지 핀: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  버전 테�블:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "소스 패키지로 '%s'�(를) '%s' 대신 선�합니다\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "'%2$s' 패키지� '%1$s' 버전� 없으므로 무시합니다."
+
+#: 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 "%s� 소스 패키지를 찾� 수 없습니다"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"알림: '%s' 패키징� 다� '%s' 버전 컨트롤 시스템�서 관리합니다:\n"
+"%s\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"패키지� 최근 (아마� 릴리스�지 않�) 업��트를 받으려면\n"
+"다�과 같� 하십시오:\n"
+"%s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "�미 다운로드 받� 파� '%s'�(는) 다시 받지 않고 건너 �니다.\n"
+
+#. 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 "소스 아카�브를 %s바�트/%s바�트 받아야 합니다.\n"
+
+#. 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 "소스 아카�브를 %s바�트 받아야 합니다.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "%s 소스를 가져옵니다\n"
+
+#: 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 "%s� �미 풀려 있는 소스� 압축� 풀지 않고 건너 �니다.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "압축 풀기 명령 '%s' 실패.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "'dpkg-dev' 패키지가 설치�었는지를 확�하십시오.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "빌드 명령 '%s' 실패.\n"
+
+#: 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
+#, fuzzy, 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"
+msgstr "%s� 빌드 �존성 정보를 가져올 수 없습니다"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s 패키지� 빌드 �존성� 없습니다.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
+"다"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
+"다"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"%2$s� 대한 %1$s �존성� 만족시키는� 실패했습니다: 설치한 %3$s 패키지가 너"
+"무 최근 버전입니다"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지� 사용 가능한 버"
+"전 중�서는 � 버전 요구사항� 만족시킬 수 없습니다"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
+"다"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%2$s� 대한 %1$s �존성� 만족시키는� 실패했습니다: %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s� 빌드 �존성� 만족시키지 못했습니다."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "빌드 �존성� 처리하는� 실패했습니다"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -799,96 +1068,18 @@ 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 "%s 패키지를 찾� 수 없습니다"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "핀 패키지:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(없�)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  설치: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  후보: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(없�)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  패키지 핀: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  버전 테�블:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"사용법: apt-cache [옵션] 명령\n"
-"        apt-cache [옵션] show 패키지1 [패키지2 ...]\n"
-"\n"
-"apt-cache는 APT� 바�너리 �시 파�� 처리하고, �시 파��\n"
-"정보를 질�하는 저수준 �구입니다.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"옵션:\n"
-"  -h   � �움�.\n"
-"  -p=? 패키지 �시.\n"
-"  -s=? 소스 �시.\n"
-"  -q   �태 표시를 하지 않습니다.\n"
-"  -i   unmet 명령�서 중요한 �존성만 봅니다.\n"
-"  -c=? 지정한 설정 파�� �습니다.\n"
-"  -o=? 임�� 옵션� 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-"좀 � �세한 정보는 apt-cache(8) � apt.conf(5) 매뉴얼 페�지를 보십시오.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -922,7 +1113,11 @@ msgstr "정책 설정� 봅니다"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -968,7 +1163,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1005,24 +1199,9 @@ msgstr "현재 갖고 있는 다른 CD�� � 과정� 반복하십시오."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1033,23 +1212,9 @@ msgstr "�수가 � 개가 아닙니다"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"사용법: apt-config [옵션] 명령\n"
-"\n"
-"apt-config는 APT 설정 파�� �는 간단한 프로그램입니다\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"옵션:\n"
-"  -h   � �움�.\n"
-"  -c=? 해당 설정 파�� �습니다\n"
-"  -o=? 임�� 옵션� 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1060,31 +1225,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "'%s' 정규�� 해당하는 패키지가 없습니다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "소스 패키지로 '%s'�(를) '%s' 대신 선�합니다\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "'%2$s' 패키지� '%1$s' 버전� 없으므로 무시합니다."
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾� 수 없습니다"
@@ -1105,187 +1245,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램� 무언가를 �가뜨렸습니다"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "다운로드 디렉터리를 잠글 수 없습니다"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "해당�는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "%s� 소스 패키지를 찾� 수 없습니다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"알림: '%s' 패키징� 다� '%s' 버전 컨트롤 시스템�서 관리합니다:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"패키지� 최근 (아마� 릴리스�지 않�) 업��트를 받으려면\n"
-"다�과 같� 하십시오:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "�미 다운로드 받� 파� '%s'�(는) 다시 받지 않고 건너 �니다.\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "소스 아카�브를 %s바�트/%s바�트 받아야 합니다.\n"
-
-#. 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"
-msgstr "소스 아카�브를 %s바�트 받아야 합니다.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "%s 소스를 가져옵니다\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "�부 아카�브를 가져오는� 실패했습니다."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s� �미 풀려 있는 소스� 압축� 풀지 않고 건너 �니다.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "압축 풀기 명령 '%s' 실패.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "'dpkg-dev' 패키지가 설치�었는지를 확�하십시오.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "빌드 명령 '%s' 실패.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "해당�는 빌드 �존성� 검사할 패키지를 최소한 하나 지정해야 합니다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "빌드 �존성� 처리하는� 실패했습니다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "%s� 빌드 �존성 정보를 가져올 수 없습니다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s 패키지� 빌드 �존성� 없습니다.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
-"다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
-"다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"%2$s� 대한 %1$s �존성� 만족시키는� 실패했습니다: 설치한 %3$s 패키지가 너"
-"무 최근 버전입니다"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지� 사용 가능한 버"
-"전 중�서는 � 버전 요구사항� 만족시킬 수 없습니다"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%2$s� 대한 %1$s �존성� 만족시킬 수 없습니다. %3$s 패키지를 찾� 수 없습니"
-"다"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s� 대한 %1$s �존성� 만족시키는� 실패했습니다: %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s� 빌드 �존성� 만족시키지 못했습니다."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "빌드 �존성� 처리하는� 실패했습니다"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "지�하는 모듈:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "사용법: apt-get [옵션] 명령어\n"
 "        apt-get [옵션] install|remove 패키지1 [패키지2 ...]\n"
@@ -1295,44 +1268,6 @@ msgstr ""
 "가장 �주 사용하는 명령� update와 install입니다.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"옵션:\n"
-"  -h  � �움�.\n"
-"  -q  기� 가능한 출력 - 진행 �황 표시를 하지 않습니다\n"
-"  -qq 오류만 출력 합니다\n"
-"  -d  내려받기만 합니다 - 아카�브를 설치하거나 풀거나 하지 않습니다\n"
-"  -s  실제 작업� 하지 않고, 순서대로 시뮬레�션만 합니다\n"
-"  -y  모든 질문� 대해 \"예\"�고 가정하고 물어보지 않습니다\n"
-"  -f  패키지 내용 검사가 실패해� 계� 진행해봅니다\n"
-"  -m  아카�브를 찾� 수 없어� 계� 진행해봅니다\n"
-"  -u  업그레�드하는 패키지� 목�� 봅니다\n"
-"  -b  소스 패키지를 받� 다�� 빌드합니다\n"
-"  -V  버전 번호를 �세히 봅니다\n"
-"  -c=? � 설정 파�� �습니다\n"
-"  -o=? 임�� 옵션� 지정합니다. 예를 들어 -o dir::cache=/tmp\n"
-"� �세한 정보와 옵션� 보려면 apt-get(8), sources.list(5)나\n"
-"apt.conf(5) 매뉴얼 페�지를 보십시오.\n"
-"                       � APT는 Super Cow Powers로 무장했습니다.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "패키지 목�� 새로 가져옵니다"
 
@@ -1411,11 +1346,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1489,20 +1421,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1992,17 +1913,13 @@ msgid "Merging available information"
 msgstr "�용 가능 패키지 정보를 합칩니다"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "사용법: apt-extracttemplates 파�1 [파�2 ...]\n"
 "\n"
@@ -2035,13 +1952,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "사용법: apt-extracttemplates 파�1 [파�2 ...]\n"
 "\n"
@@ -2062,26 +1973,10 @@ msgstr "알 수 없는 패키지 기�!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"사용법: apt-sortpkgs [옵션] 파�1 [파�2 ...]\n"
-"\n"
-"apt-sortpkgs는 패키지 파�� 정렬하는 간단한 �구입니다. -s 옵션� 무슨 파�"
-"�지\n"
-"알아 내는� 쓰입니다.\n"
-"\n"
-"옵션:\n"
-"  -h   � �움�\n"
-"  -s   소스 파� 정렬� 사용합니다\n"
-"  -c=? � 설정 파�� �습니다\n"
-"  -o=? 임�� 옵션� 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3803,6 +3698,86 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "업그레�드를 계산하는 중입니다"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "사용법: apt-cache [옵션] 명령\n"
+#~ "        apt-cache [옵션] show 패키지1 [패키지2 ...]\n"
+#~ "\n"
+#~ "apt-cache는 APT� 바�너리 �시 파�� 처리하고, �시 파��\n"
+#~ "정보를 질�하는 저수준 �구입니다.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "옵션:\n"
+#~ "  -h   � �움�.\n"
+#~ "  -p=? 패키지 �시.\n"
+#~ "  -s=? 소스 �시.\n"
+#~ "  -q   �태 표시를 하지 않습니다.\n"
+#~ "  -i   unmet 명령�서 중요한 �존성만 봅니다.\n"
+#~ "  -c=? 지정한 설정 파�� �습니다.\n"
+#~ "  -o=? 임�� 옵션� 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+#~ "좀 � �세한 정보는 apt-cache(8) � apt.conf(5) 매뉴얼 페�지를 보십시"
+#~ "오.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "사용법: apt-config [옵션] 명령\n"
+#~ "\n"
+#~ "apt-config는 APT 설정 파�� �는 간단한 프로그램입니다\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "옵션:\n"
+#~ "  -h   � �움�.\n"
+#~ "  -c=? 해당 설정 파�� �습니다\n"
+#~ "  -o=? 임�� 옵션� 설정합니다. 예를 들어 -o dir::cache=/tmp\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"
+#~ msgstr ""
+#~ "사용법: apt-sortpkgs [옵션] 파�1 [파�2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs는 패키지 파�� 정렬하는 간단한 �구입니다. -s 옵션� 무슨 파"
+#~ "��지\n"
+#~ "알아 내는� 쓰입니다.\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -h   � �움�\n"
+#~ "  -s   소스 파� 정렬� 사용합니다\n"
+#~ "  -c=? � 설정 파�� �습니다\n"
+#~ "  -o=? 임�� 옵션� 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "하위 프로세스가 실패했습니다"
 
diff --git a/po/ku.po b/po/ku.po
index 25b4b4ba7..92e30d5e7 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -168,6 +168,36 @@ 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 "Pakêt nayên dîtin"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
@@ -211,6 +241,10 @@ msgstr "Nikarî cihê vala li %s tesbît bike"
 msgid "You don't have enough free space in %s."
 msgstr "Cihê vala li %s têre nake."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Pelrêça daxistinê nayê quflekirin"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -301,7 +335,7 @@ msgstr "Dixwazî bidomînî?"
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 
-#: 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 ""
 
@@ -670,9 +704,229 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Pakêt nayên dîtin"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pelgehên Pakêt:"
+
+#: 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 ""
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nehate dîtin)"
+
+#. 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 "  Sazkirî: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Berendam: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ne tiÅŸtek)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Destika pakêtê:"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabloya guhertoyan:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: 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 "Çavkanîna %s bîne\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Anîna çend arşîvan biserneket."
+
+#: 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
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+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"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr ""
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -780,81 +1034,17 @@ msgstr "Cihê giştî yê veqetandî: "
 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 "Pakêt nehate dîtin %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pelgehên Pakêt:"
-
-#: 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
-msgid "Pinned packages:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nehate dîtin)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Sazkirî: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Berendam: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ne tiÅŸtek)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Destika pakêtê:"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabloya guhertoyan:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
@@ -889,7 +1079,11 @@ msgstr ""
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -936,7 +1130,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -973,24 +1166,9 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1001,24 +1179,9 @@ msgstr ""
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Bikaranîn: apt-config [vebijark] ferman\n"
-"\n"
-"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Vebijark:\n"
-"  -h Ev dosyeya alîkariyê ye.\n"
-"  -c=? Dosyeya mîhengan nîşan dide\n"
-"  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
-"mînak -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1029,31 +1192,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nikarî pakêta %s bibîne"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nikarî pakêta %s bibîne"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nikarî pakêta %s bibîne"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
@@ -1074,160 +1212,6 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Pelrêça daxistinê nayê quflekirin"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.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
-#: cmdline/apt-get.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
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Çavkanîna %s bîne\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Anîna çend arşîvan biserneket."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr ""
 
@@ -1237,30 +1221,10 @@ msgid ""
 "       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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid ""
-"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"
+"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
@@ -1341,11 +1305,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1419,20 +1380,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1922,14 +1872,9 @@ msgstr ""
 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
@@ -1952,13 +1897,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Bikaranîn: apt-config [vebijark] ferman\n"
 "apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
@@ -1981,14 +1920,9 @@ msgstr ""
 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"
+"It sorts by default 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
@@ -3638,6 +3572,27 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Bilindkirin tê hesibandin"
 
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Bikaranîn: apt-config [vebijark] ferman\n"
+#~ "\n"
+#~ "apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Vebijark:\n"
+#~ "  -h Ev dosyeya alîkariyê ye.\n"
+#~ "  -c=? Dosyeya mîhengan nîşan dide\n"
+#~ "  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar "
+#~ "bike. mînak -o dir::cache=/tmp\n"
+
 #, fuzzy
 #~ msgid "Must specifc at least one srv record"
 #~ msgstr "Pêwist e tu mînakekê bidî"
diff --git a/po/lt.po b/po/lt.po
index f81726576..0f4a3ee84 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -175,6 +175,36 @@ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
+#: 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 "Paketų nerasta"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
@@ -219,6 +249,10 @@ msgstr "Nepavyko nustatyti %s laisvos vietos"
 msgid "You don't have enough free space in %s."
 msgstr "%s nÄ—ra pakankamai laisvos vietos."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Nepavyko užrakinti parsiuntimų aplanko"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -314,7 +348,7 @@ msgstr "Ar norite tęsti?"
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiųsti kai kurių failų"
 
-#: 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 "Pavyko parsiųsti tik parsiuntimo režime"
 
@@ -693,9 +727,236 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Paketų nerasta"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Paketų failai:"
+
+#: 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 "Surišti paketai:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nerasta)"
+
+#. 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 "  Įdiegta: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidatas: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(nÄ—ra)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Paketo susiejimai: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versijų lentelė:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nepavyko rasti paketo %s"
+
+#: 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 "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
+
+#: 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 "Praleidžiama jau parsiųsta byla „%s“\n"
+
+#. 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 "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
+
+#. 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 "Reikia parsiųsti %sB išeities archyvų.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Parsiun�iamas archyvas %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Nepavyko gauti kai kurių arhcyvų."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
+
+#: 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"
+msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
+"per naujas"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
+"versijos %s paketo"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Nepavyko patenkinti %s priklausomybÄ—s %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr ""
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr ""
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -804,81 +1065,17 @@ 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 "Nepavyko rasti paketo %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Paketų failai:"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "Surišti paketai:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nerasta)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Įdiegta: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidatas: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(nÄ—ra)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Paketo susiejimai: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versijų lentelė:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
@@ -915,7 +1112,11 @@ msgstr ""
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -962,7 +1163,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -999,24 +1199,9 @@ msgstr "Pakartokite Å¡itÄ… procesÄ… su kitais CD savo rinkinyje."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1027,23 +1212,9 @@ msgstr "Parametrai nurodyti ne poromis"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Panaudojimas: apt-config [parametrai] komanda\n"
-"\n"
-"apt-config yra paprastas įrankis nuskaityti APT konfigūracijos failui\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Parinktys:\n"
-"  -h Å is pagalbos ekranas.\n"
-"  -c=? Nuskaityti pateiktą konfigūracijos failą\n"
-"  -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1054,31 +1225,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nepavyko rasti paketo %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nepavyko rasti paketo %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nepavyko rasti paketo %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
@@ -1099,167 +1245,6 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
-
-#. 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"
-msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Parsiun�iamas archyvas %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Nepavyko gauti kai kurių arhcyvų."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
-"per naujas"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
-"versijos %s paketo"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Nepavyko patenkinti %s priklausomybÄ—s %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
@@ -1269,30 +1254,10 @@ msgid ""
 "       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"
-msgstr ""
-
-#: cmdline/apt-get.cc
-msgid ""
-"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"
+"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
@@ -1377,11 +1342,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1455,20 +1417,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1957,17 +1908,13 @@ msgid "Merging available information"
 msgstr "Sujungiama turima informaija"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
 "\n"
@@ -2001,13 +1948,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
 "\n"
@@ -2029,26 +1970,10 @@ msgstr "Nežinomas paketo įrašas!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n"
-"\n"
-"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata "
-"naudojama\n"
-"norint nusakyti bylos tipÄ….\n"
-"\n"
-"Parametrai:\n"
-"  -h Å is pagalbos tekstas\n"
-"  -s Naudoti išeities kodo bylos rūšiavimą\n"
-"  -c=? Nuskaityti šią konfigūracijos bylą\n"
-"  -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3748,6 +3673,52 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Skai�iuojami atnaujinimai"
 
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Panaudojimas: apt-config [parametrai] komanda\n"
+#~ "\n"
+#~ "apt-config yra paprastas įrankis nuskaityti APT konfigūracijos failui\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Parinktys:\n"
+#~ "  -h Å is pagalbos ekranas.\n"
+#~ "  -c=? Nuskaityti pateiktą konfigūracijos failą\n"
+#~ "  -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/"
+#~ "tmp\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"
+#~ msgstr ""
+#~ "Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s "
+#~ "nuostata naudojama\n"
+#~ "norint nusakyti bylos tipÄ….\n"
+#~ "\n"
+#~ "Parametrai:\n"
+#~ "  -h Å is pagalbos tekstas\n"
+#~ "  -s Naudoti išeities kodo bylos rūšiavimą\n"
+#~ "  -c=? Nuskaityti šią konfigūracijos bylą\n"
+#~ "  -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Klaida procese-palikuonyje"
 
diff --git a/po/mr.po b/po/mr.po
index 1b9ef85f1..06b4e7ad2 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -171,6 +171,36 @@ msgstr "%s पॅकेज संस�थापित केलेले ना
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "लक�षात घ�या,%s �वजी %s ची निवड करत आहे \n"
 
+#: 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 ला स�पर काऊ पॉवर�स आहेत"
+
+#: 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 "धोक�याची सूचना:खालील पॅकेजेस� प�रमाणित कर� शकत नाही! "
@@ -216,6 +246,10 @@ msgstr "%s मधà¥�ये रिकामी जागा सांगू शà¤
 msgid "You don't have enough free space in %s."
 msgstr "%s मध�ये त�मच�याकडे प�रेशी जागा नाही."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "डाऊनलोड डिरेक�टरी क�लूपबंद करण�यास असमर�थ"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर�गत त�र�टी, त�टलेल�या पॅकेजेस बरोबर  संस�थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
@@ -312,7 +346,7 @@ msgstr "त�म�हाला प�ढे जायचे आहे [Y/n]? "
 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 "डाऊनलोड संपूर�ण आणि डाऊनलोड मध�ये फक�त पद�धती"
 
@@ -695,9 +729,231 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "पॅकेजेस सापडले नाहीत"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "पॅकेज %s शोधण�यास असमर�थ आहे"
+
+#: 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 "�कत�रित पॅकेजेस:"
+
+#: 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
+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 "(कोणताच नाही)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "पॅकेज (पिन):"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "आवृत�ती कोष�टक:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "%s पॅकेज सापडू शकले नाही"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "%s उगम पॅकेज यादी स�रू करता येत नाही"
+
+#: 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 "%s उगम पॅकेज शोधणे शक�य नाही/शोधण�यास असमर�थ आहे"
+
+#: 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 "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द�या\n"
+
+#. 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 "उगम अर�काईव�हज चा %sB/%sB घेण�याची गरज आहे.\n"
+
+#. 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 "उगम अर�काईव�हजचा %sB घेण�याची गरज आहे.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "%s उगम घ�या\n"
+
+#: 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 "%s मध�ये आधीच उघडलेल�या उगमातील उघडलेल�याला सोडून द�या किंवा वगळा\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "'%s' आज�ञा स�ट�या करण�यास असमर�थ.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "'dpkg-dev' पॅकेज संस�थापित केले आहे का ते पडताळून पहा.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "बांधणी करणाऱ�या आज�ञा '%s' अयशस�वी.\n"
+
+#: 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
+#, fuzzy, 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"
+msgstr "%s साठी बांधणी डिपेंडन�सी माहिती मिळवण�यास असमर�थ"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s ला बांधणी डिपेंडन�स नाहीत.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "%s पॅकेज न सापडल�याने %s साठी %s डिपेंडन�सी पूर�ण होऊ शकत नाही"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s पॅकेज न सापडल�याने %s साठी %s डिपेंडन�सी पूर�ण होऊ शकत नाही"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "%s अवलंबित�व %s साठी पूर�ण होण�यास असमर�थ: संस�थापित पॅकेज %s खूपच नवीन आहे"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"आवृतीची मागणी पूर�ण करण�यासाठी %s पॅकेजची आवृत�ती उपलब�ध नाही,त�याम�ळे %s साठी %s "
+"डिपेंडन�सी पूर�ण होऊ शकत नाही"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "%s पॅकेज न सापडल�याने %s साठी %s डिपेंडन�सी पूर�ण होऊ शकत नाही"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%s साठी %s डिपेंडन�सी पूर�ण होण�यास असमर�थ: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s साठी बांधणी-डिपेंडन�सीज पूर�ण होऊ शकत नाही."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "बांधणी-डिपेंडन�सीज क�रिया पूर�ण करण�यास असमर�थ "
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -804,97 +1060,18 @@ 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 "पॅकेज %s शोधण�यास असमर�थ आहे"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "�कत�रित पॅकेजेस:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(मिळाले नाही)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "अधिष�ठापित केले:"
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "उमेदवार:"
-
 #: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(कोणताच नाही)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "पॅकेज (पिन):"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "आवृत�ती कोष�टक:"
-
-#: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"वापर:  apt-cache [options] command\n"
-"       apt-cache [options] show pkg1 [pkg2 ...]\n"
-"\n"
-"�प�टच�या द�वयंक कॅश संचिका कौशल�याने हाताळण�यासाठी, व त�यांमधील माहितीची विचारणा "
-"करण�यासाठी �प�ट -कॅश हे निम�नस�तरीय साधन आहे।\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"पर�याय : \n"
-"-h -हा साह�याकारी मजकूर\n"
-"-p=? पॅकेज कॅश \n"
-"-s=? उगमस�थान कॅश \n"
-"-q-प�रगतीनिदर�शक अकार�यान�वित करा \n"
-"-i -न आढळलेल�या आज�ञेसाठी महत�त�वाचे विभाग दाखवा\n"
-"-c=? ही संरचना संचिका वाचा\n"
-"-o=? �खादा अहेतूक संरचना पर�याय निर�धारित करा उदा --o dir::cache=/tmp\n"
-"अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन�य�अल पृष�ठे पहा \n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -928,7 +1105,11 @@ msgstr "धोरण निर�धारणे दाखवा"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -974,7 +1155,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1012,24 +1192,9 @@ msgstr "त�मच�या संचामधील सर�व सीडी
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1040,15 +1205,8 @@ msgstr "चलितमूल�य जोडीने नाहीत"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
 
 #: cmdline/apt-config.cc
@@ -1060,31 +1218,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "%s उगम पॅकेज यादी स�रू करता येत नाही"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
@@ -1105,174 +1238,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर�गत त�र�टी, अडचण निवारकाने स�टफला तोडले"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "डाऊनलोड डिरेक�टरी क�लूपबंद करण�यास असमर�थ"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "उगम शोधण�यासाठी किमान �क पॅकेज देणे/सांगणे गरजेचे आहे"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "%s उगम पॅकेज शोधणे शक�य नाही/शोधण�यास असमर�थ आहे"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द�या\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "उगम अर�काईव�हज चा %sB/%sB घेण�याची गरज आहे.\n"
-
-#. 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"
-msgstr "उगम अर�काईव�हजचा %sB घेण�याची गरज आहे.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "%s उगम घ�या\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "काही अर�काईव�हज आणण�यास असमर�थ."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s मध�ये आधीच उघडलेल�या उगमातील उघडलेल�याला सोडून द�या किंवा वगळा\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "'%s' आज�ञा स�ट�या करण�यास असमर�थ.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "'dpkg-dev' पॅकेज संस�थापित केले आहे का ते पडताळून पहा.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "बांधणी करणाऱ�या आज�ञा '%s' अयशस�वी.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "बिल�डेपस� कशासाठी ते पडताळण�यासाठी किमान �क पॅकेज सांगणे गरजेचे आहे"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "बांधणी-डिपेंडन�सीज क�रिया पूर�ण करण�यास असमर�थ "
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "%s साठी बांधणी डिपेंडन�सी माहिती मिळवण�यास असमर�थ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s ला बांधणी डिपेंडन�स नाहीत.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "%s पॅकेज न सापडल�याने %s साठी %s डिपेंडन�सी पूर�ण होऊ शकत नाही"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s पॅकेज न सापडल�याने %s साठी %s डिपेंडन�सी पूर�ण होऊ शकत नाही"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "%s अवलंबित�व %s साठी पूर�ण होण�यास असमर�थ: संस�थापित पॅकेज %s खूपच नवीन आहे"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"आवृतीची मागणी पूर�ण करण�यासाठी %s पॅकेजची आवृत�ती उपलब�ध नाही,त�याम�ळे %s साठी %s "
-"डिपेंडन�सी पूर�ण होऊ शकत नाही"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "%s पॅकेज न सापडल�याने %s साठी %s डिपेंडन�सी पूर�ण होऊ शकत नाही"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%s साठी %s डिपेंडन�सी पूर�ण होण�यास असमर�थ: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s साठी बांधणी-डिपेंडन�सीज पूर�ण होऊ शकत नाही."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "बांधणी-डिपेंडन�सीज क�रिया पूर�ण करण�यास असमर�थ "
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "प�रोग�राम गटाला तांत�रिक मदत दिली:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "वापर: apt-get [options] command\n"
 "      apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1283,44 +1262,6 @@ msgstr ""
 "आणि संस�थापित करा\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"पर�याय:\n"
-"   -h     हा मदत मजकूर.\n"
-"   -q     नोंद करण�यासारखे आऊटप�ट-प�रगती निदर�शक नाही\n"
-"   -qq   त�र�टींव�यतिरिक�त आऊटप�ट नाही\n"
-"   -d   -  डाऊनलोड फक�त - अर�काईव�हज संस�थापित किंवा उघडू नका\n"
-"   -s      क�रिया नाही-\n"
-"   -y     सगळ�या प�रश�नांना 'हो' समजा. व प�रॉम�पट� करू नका.\n"
-"   -f      डिपेन�डन�सीज त�टलेल�या प�रणालीत द उर�स�ती करण�याचा प�रयत�न करा\n"
-"   -m     अर�काईव�हज सापडत नसतील तर प�ढे जाण�याचा प�रयत�न करा\n"
-"   -u      पॅकेजच�या प�ढिल आवृत�त�यांची यादी देखील दाखवा.\n"
-"   -b      मिळवल�यानंतर उगमस�थान पॅकेजची बांधणी करा\n"
-"   -V      व�हरबोस आवृत�ती क�रमांक दाखवा\n"
-"   -c=?-  ही संरचना फाईल वाचा\n"
-"   -o=?-  अनियंत�रित संरचना पर�याय निश�चित करा,उदा -o dir::cache=/tmp\n"
-"अधिक माहिती व पर�यायांसाठी apt-get(8), sources.list(5),आणि\n"
-" apt.conf(5)  प�स�तिका पाने पहा.\n"
-"         ह�या APT ला स�पर काऊ पॉवर�स आहेत\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "पॅकेजच�या नव�या याद�यां प�राप�त करा"
 
@@ -1399,11 +1340,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1477,20 +1415,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1982,17 +1909,13 @@ msgid "Merging available information"
 msgstr "उपलब�ध माहितीचे �कत�रीकरण करत आहे"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "उपयोग : �प�ट - �क�स�ट�रॅक�ट टेंप�लेट�स संचिका १[संचिका २..... ]\n"
 " \n"
@@ -2025,13 +1948,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "उपयोग : �प�ट - �क�स�ट�रॅक�ट टेंप�लेट�स संचिका १[संचिका २..... ]\n"
 " \n"
@@ -2052,26 +1969,10 @@ msgstr "अनोळखी पॅकेज माहिती संच!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"वापर:apt-sortpkgs [पर�याय] फाईल१[फाईल २...]\n"
-"\n"
-" apt-sortpkgs हे पॅकेज फाईल�सचं वर�गीकरण करणारी �क साधी आज�ञावली आहे. -s  पर�याय हा "
-"फाईल\n"
-"क�ठल�या प�रकारची आहे हे दाखवण�यासाठी वापरतात.\n"
-"\n"
-"पर�याय\n"
-"   -h     हा मदत मजकूर\n"
-"   -s     उगमस�थान फाईल वापरा\n"
-"   -c=?   ही संरचना फाईल वाचा\n"
-"   -o=?-  अनियंत�रित संरचना पर�याय निश�चित करा,eg -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3781,6 +3682,66 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "प�ढिल आवृत�तीची गणती करीत आहे"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "वापर:  apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "�प�टच�या द�वयंक कॅश संचिका कौशल�याने हाताळण�यासाठी, व त�यांमधील माहितीची विचारणा "
+#~ "करण�यासाठी �प�ट -कॅश हे निम�नस�तरीय साधन आहे।\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "पर�याय : \n"
+#~ "-h -हा साह�याकारी मजकूर\n"
+#~ "-p=? पॅकेज कॅश \n"
+#~ "-s=? उगमस�थान कॅश \n"
+#~ "-q-प�रगतीनिदर�शक अकार�यान�वित करा \n"
+#~ "-i -न आढळलेल�या आज�ञेसाठी महत�त�वाचे विभाग दाखवा\n"
+#~ "-c=? ही संरचना संचिका वाचा\n"
+#~ "-o=? �खादा अहेतूक संरचना पर�याय निर�धारित करा उदा --o dir::cache=/tmp\n"
+#~ "अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन�य�अल पृष�ठे पहा \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"
+#~ msgstr ""
+#~ "वापर:apt-sortpkgs [पर�याय] फाईल१[फाईल २...]\n"
+#~ "\n"
+#~ " apt-sortpkgs हे पॅकेज फाईल�सचं वर�गीकरण करणारी �क साधी आज�ञावली आहे. -s  पर�याय "
+#~ "हा फाईल\n"
+#~ "क�ठल�या प�रकारची आहे हे दाखवण�यासाठी वापरतात.\n"
+#~ "\n"
+#~ "पर�याय\n"
+#~ "   -h     हा मदत मजकूर\n"
+#~ "   -s     उगमस�थान फाईल वापरा\n"
+#~ "   -c=?   ही संरचना फाईल वाचा\n"
+#~ "   -o=?-  अनियंत�रित संरचना पर�याय निश�चित करा,eg -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "चाईल�ड प�रक�रिया अयशस�वी"
 
diff --git a/po/nb.po b/po/nb.po
index 7da5afffe..e562b5e1a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -175,6 +175,36 @@ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Merk, velger «%s» istedenfor «%s»\n"
 
+#: 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 "Denne APT har kraften til en Superku."
+
+#: 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 "Fant ingen pakker"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
@@ -219,6 +249,10 @@ msgstr "Klarte ikke bestemme ledig plass i %s"
 msgid "You don't have enough free space in %s."
 msgstr "Dessverre, ikke nok ledig plass i %s"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Klarer ikke å låse nedlastingsmappa"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
@@ -317,7 +351,7 @@ msgstr "Vil du fortsette?"
 msgid "Some files failed to download"
 msgstr "Klarte ikke laste ned alle filene"
 
-#: 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 "Nedlasting fullført med innstillinga «bare nedlasting»"
 
@@ -708,9 +742,239 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Fant ingen pakker"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Klarer ikke å finne pakken %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pakkefiler:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "LÃ¥ste pakker:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(ikke funnet)"
+
+#. 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 "  Installert: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ingen)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pakke låst til: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versjonstabell:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Du må angi minst en pakke du vil ha kildekoden til"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Klarer ikke å finne en kildekodepakke for %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
+"%s\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"Bruk:\n"
+"%s\n"
+"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hopper over allerede nedlastet fil «%s»\n"
+
+#. 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 "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
+
+#. 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 "Trenger å skaffe %sB fra kildekodearkivet.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Skaffer kildekode %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Klarte ikke å skaffe alle arkivene."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Byggekommandoen «%s» mislyktes.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Klarte ikke å behandle forutsetningene for bygging"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s har ingen avhengigheter.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
+"%s er for ny"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
+"versjoner av pakken %s som oppfyller versjonskravene"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -816,99 +1080,20 @@ msgstr "Samlet mengde redegjort plass: "
 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 "Klarer ikke å finne pakken %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pakkefiler:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "LÃ¥ste pakker:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ikke funnet)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installert: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ingen)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pakke låst til: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versjonstabell:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Bruk: apt-cache [valg] kommando\n"
-"      apt-cache [valg] show pakke1 [pakke2 ...]\n"
-"\n"
-"apt-cache er et lavnivå-verktøy, som brukes til å håndtere APT sine binære\n"
-"lagerfiler, og spørre dem om informasjon.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Valg:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -p=? Pakkelageret.\n"
-"  -s=? Kildekodelageret.\n"
-"  -q   Ikke vis framdrift.\n"
-"  -i   Vis bare viktige avhengighetsforhold for kommandoen «unmet».\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-"Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Vis data om kildekoden"
 
@@ -940,7 +1125,11 @@ msgstr "Vis regelinnstillingerr"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -986,7 +1175,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1023,24 +1211,9 @@ msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1051,23 +1224,9 @@ msgstr "Ikke parvise argumenter"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Bruk: apt-config [innstillinger] kommando\n"
-"\n"
-"apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1078,31 +1237,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Klarte ikke finne noen pakken med regex «%s»"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Klarte ikke finne noen pakken med regex «%s»"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Klarte ikke finne noen pakken med regex «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
@@ -1123,181 +1257,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Klarer ikke å låse nedlastingsmappa"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Klarer ikke å finne en kildekodepakke for %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Bruk:\n"
-"%s\n"
-"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Hopper over allerede nedlastet fil «%s»\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
-
-#. 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"
-msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Skaffer kildekode %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Klarte ikke å skaffe alle arkivene."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Byggekommandoen «%s» mislyktes.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Klarte ikke å behandle forutsetningene for bygging"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s har ingen avhengigheter.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
-"%s er for ny"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
-"versjoner av pakken %s som oppfyller versjonskravene"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Klarte ikke å behandle forutsetningene for bygging"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Bruk: apt-get [valg] kommando\n"
 "      apt-get [valg] install|remove pakke1 [pakke2 ...]\n"
@@ -1308,44 +1281,6 @@ msgstr ""
 "er «update» og «install».\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Valg:\n"
-"  -h  Denne hjelpteksten.\n"
-"  -q  Loggbar tilbakemelding - ikke vis framdrift\n"
-"  -qq Ingen tilbakemelding - bortsett fra feilmeldinger\n"
-"  -d  Bare nedlasting - IKKE installér eller pakk ut arkivfilene\n"
-"  -s  Simulering - bare simuler kommandoen\n"
-"  -y  Anta Ja til alle forespørsler uten å spørre\n"
-"  -f  Prøv å fortsette hvis integritetstesten mislykkes\n"
-"  -m  Prøv å fortsette når pakker mangler\n"
-"  -u  Vis liste med oppgraderte pakker\n"
-"  -b  Bygg pakken etter at kildekoden er lastet ned\n"
-"  -V  Vis fullstendige versjonsnummere\n"
-"  -c=? Les denne innstillingsfila\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-"Les manualsiden apt-get(8), sources.list(5) og apt.conf(5)\n"
-"for mer informasjon og flere valg.\n"
-"                       Denne APT har kraften til en Superku.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Hent nye pakkelister"
 
@@ -1424,11 +1359,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1502,20 +1434,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2011,17 +1932,13 @@ msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
 "\n"
@@ -2055,13 +1972,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
 "\n"
@@ -2083,25 +1994,10 @@ msgstr "Ukjent pakkeoppføring"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n"
-"-s brukes til å angi hvilken filtype det er.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -s   Bruk filsortering\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3835,6 +3731,86 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Beregner oppgradering"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Bruk: apt-cache [valg] kommando\n"
+#~ "      apt-cache [valg] show pakke1 [pakke2 ...]\n"
+#~ "\n"
+#~ "apt-cache er et lavnivå-verktøy, som brukes til å håndtere APT sine "
+#~ "binære\n"
+#~ "lagerfiler, og spørre dem om informasjon.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Valg:\n"
+#~ "  -h   Denne hjelpeteksten\n"
+#~ "  -p=? Pakkelageret.\n"
+#~ "  -s=? Kildekodelageret.\n"
+#~ "  -q   Ikke vis framdrift.\n"
+#~ "  -i   Vis bare viktige avhengighetsforhold for kommandoen «unmet».\n"
+#~ "  -c=? Les denne innstillingsfila.\n"
+#~ "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+#~ "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Bruk: apt-config [innstillinger] kommando\n"
+#~ "\n"
+#~ "apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Innstillinger:\n"
+#~ "  -h   Denne hjelpeteksten\n"
+#~ "  -c=? Les denne innstillingsfila.\n"
+#~ "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\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"
+#~ msgstr ""
+#~ "Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. "
+#~ "Innstillingen\n"
+#~ "-s brukes til å angi hvilken filtype det er.\n"
+#~ "\n"
+#~ "Innstillinger:\n"
+#~ "  -h   Denne hjelpeteksten\n"
+#~ "  -s   Bruk filsortering\n"
+#~ "  -c=? Les denne innstillingsfila.\n"
+#~ "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Barneprosessen mislyktes"
 
diff --git a/po/ne.po b/po/ne.po
index 72a7d8c2f..8a8b29f9f 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -171,6 +171,36 @@ msgstr "पà¥�याकेज %s सà¥�थापना भà¤�न, तà¥�यसà¥
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "द�रष�टब�य, %s को सट�टा  %s चयन भइरहेछ\n"
 
+#: 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 संग स�पर काउ शक�तिहरू छ ।"
+
+#: 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 "चेतावनी: निम�न प�याकलेजहरू प�रणाणीकरण ह�न सक�दैन! "
@@ -216,6 +246,10 @@ msgstr " %s मा खाली ठाऊà¤� निरà¥�धारण गरà¥�à
 msgid "You don't have enough free space in %s."
 msgstr "तपाई� संग %s मा पर�याप�त खाली ठाऊ� छैन ।"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "डाउनलोड डाइरेक�ट�री ताल�चा मार�न असक�षम"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन�तरिक त�र�टि, स�थापना प�याकेजहर�लाई भा�चि�को प�याकेज भनिन�थ�यो!"
@@ -312,7 +346,7 @@ 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 "डाउनलोड समाप�त भयो र डाउनलोडमा मोड मात�रै छ"
 
@@ -692,9 +726,231 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "क�नै प�याकेजहरू फेला परेन"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "प�याकेज %s तोक�न असक�षम भयो"
+
+#: 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 "क�यास sync  भन�दा बाहिर छ, प�याकेज फाइल x-ref गर�न सक�दैन"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+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
+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 "(क�नै पनि होइन)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "प�याकेज पिन:"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  संस�करण तालिका:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "प�याकेज फेला पार�न सकि�न  %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "प�याकेज फेला पार�न सकि�न  %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "प�याकेज फेला पार�न सकि�न  %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "स�रोत प�याकेज सूची %s स�थिर गर�न सकि�न "
+
+#: 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 "%s को लागि स�रोत प�याकेज फेला पार�न असफल भयो"
+
+#: 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 "पहिल�यै डाउनलोड भ�का फाइलहर� फड�काइदैछ '%s'\n"
+
+#. 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 "स�रोत संग�रहहर�को %sB/%sB प�राप�त गर�न आवश�यक छ ।\n"
+
+#. 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 "स�रोत संग�रहहर�को %sB प�राप�त गर�न आवश�यक छ ।\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "स�रोत फड�काउन�होस� %s\n"
+
+#: 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 " %s मा पहिल�यै अनप�याक गरि�का स�रोतको अनप�याक फड�काइदैछ\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "अनप�याक आदेश '%s' असफल भयो ।\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "जा�च�न�होस� यदि 'dpkg-dev' प�याकेज स�थापना भयो ।\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "निर�माण आदेश '%s' असफल भयो ।\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "को लागि builddeps जा�च�न कम�तिमा �उटा प�याकेज निर�दष�ट गर�न�पर�छ"
+
+#: 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
+#, fuzzy, 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"
+msgstr "%s को लागि निर�माण-निर�भरता सूचना प�राप�त गर�न असक�षम भयो"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s क�नै निर�माणमा आधारित ह�दैन ।\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "%s को लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किनभने प�याकेज %s फेला पार�न सकि�न"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s को लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किनभने प�याकेज %s फेला पार�न सकि�न"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "%s को लागि %s निर�भरता सन�त�ष�ट पार�न असफल भयो: स�थापित प�याकेज %s अति नया� छ"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"%sको लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किन भने प�याकेज %s को क�नै उपलब�ध संस�करणले संस�करण "
+"आवश�यकताहर�लाई सन�त�ष�ट पार�न सकेन "
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "%s को लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किनभने प�याकेज %s फेला पार�न सकि�न"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%s को लागि %s निर�भरता सन�त�ष�ट गर�न असफल: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s को लागि निर�माण निर�भरताहरू सन�त�ष�ट गर�न सकि�न । "
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "निर�माण निर�भरताहरू प�रक�रिया गर�न असफल"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -803,101 +1059,20 @@ 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 "प�याकेज %s तोक�न असक�षम भयो"
-
-#: 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 "क�यास sync  भन�दा बाहिर छ, प�याकेज फाइल x-ref गर�न सक�दैन"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "पिन गरि�का प�याकेजहरू:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(फेला परेन)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  स�थापना भयो:"
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  उमेद�वार:"
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(क�नै पनि होइन)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "प�याकेज पिन:"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  संस�करण तालिका:"
-
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"उपयोग: apt-cache [विकल�पहरू] आदेश\n"
-"       apt-cache [विकल�पहरू] फाइल १ थप�न�होस� [फाइल २ ...]\n"
-"       apt-cache [विकल�पहरू] pkg pkg1 देखाउन�होस� [pkg2 ...]\n"
-"       apt-cache [विकल�पहरू] src pkg1 देखाउन�होस� [pkg2 ...]\n"
-"\n"
-"तिनीहर�बाट APT's बिनारी क�यास फाइलहरू, र क�वेरी सूचना मिलाउन प�रयोग गरिने apt-cache "
-"कम-स�तरको उपकरण हो\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"विकल�पहरू:\n"
-"  -h   यो मद�दत पाठ ।\n"
-"  -p=? प�याकेज क�यास ।\n"
-"  -s=? स�रोत क�यास ।\n"
-"  -q   प�रगति सूचक अक�षम गर�न�होस� ।\n"
-"  -i   नभेटि�को आदेशको लागि महत�वपूर�ण deps देखाउन�होस� ।\n"
-"  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
-"  -o=? �उटा स�वेच�छाचारी कनफिगरेसन फाइल सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\n"
-"धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म�यान�ल पृष�टहरू हेर�न�होस�  ।\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "स�रोत रेकर�डहरू देखाउन�होस�"
 
@@ -929,7 +1104,11 @@ msgstr "नीति सेटिङà¥�गहरू देखाउनà¥�होà
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -976,7 +1155,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1014,24 +1192,9 @@ msgstr "तपाईà¤�को सेटमा बाà¤�की सि डि हà
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1042,23 +1205,9 @@ msgstr "तर�कहरू जोडामा छैन"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"उपयग: apt-config [विकल�पहरू] आदेश\n"
-"\n"
-" APT कनफिग फाइल पढ�नको लागि apt-config साधारण उपकरण हो\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"विकल�पहरू:\n"
-"  -h   यो मद�दत पाठ ।\n"
-"  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
-"  -o=? �उटा स�वेच�छाचारी कनफिगरेसन विकल�प सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1069,31 +1218,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "प�याकेज फेला पार�न सकि�न  %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "प�याकेज फेला पार�न सकि�न  %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "प�याकेज फेला पार�न सकि�न  %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "स�रोत प�याकेज सूची %s स�थिर गर�न सकि�न "
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प�याकेज फेला पार�न सकि�न  %s"
@@ -1114,174 +1238,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "आन�तरिक त�र�टि,समस�या हलकर�ताले उत�तम ग�ण भा�च�यो "
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "डाउनलोड डाइरेक�ट�री ताल�चा मार�न असक�षम"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "को लागि स�रोत तान�न कम�तिमा �उटा प�याकेज निर�दिष�ट गर�न�पर�छ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "%s को लागि स�रोत प�याकेज फेला पार�न असफल भयो"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "पहिल�यै डाउनलोड भ�का फाइलहर� फड�काइदैछ '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "स�रोत संग�रहहर�को %sB/%sB प�राप�त गर�न आवश�यक छ ।\n"
-
-#. 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"
-msgstr "स�रोत संग�रहहर�को %sB प�राप�त गर�न आवश�यक छ ।\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "स�रोत फड�काउन�होस� %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "केही संग�रह फड�काउन असफल भयो ।"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr " %s मा पहिल�यै अनप�याक गरि�का स�रोतको अनप�याक फड�काइदैछ\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "अनप�याक आदेश '%s' असफल भयो ।\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "जा�च�न�होस� यदि 'dpkg-dev' प�याकेज स�थापना भयो ।\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "निर�माण आदेश '%s' असफल भयो ।\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "को लागि builddeps जा�च�न कम�तिमा �उटा प�याकेज निर�दष�ट गर�न�पर�छ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "निर�माण निर�भरताहरू प�रक�रिया गर�न असफल"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "%s को लागि निर�माण-निर�भरता सूचना प�राप�त गर�न असक�षम भयो"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s क�नै निर�माणमा आधारित ह�दैन ।\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "%s को लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किनभने प�याकेज %s फेला पार�न सकि�न"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s को लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किनभने प�याकेज %s फेला पार�न सकि�न"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "%s को लागि %s निर�भरता सन�त�ष�ट पार�न असफल भयो: स�थापित प�याकेज %s अति नया� छ"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%sको लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किन भने प�याकेज %s को क�नै उपलब�ध संस�करणले संस�करण "
-"आवश�यकताहर�लाई सन�त�ष�ट पार�न सकेन "
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "%s को लागि %s निर�भरता सन�त�ष�ट ह�न सकेन किनभने प�याकेज %s फेला पार�न सकि�न"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%s को लागि %s निर�भरता सन�त�ष�ट गर�न असफल: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s को लागि निर�माण निर�भरताहरू सन�त�ष�ट गर�न सकि�न । "
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "निर�माण निर�भरताहरू प�रक�रिया गर�न असफल"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "समर�थित मोड�य�लहरू:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "उपयोग: apt-get [विकल�पहरू] आदेश\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,44 +1261,6 @@ msgstr ""
 "बारम�बार प�रयोग भइरहने आदेशहरू अद�यावधिक र स�थापना ह�न� ।\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"विकल�पहरू:\n"
-"  -h  यो मद�दत पाठ.\n"
-"  -q  लगयोग�य निर�गात - क�नै प�रगति सूचि छैन\n"
-"  -qq त�र�टिहर�को लागि निर�गात बाहेक केही छैन\n"
-"  -d  डाउनलोड मात�र - संग�रहहरू स�थापना वा अनप�याक नगर�न�होस�\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  सबै क�वेरीहर�लाई हो मान�न�होस� र दूषित नबनाउन�होस�\n"
-"  -f  यदि पूर�णर�पले जा�च असफल भयो भने निरन�तरता दिने प�रयत�न गर�न�होस�\n"
-"  -m  यदि संग�रहहर� स�थानियकरण योग�य छैन भने निरन�तरता दिने प�रयत�न दिन�होस�\n"
-"  -u  स�तर वृद�धि प�याकेजहर�को सूचि राम�रो संग देखाउन�होस�\n"
-"  -b  यसलाई तानिसके पछि स�रोत प�याकेज निर�माण गर�न�होस�\n"
-"  -V  भरबोस संस�करण नम�बरहरू देखाउन�होस�\n"
-"  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
-"  -o=? �उटा स�वेच�छाचारी कनफिगरेसन विकल�प सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\n"
-"धेरै सूचना र विकल�पको लागि apt-get(8), sources.list(5) र apt.conf(5) manual\n"
-"pages हेर�न�होस� ।\n"
-"                       APT संग स�पर काउ शक�तिहरू छ ।\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "जहर�को नया� सूचिहरू प�न:प�राप�त गर�न�होस�"
 
@@ -1407,11 +1339,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1485,20 +1414,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1990,17 +1908,13 @@ msgid "Merging available information"
 msgstr "उपलब�ध सूचना गा�भिदैछ"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "उपयोग: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2033,13 +1947,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "उपयोग: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2060,25 +1968,10 @@ msgstr "अज�ञात प�याकेज रेकर�ड!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs प�याकेज फाइलहरू क�रमबद�ध गर�ने साधारण उपकरण हो । -s विकल�प कस�तो खालको "
-"फाइल हो भनी इंकित गर�न प�रयोग गरिन�छ ।\n"
-"\n"
-"विकल�पहरू:\n"
-"  -h   यो मद�दत पाठ\n"
-"  -s   क�रमबद�ध स�रोत फाइल प�रयोग गर�न�होस�\n"
-"  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
-"  -o=? �उटा स�वेच�छाचारी कनफिगरेसन विकल�प सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3782,6 +3675,87 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "स�तर वृद�धि गणना गरिदैछ"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "उपयोग: apt-cache [विकल�पहरू] आदेश\n"
+#~ "       apt-cache [विकल�पहरू] फाइल १ थप�न�होस� [फाइल २ ...]\n"
+#~ "       apt-cache [विकल�पहरू] pkg pkg1 देखाउन�होस� [pkg2 ...]\n"
+#~ "       apt-cache [विकल�पहरू] src pkg1 देखाउन�होस� [pkg2 ...]\n"
+#~ "\n"
+#~ "तिनीहर�बाट APT's बिनारी क�यास फाइलहरू, र क�वेरी सूचना मिलाउन प�रयोग गरिने apt-"
+#~ "cache कम-स�तरको उपकरण हो\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "विकल�पहरू:\n"
+#~ "  -h   यो मद�दत पाठ ।\n"
+#~ "  -p=? प�याकेज क�यास ।\n"
+#~ "  -s=? स�रोत क�यास ।\n"
+#~ "  -q   प�रगति सूचक अक�षम गर�न�होस� ।\n"
+#~ "  -i   नभेटि�को आदेशको लागि महत�वपूर�ण deps देखाउन�होस� ।\n"
+#~ "  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
+#~ "  -o=? �उटा स�वेच�छाचारी कनफिगरेसन फाइल सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\n"
+#~ "धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म�यान�ल पृष�टहरू हेर�न�होस�  ।\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "उपयग: apt-config [विकल�पहरू] आदेश\n"
+#~ "\n"
+#~ " APT कनफिग फाइल पढ�नको लागि apt-config साधारण उपकरण हो\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "विकल�पहरू:\n"
+#~ "  -h   यो मद�दत पाठ ।\n"
+#~ "  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
+#~ "  -o=? �उटा स�वेच�छाचारी कनफिगरेसन विकल�प सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\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"
+#~ msgstr ""
+#~ "उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs प�याकेज फाइलहरू क�रमबद�ध गर�ने साधारण उपकरण हो । -s विकल�प कस�तो "
+#~ "खालको फाइल हो भनी इंकित गर�न प�रयोग गरिन�छ ।\n"
+#~ "\n"
+#~ "विकल�पहरू:\n"
+#~ "  -h   यो मद�दत पाठ\n"
+#~ "  -s   क�रमबद�ध स�रोत फाइल प�रयोग गर�न�होस�\n"
+#~ "  -c=? यो कनफिगरेसन फाइल पढ�न�होस�\n"
+#~ "  -o=? �उटा स�वेच�छाचारी कनफिगरेसन विकल�प सेट गर�न�होस�, जस�तै -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "शाखा प�रक�रिया असफल भयो"
 
diff --git a/po/nl.po b/po/nl.po
index 95e6f5612..462ead432 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-11-09 23:47+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -177,6 +177,36 @@ msgstr "Pakket '%s' is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Let op, '%s' wordt geselecteerd in plaats van '%s'\n"
 
+#: 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 "Deze APT heeft Super Koekracht."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Deze APT-helper heeft Super Koekracht."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Geen pakketten gevonden"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
@@ -222,6 +252,10 @@ msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
 msgid "You don't have enough free space in %s."
 msgstr "U heeft onvoldoende vrije schijfruimte op %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Kon de ophaalmap niet vergrendelen"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
@@ -319,7 +353,7 @@ msgstr "Wilt u doorgaan?"
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: 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 "Ophalen klaar en alleen-ophalen-modus staat aan"
 
@@ -716,9 +750,252 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr "geen echt pakket (virtueel)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Geen pakketten gevonden"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kan pakket %s niet vinden"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pakketbestanden:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Cache loopt niet synchroon, kruisverwijzing naar pakketbestand lukt niet"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Vastgepinde pakketten:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(niet gevonden)"
+
+#. 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 "  Geïnstalleerd: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidaat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(geen)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pakketpin: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versietabel:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Kan geen pakket vinden voor architectuur '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Kan geen pakket '%s' vinden met versienummer '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Kan geen pakket '%s' vinden uit de uitgave '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "'%s' wordt als bronpakket genomen in plaats van '%s'\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Kan versie '%s' van pakket '%s' niet vinden"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
+"worden"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Kan geen bronpakket vinden voor %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"MERK OP: Het verpakken van '%s' wordt bijgehouden in het versiebeheersysteem "
+"'%s' op:\n"
+"%s\n"
+
+#: 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 ""
+"Gebruik:\n"
+"%s\n"
+"om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket "
+"op te halen.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
+
+#. 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 "Moet %sB/%sB aan bronarchieven ophalen.\n"
+
+#. 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 "Moet %sB aan bronarchieven ophalen.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Ophalen bron %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Ophalen van sommige archieven is mislukt."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Uitpakopdracht '%s' is mislukt.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geïnstalleerd is.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Bouwopdracht '%s' is mislukt.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"U dient tenminste één pakket op te geven om er de bouwvereisten van te "
+"controleren"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Er is geen architectuurinformatie beschikbaar voor %s. Raadpleeg apt.conf(5) "
+"APT::Architectures om dit te configureren"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Verwerken van de bouwvereisten is mislukt"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s heeft geen bouwvereisten.\n"
+
+#: 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 ""
+"De vereiste %s van %s kan niet voldaan worden omdat %s niet toegestaan is "
+"voor de pakketten van '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"De vereiste %s van %s kan niet voldaan worden omdat pakket %s onvindbaar is"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Voldoen van vereiste %s van %s is mislukt: geïnstalleerd pakket %s is te "
+"nieuw"
+
+#: 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"
+msgstr ""
+"De vereiste %s van %s kan niet voldaan worden omdat de beschikbare versie "
+"van pakket %s niet aan de versievereisten voldoet"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"De vereiste %s van %s kan niet voldaan worden omdat er geen geschikte versie "
+"is van pakket %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Voldoen van de vereiste %s van %s is mislukt: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Bouwvereisten voor %s konden niet voldaan worden."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Verwerken van de bouwvereisten is mislukt"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -830,98 +1107,18 @@ msgstr ""
 "Dit commando is verouderd. Gelieve in de plaats 'apt-mark showauto' te "
 "gebruiken."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kan pakket %s niet vinden"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pakketbestanden:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Cache loopt niet synchroon, kruisverwijzing naar pakketbestand lukt niet"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Vastgepinde pakketten:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(niet gevonden)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Geïnstalleerd: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidaat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(geen)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pakketpin: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versietabel:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Gebruik: apt-cache [opties] opdracht\n"
-"         apt-cache [opties] show pakket1 [pakket2 ...]\n"
-"\n"
-"apt-cache is een basaal hulpmiddel waarmee u informatie kunt\n"
-"opvragen uit de binaire cachebestanden van APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Opdrachten:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opties:\n"
-"  -h   Deze hulptekst.\n"
-"  -p=? De pakketcache.\n"
-"  -s=? De broncache.\n"
-"  -q   Voortgangsindicator uitschakelen.\n"
-"  -i   Toon alleen belangrijke vereisten voor de 'unmet'-opdracht.\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-"Raadpleeg de man-pagina's van apt-cache(8) en apt.conf(5) voor meer "
-"informatie.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -955,11 +1152,12 @@ msgstr "Toon beleidsinstellingen"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Gebruik: apt [opties] opdracht\n"
-"\n"
-"CLI voor apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1002,7 +1200,6 @@ msgstr ""
 "waardeer het systeem op door pakketten te verwijderen/te installeren/op te "
 "waarderen"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1046,36 +1243,11 @@ msgstr "Dit proces dient herhaald te worden voor alle cd's in uw set."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Opties:\n"
-"  -h  Deze hulptekst\n"
-"  -q  Logbare uitvoer - geen voortgangsindicator\n"
-"  -qq Geen uitvoer behalve van foutmeldingen\n"
-"  -s  Doe-niets. Toont alleen wat gedaan zou worden.\n"
-"  -f  lees/schrijf auto/manueel markeringen in het vermelde bestand\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-"Raadpleeg de man-pagina's apt-mark(8) en apt.conf(5) voor meer informatie."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumenten niet in paren"
@@ -1084,24 +1256,9 @@ msgstr "Argumenten niet in paren"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Gebruik: apt-config [opties] opdracht\n"
-"\n"
-"apt-config is een eenvoudig hulpmiddel om het APT-configuratiebestand te "
-"lezen\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opties:\n"
-"  -h   Deze hulptekst.\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1113,31 +1270,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Kan geen pakket vinden voor architectuur '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Kan geen pakket '%s' vinden met versienummer '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Kan geen pakket '%s' vinden uit de uitgave '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "'%s' wordt als bronpakket genomen in plaats van '%s'\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Kan versie '%s' van pakket '%s' niet vinden"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
@@ -1159,194 +1291,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Kon de ophaalmap niet vergrendelen"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
-"worden"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Kan geen bronpakket vinden voor %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"MERK OP: Het verpakken van '%s' wordt bijgehouden in het versiebeheersysteem "
-"'%s' op:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Gebruik:\n"
-"%s\n"
-"om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket "
-"op te halen.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-
-#. 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"
-msgstr "Moet %sB aan bronarchieven ophalen.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Ophalen bron %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Ophalen van sommige archieven is mislukt."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Uitpakopdracht '%s' is mislukt.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geïnstalleerd is.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Bouwopdracht '%s' is mislukt.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"U dient tenminste één pakket op te geven om er de bouwvereisten van te "
-"controleren"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Er is geen architectuurinformatie beschikbaar voor %s. Raadpleeg apt.conf(5) "
-"APT::Architectures om dit te configureren"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Verwerken van de bouwvereisten is mislukt"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s heeft geen bouwvereisten.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"De vereiste %s van %s kan niet voldaan worden omdat %s niet toegestaan is "
-"voor de pakketten van '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"De vereiste %s van %s kan niet voldaan worden omdat pakket %s onvindbaar is"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Voldoen van vereiste %s van %s is mislukt: geïnstalleerd pakket %s is te "
-"nieuw"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"De vereiste %s van %s kan niet voldaan worden omdat de beschikbare versie "
-"van pakket %s niet aan de versievereisten voldoet"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"De vereiste %s van %s kan niet voldaan worden omdat er geen geschikte versie "
-"is van pakket %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Voldoen van de vereiste %s van %s is mislukt: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Verwerken van de bouwvereisten is mislukt"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Gebruik: apt-get [opties] opdracht\n"
 "         apt-get [opties] install|remove pakket1 [pakket2 ...]\n"
@@ -1357,44 +1315,6 @@ msgstr ""
 "'update' en 'install'.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opties:\n"
-"  -h   Deze hulptekst\n"
-"  -q   Logbare uitvoer - geen voortgangsindicator\n"
-"  -qq  Geen uitvoer behalve van foutmeldingen\n"
-"  -d   Alleen ophalen - archieven NIET installeren of uitpakken\n"
-"  -s   Doe-niets. Doe alleen sorteersimulatie\n"
-"  -y   Antwoord \"ja\" op alle vragen zonder ze te stellen\n"
-"  -f   Probeer een systeem met onvoldane afhankelijkheden te corrigeren\n"
-"  -m   Probeer door te gaan als archieven niet gevonden kunnen worden\n"
-"  -u   Toon ook een lijst van bijgewerkte pakketten\n"
-"  -b   Bouw het bronpakket nadat het is opgehaald\n"
-"  -V   Toon uitgebreide versienummers\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-"Raadpleeg de man-pagina's apt-get(8), sources.list(5) en apt.conf(5)\n"
-"voor meer informatie en opties.\n"
-"                       Deze APT heeft Super Koekracht.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Haal een nieuwe lijst van pakketten op"
 
@@ -1468,11 +1388,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Gebruik: apt-helper [opties] opdracht\n"
 "         apt-helper [opties] download-file uri doelpad\n"
@@ -1480,10 +1402,6 @@ msgstr ""
 "apt-helper is een intern hulpmiddel voor apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Deze APT-helper heeft Super Koekracht."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "haal opgegeven uri op en plaats in doelpad"
 
@@ -1550,11 +1468,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Gebruik: apt-mark [opties] {auto|manual} pakket1 [pakket2 ...]\n"
 "\n"
@@ -1563,28 +1484,6 @@ msgstr ""
 "Het kan ook een lijst met markeringen weergeven.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Opties:\n"
-"  -h  Deze hulptekst\n"
-"  -q  Logbare uitvoer - geen voortgangsindicator\n"
-"  -qq Geen uitvoer behalve van foutmeldingen\n"
-"  -s  Doe-niets. Toont alleen wat gedaan zou worden.\n"
-"  -f  lees/schrijf auto/manueel markeringen in het vermelde bestand\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-"Raadpleeg de man-pagina's apt-mark(8) en apt.conf(5) voor meer informatie."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Markeer het vermelde pakket als automatisch geïnstalleerd"
 
@@ -2083,17 +1982,13 @@ msgid "Merging available information"
 msgstr "De beschikbare informatie wordt samengevoegd"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
 "\n"
@@ -2121,17 +2016,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Gebruik: apt-internal-solver\n"
 "\n"
@@ -2152,25 +2042,10 @@ msgstr "Onbekend pakketrecord!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
-"\n"
-"apt-sortpkgs is een simpel hulpmiddel om pakketbestanden te sorteren.\n"
-"De -s optie wordt gebruikt om aan te geven om welk soort bestand het gaat.\n"
-"\n"
-"Opties:\n"
-"  -h   Deze hulptekst\n"
-"  -s   Sorteer bronbestanden\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3946,6 +3821,144 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Opwaardering wordt doorgerekend"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Gebruik: apt-cache [opties] opdracht\n"
+#~ "         apt-cache [opties] show pakket1 [pakket2 ...]\n"
+#~ "\n"
+#~ "apt-cache is een basaal hulpmiddel waarmee u informatie kunt\n"
+#~ "opvragen uit de binaire cachebestanden van APT\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Opdrachten:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opties:\n"
+#~ "  -h   Deze hulptekst.\n"
+#~ "  -p=? De pakketcache.\n"
+#~ "  -s=? De broncache.\n"
+#~ "  -q   Voortgangsindicator uitschakelen.\n"
+#~ "  -i   Toon alleen belangrijke vereisten voor de 'unmet'-opdracht.\n"
+#~ "  -c=? Lees dit configuratiebestand\n"
+#~ "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+#~ "Raadpleeg de man-pagina's van apt-cache(8) en apt.conf(5) voor meer "
+#~ "informatie.\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Gebruik: apt [opties] opdracht\n"
+#~ "\n"
+#~ "CLI voor apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Opties:\n"
+#~ "  -h  Deze hulptekst\n"
+#~ "  -q  Logbare uitvoer - geen voortgangsindicator\n"
+#~ "  -qq Geen uitvoer behalve van foutmeldingen\n"
+#~ "  -s  Doe-niets. Toont alleen wat gedaan zou worden.\n"
+#~ "  -f  lees/schrijf auto/manueel markeringen in het vermelde bestand\n"
+#~ "  -c=? Lees dit configuratiebestand\n"
+#~ "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+#~ "Raadpleeg de man-pagina's apt-mark(8) en apt.conf(5) voor meer informatie."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Gebruik: apt-config [opties] opdracht\n"
+#~ "\n"
+#~ "apt-config is een eenvoudig hulpmiddel om het APT-configuratiebestand te "
+#~ "lezen\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opties:\n"
+#~ "  -h   Deze hulptekst.\n"
+#~ "  -c=? Lees dit configuratiebestand\n"
+#~ "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Opties:\n"
+#~ "  -h  Deze hulptekst\n"
+#~ "  -q  Logbare uitvoer - geen voortgangsindicator\n"
+#~ "  -qq Geen uitvoer behalve van foutmeldingen\n"
+#~ "  -s  Doe-niets. Toont alleen wat gedaan zou worden.\n"
+#~ "  -f  lees/schrijf auto/manueel markeringen in het vermelde bestand\n"
+#~ "  -c=? Lees dit configuratiebestand\n"
+#~ "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+#~ "Raadpleeg de man-pagina's apt-mark(8) en apt.conf(5) voor meer informatie."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is een simpel hulpmiddel om pakketbestanden te sorteren.\n"
+#~ "De -s optie wordt gebruikt om aan te geven om welk soort bestand het "
+#~ "gaat.\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -h   Deze hulptekst\n"
+#~ "  -s   Sorteer bronbestanden\n"
+#~ "  -c=? Lees dit configuratiebestand\n"
+#~ "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Dochterproces is mislukt"
 
diff --git a/po/nn.po b/po/nn.po
index f58bcf7e8..4d22aa457 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -175,6 +175,36 @@ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Merk, vel %s i staden for %s\n"
 
+#: 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 har superku-krefter."
+
+#: 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 "Fann ingen pakkar"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
@@ -219,6 +249,10 @@ msgstr "Du har ikkje nok ledig plass i %s"
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikkje nok ledig plass i %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Klarte ikkje låsa nedlastingskatalogen"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -316,7 +350,7 @@ msgstr "Vil du halda fram?"
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: 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 "Nedlastinga er ferdig i nedlastingsmodus"
 
@@ -701,9 +735,232 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Fann ingen pakkar"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Finn ikkje pakken %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Pakkefiler:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Spikra pakkar:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(ikkje funne)"
+
+#. 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 "  Installert: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ingen)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pakke spikra til: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versjonstabell:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Klarte ikkje få status på kjeldepakkelista %s"
+
+#: 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 "Du må velja minst éin pakke som kjeldekoden skal hentast for"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Finn ingen kjeldepakke for %s"
+
+#: 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
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
+
+#. 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 "Må henta %sB/%sB med kjeldekodearkiv.\n"
+
+#. 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 "Må henta %sB med kjeldekodearkiv.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Hent kjeldekode %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Klarte ikkje henta nokre av arkiva."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
+
+#: 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 "Byggjekommandoen «%s» mislukkast.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Klarte ikkje behandla byggjekrava"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Klarte ikkje henta byggjekrav for %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s har ingen byggjekrav.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
+"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Klarte ikkje behandla byggjekrava"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -812,96 +1069,18 @@ msgstr "Brukt plass i alt: "
 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 "Finn ikkje pakken %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Pakkefiler:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Spikra pakkar:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ikkje funne)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installert: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ingen)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pakke spikra til: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versjonstabell:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Bruk: apt-cache [val] kommando\n"
-"      apt-cache [val] show pakke1 [pakke2 ...]\n"
-"\n"
-"apt-cache er eit lågnivåverktøy som vert brukt til å handtera\n"
-"binærmellomlageret til APT, og til å henta informasjon frå det.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Val:\n"
-"  -h   Vis denne hjelpeteksten.\n"
-"  -p=? Pakkelageret.\n"
-"  -s=? Kjeldekodelageret.\n"
-"  -q   Ikkje vis framdriftsmålaren.\n"
-"  -i   Vis berre viktige krav for unmet-kommandoen.\n"
-"  -c=? Les denne oppsettsfila.\n"
-"  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
-"Du finn meir informasjon på manualsidene apt-cache(8) og apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -935,7 +1114,11 @@ msgstr "Vis regelinnstillingar."
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -982,7 +1165,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1022,24 +1204,9 @@ msgstr ""
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1050,23 +1217,9 @@ msgstr "Ikkje parvise argument"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Bruk: apt-config [val] kommando\n"
-"\n"
-"apt-config er eit enkelt verktøy for å lesa oppsettsfila til APT.\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Val:\n"
-"  -h   Vis denne hjelpeteksten.\n"
-"  -c=? Les denne oppsettsfila.\n"
-"  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1077,31 +1230,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Klarte ikkje få status på kjeldepakkelista %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
@@ -1123,175 +1251,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Klarte ikkje låsa nedlastingskatalogen"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Finn ingen kjeldepakke for %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
-
-#. 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"
-msgstr "Må henta %sB med kjeldekodearkiv.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Hent kjeldekode %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Klarte ikkje henta nokre av arkiva."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Byggjekommandoen «%s» mislukkast.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Klarte ikkje behandla byggjekrava"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Klarte ikkje henta byggjekrav for %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s har ingen byggjekrav.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
-"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Klarte ikkje behandla byggjekrava"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Bruk: apt-get [val] kommando\n"
 "      apt-get [val] install|remove pakke1 [pakke2 ...]\n"
@@ -1302,44 +1275,6 @@ msgstr ""
 "«install».\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Val:\n"
-"  -h  Vis denne hjelpeteksten.\n"
-"  -q  Ikkje vis framdriftsmåtar, for bruk i loggar.\n"
-"  -qq Inga tilbakemelding - bortsett frå feilmeldingar.\n"
-"  -d  Berre nedlasting - IKKJE installer eller pakk ut arkivfilene.\n"
-"  -s  Skuggespel, berre simulering av handlingane.\n"
-"  -y  Svar ja på alle spørsmål utan å stoppa.\n"
-"  -f  Prøv å halda fram sjølv om integritetskontrollen mislukkast.\n"
-"  -m  Prøv å halda fram sjølv om nokre pakkar ikkje vert funne.\n"
-"  -u  Ta med oppgraderte pakkar i lista som vert vist.\n"
-"  -b  Bygg pakken etter at kjeldekoden er henta.\n"
-"  -V  Vis fullstendige versjonsnummer.\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
-"Du finn meir informasjon og fleire kommandolinjeval på manualsidene\n"
-"til apt-get(8), sources.list(5) og apt.conf(5).\n"
-"                       APT har superku-krefter.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Hent nye pakkelister."
 
@@ -1418,11 +1353,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1496,20 +1428,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2001,17 +1922,13 @@ msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
 "\n"
@@ -2044,13 +1961,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
 "\n"
@@ -2071,25 +1982,10 @@ msgstr "Ukjend pakkeoppslag"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er eit enkelt verktøy for å sortera pakkefiler. Innstillinga\n"
-"-s vert brukt til å velja kva for ein type fil det er snakk om.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten.\n"
-"  -s   Bruk kjeldefilsortering.\n"
-"  -c=? Les denne oppsettsfila.\n"
-"  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3796,6 +3692,85 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Reknar ut oppgradering"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Bruk: apt-cache [val] kommando\n"
+#~ "      apt-cache [val] show pakke1 [pakke2 ...]\n"
+#~ "\n"
+#~ "apt-cache er eit lågnivåverktøy som vert brukt til å handtera\n"
+#~ "binærmellomlageret til APT, og til å henta informasjon frå det.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Val:\n"
+#~ "  -h   Vis denne hjelpeteksten.\n"
+#~ "  -p=? Pakkelageret.\n"
+#~ "  -s=? Kjeldekodelageret.\n"
+#~ "  -q   Ikkje vis framdriftsmålaren.\n"
+#~ "  -i   Vis berre viktige krav for unmet-kommandoen.\n"
+#~ "  -c=? Les denne oppsettsfila.\n"
+#~ "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
+#~ "Du finn meir informasjon på manualsidene apt-cache(8) og apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Bruk: apt-config [val] kommando\n"
+#~ "\n"
+#~ "apt-config er eit enkelt verktøy for å lesa oppsettsfila til APT.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Val:\n"
+#~ "  -h   Vis denne hjelpeteksten.\n"
+#~ "  -c=? Les denne oppsettsfila.\n"
+#~ "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\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"
+#~ msgstr ""
+#~ "Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs er eit enkelt verktøy for å sortera pakkefiler. "
+#~ "Innstillinga\n"
+#~ "-s vert brukt til å velja kva for ein type fil det er snakk om.\n"
+#~ "\n"
+#~ "Val:\n"
+#~ "  -h   Vis denne hjelpeteksten.\n"
+#~ "  -s   Bruk kjeldefilsortering.\n"
+#~ "  -c=? Les denne oppsettsfila.\n"
+#~ "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Barneprosessen mislukkast"
 
diff --git a/po/pl.po b/po/pl.po
index 2a580a069..718663c49 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-07-28 21:53+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -181,6 +181,36 @@ msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Uwaga, wybieranie \"%s\" zamiast \"%s\"\n"
 
+#: 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 "Ten APT ma moce Super Krowy."
+
+#: 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 "Nie znaleziono żadnych pakietów"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
@@ -225,6 +255,10 @@ msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
 msgid "You don't have enough free space in %s."
 msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Nie udało się zablokować katalogu pobierania"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
@@ -323,7 +357,7 @@ msgstr "Kontynuować?"
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
-#: 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 "Ukończono pobieranie w trybie samego pobierania"
 
@@ -733,9 +767,257 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nie znaleziono żadnych pakietów"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nie udało się odnaleźć pakietu %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Plików pakietów:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku "
+"pakietu."
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Przypięte pakiety:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nie znaleziono)"
+
+#. 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 "  Zainstalowana: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  KandydujÄ…ca: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(brak)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Sposób przypięcia: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabela wersji:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr ""
+"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr ""
+"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr ""
+"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\""
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
+"źródła"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"UWAGA: pakietowanie \"%s\" jest zarzÄ…dzane w systemie kontroli wersji \"%s\" "
+"pod adresem:\n"
+"%s\n"
+
+#: 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 ""
+"Proszę użyć:\n"
+"%s\n"
+"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
+"pakietu.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Pomijanie już pobranego pliku \"%s\"\n"
+
+#. 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 "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
+
+#. 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 "Konieczne pobranie %sB archiwów źródeł.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Pobieranie źródeł %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Nie udało się pobrać niektórych archiwów."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Polecenie budowania \"%s\" zawiodło.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
+"zależności dla budowania"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
+"conf(5) APT::Architectures"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Nie udało się przetworzyć zależności dla budowania"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nie ma zależności dla budowania.\n"
+
+#: 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 ""
+"Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone "
+"w pakietach \"%s\""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
+"pakietu %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
+"nowy"
+
+#: 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"
+msgstr ""
+"Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja "
+"pakietu %s nie spełnia wymagań wersji"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
+"wersji kandydujÄ…cej"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Nie udało się spełnić zależności %s od %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Nie udało się spełnić zależności dla budowania %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Nie udało się przetworzyć zależności dla budowania"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -842,101 +1124,20 @@ msgstr "Całkowity rozmiar: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nie udało się odnaleźć pakietu %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Plików pakietów:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku "
-"pakietu."
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Przypięte pakiety:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nie znaleziono)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Zainstalowana: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  KandydujÄ…ca: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(brak)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Sposób przypięcia: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabela wersji:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Użycie: apt-cache [opcje] polecenie\n"
-"        apt-cache [opcje] show pakiet1 [pakiet2 ...]\n"
-"\n"
-"apt-cache to niskopoziomowe narzędzie służące  pobierania informacji\n"
-"z podręcznego magazynu plików binarnych APT-a.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -p=? Podręczny magazyn pakietów.\n"
-"  -s=? Podręczny magazyn źródeł.\n"
-"  -q   Wyłącza wskaźnik postępu.\n"
-"  -i   Pokazuje tylko ważne zależności przy poleceniu unmet.\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
-"Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n"
-"oraz apt.conf(5).\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Pokazuje informacje dla źródeł"
 
@@ -968,7 +1169,11 @@ msgstr "Pokazuje ustawienia polityki"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -1014,7 +1219,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1051,38 +1255,11 @@ msgstr "Należy powtórzyć ten proces dla reszty płyt."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Opcje:\n"
-"  -h  Ten tekst pomocy\n"
-"  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
-"działania)\n"
-"  -qq  Nie wypisuje nic oprócz komunikatów błędów\n"
-"  -s  Symulacja - wyświetla jedynie co powinno zostać zrobione\n"
-"  -f  zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
-"Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
-"i apt.conf(5), aby uzyskać więcej informacji."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumenty nie sÄ… w parach"
@@ -1091,23 +1268,9 @@ msgstr "Argumenty nie sÄ… w parach"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Użycie: apt-config [opcje] polecenie\n"
-"\n"
-"apt-config to proste narzędzie do czytania pliku konfiguracyjnego APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1118,34 +1281,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr ""
-"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr ""
-"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr ""
-"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
@@ -1168,195 +1303,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Nie udało się zablokować katalogu pobierania"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
-"źródła"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"UWAGA: pakietowanie \"%s\" jest zarzÄ…dzane w systemie kontroli wersji \"%s\" "
-"pod adresem:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Proszę użyć:\n"
-"%s\n"
-"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
-"pakietu.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Pomijanie już pobranego pliku \"%s\"\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
-
-#. 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"
-msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Pobieranie źródeł %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Nie udało się pobrać niektórych archiwów."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
-"zależności dla budowania"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
-"conf(5) APT::Architectures"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Nie udało się przetworzyć zależności dla budowania"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s nie ma zależności dla budowania.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone "
-"w pakietach \"%s\""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
-"pakietu %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
-"nowy"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja "
-"pakietu %s nie spełnia wymagań wersji"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
-"wersji kandydujÄ…cej"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Nie udało się spełnić zależności %s od %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Nie udało się spełnić zależności dla budowania %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Nie udało się przetworzyć zależności dla budowania"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Użycie: apt-get [opcje] polecenie\n"
 "        apt-get [opcje] install|remove pakiet1 [pakiet2 ...]\n"
@@ -1366,45 +1326,6 @@ msgstr ""
 "pakietów. Najczęściej używane polecenia to update i install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opcje:\n"
-"  -h   Ten tekst pomocy\n"
-"  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
-"działania)\n"
-"  -qq  Nie wypisuje nic oprócz komunikatów błędów\n"
-"  -d   Tylko pobiera - NIE instaluje ani nie rozpakowuje archiwów\n"
-"  -s   Bez działania. Wykonuje tylko symulację ustalenia kolejności\n"
-"  -y   Zakłada odpowiedź \"tak\" na wszystkie pytania, nie pyta\n"
-"  -f   Próbuje naprawić system, w którym występują niespełnione zależności\n"
-"  -m   Próbuje działać nawet jeśli nie można znaleźć niektórych archiwów\n"
-"  -u   Pokazuje też listę aktualizowanych pakietów\n"
-"  -b   Buduje pakiet po pobraniu archiwum źródłowego\n"
-"  -V   Pokazuje pełną informację na temat wersji\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
-"Więcej informacji i opcji można znaleźć na stronach podręcznika\n"
-"apt-get(8), sources.list(5) i apt.conf(5).\n"
-"                         Ten APT ma moce Super Krowy.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Pobiera nowe listy pakietów"
 
@@ -1485,11 +1406,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1566,7 +1484,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 can also list marks.\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"
 msgstr ""
 "Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n"
 "\n"
@@ -1575,30 +1495,6 @@ msgstr ""
 "do wyświetlania stanu oznaczeń.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Opcje:\n"
-"  -h  Ten tekst pomocy\n"
-"  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
-"działania)\n"
-"  -qq  Nie wypisuje nic oprócz komunikatów błędów\n"
-"  -s  Symulacja - wyświetla jedynie co powinno zostać zrobione\n"
-"  -f  zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
-"Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
-"i apt.conf(5), aby uzyskać więcej informacji."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Oznacza dany pakiet jako zainstalowany automatycznie"
 
@@ -2090,17 +1986,13 @@ msgid "Merging available information"
 msgstr "�ączenie informacji o dostępnych pakietach"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
 "\n"
@@ -2128,17 +2020,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Użycie: apt-internal-solver\n"
 "\n"
@@ -2160,25 +2047,10 @@ msgstr "Nieznane informacje o pakiecie!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n"
-"\n"
-"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n"
-"Opcji -s używa się do wskazania typu pliku.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -s   Sortowanie pliku źródeł.\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3938,6 +3810,134 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Obliczanie aktualizacji"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Użycie: apt-cache [opcje] polecenie\n"
+#~ "        apt-cache [opcje] show pakiet1 [pakiet2 ...]\n"
+#~ "\n"
+#~ "apt-cache to niskopoziomowe narzędzie służące  pobierania informacji\n"
+#~ "z podręcznego magazynu plików binarnych APT-a.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opcje:\n"
+#~ "  -h   Ten tekst pomocy.\n"
+#~ "  -p=? Podręczny magazyn pakietów.\n"
+#~ "  -s=? Podręczny magazyn źródeł.\n"
+#~ "  -q   Wyłącza wskaźnik postępu.\n"
+#~ "  -i   Pokazuje tylko ważne zależności przy poleceniu unmet.\n"
+#~ "  -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ "  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
+#~ "Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n"
+#~ "oraz apt.conf(5).\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Opcje:\n"
+#~ "  -h  Ten tekst pomocy\n"
+#~ "  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
+#~ "działania)\n"
+#~ "  -qq  Nie wypisuje nic oprócz komunikatów błędów\n"
+#~ "  -s  Symulacja - wyświetla jedynie co powinno zostać zrobione\n"
+#~ "  -f  zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n"
+#~ "  -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ "  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
+#~ "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
+#~ "i apt.conf(5), aby uzyskać więcej informacji."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Użycie: apt-config [opcje] polecenie\n"
+#~ "\n"
+#~ "apt-config to proste narzędzie do czytania pliku konfiguracyjnego APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opcje:\n"
+#~ "  -h   Ten tekst pomocy.\n"
+#~ "  -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ "  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Opcje:\n"
+#~ "  -h  Ten tekst pomocy\n"
+#~ "  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
+#~ "działania)\n"
+#~ "  -qq  Nie wypisuje nic oprócz komunikatów błędów\n"
+#~ "  -s  Symulacja - wyświetla jedynie co powinno zostać zrobione\n"
+#~ "  -f  zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n"
+#~ "  -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ "  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
+#~ "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
+#~ "i apt.conf(5), aby uzyskać więcej informacji."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n"
+#~ "Opcji -s używa się do wskazania typu pliku.\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -h   Ten tekst pomocy.\n"
+#~ "  -s   Sortowanie pliku źródeł.\n"
+#~ "  -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ "  -o=? Ustawia dowolnÄ… opcjÄ™ konfiguracji, np. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Proces potomny zawiódł"
 
diff --git a/po/pt.po b/po/pt.po
index 42079058e..9fec1fad1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -173,6 +173,36 @@ msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Note, a seleccionar '%s' em vez de '%s'\n"
 
+#: 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 "Este APT tem Poderes de Super Vaca."
+
+#: 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 "Não foi encontrado nenhum pacote"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
@@ -217,6 +247,10 @@ msgstr "Não foi possível determinar o espaço livre em %s"
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço livre suficiente em %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Impossível criar acesso exclusivo ao directório de downloads"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
@@ -314,7 +348,7 @@ msgstr "Deseja continuar?"
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: 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 "Download completo e em modo de fazer apenas o download"
 
@@ -706,9 +740,252 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Não foi encontrado nenhum pacote"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Não foi possível encontrar o pacote %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Ficheiros de Pacotes :"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pacotes Marcados:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(não encontrado)"
+
+#. 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 "  Instalado: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidato: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(nenhum)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Marcação do Pacote: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabela de Versão:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Não foi possível encontrar um pacote de código fonte para %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"AVISO: o empacotamento de '%s' é mantido no sistema de controle de versões "
+"'%s' em:\n"
+"%s\n"
+
+#: 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 ""
+"Por favor utilize:\n"
+"%s\n"
+"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
+
+#. 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 "É necessário obter %sB/%sB de arquivos de código fonte.\n"
+
+#. 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 "É necessário obter %sB de arquivos de código fonte.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Obter código fonte %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Falhou obter alguns arquivos."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "O comando de descompactação '%s' falhou.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "O comando de compilação '%s' falhou.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Deve especificar pelo menos um pacote para verificar as dependências de "
+"compilação"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Nenhuma informação de arquitectura disponível para %s. Para configuração "
+"veja apt.conf(5) APT::Architectures"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Falhou processar as dependências de compilação"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr ""
+"Não foi possível obter informações de dependências de compilação para %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s não tem dependências de compilação.\n"
+
+#: 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 ""
+"a dependência de %s por %s não pode ser satisfeita porque %s não é permitido "
+"em pacotes '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
+"pôde ser encontrado"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
+"demasiado novo"
+
+#: 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"
+msgstr ""
+"a dependência de %s para %s não pode ser satisfeita porque a versão "
+"candidata do pacote %s não pode satisfazer os requisitos de versão"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"a dependência de %s para %s não pode ser satisfeita porque o pacote %s não "
+"tem versão candidata"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Falha ao satisfazer a dependência %s para %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Não foi possível satisfazer as dependências de compilação para %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Falhou processar as dependências de compilação"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -816,98 +1093,18 @@ msgstr ""
 "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
 "showauto'."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Não foi possível encontrar o pacote %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Ficheiros de Pacotes :"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pacotes Marcados:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(não encontrado)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalado: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidato: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(nenhum)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Marcação do Pacote: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabela de Versão:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Utilização: apt-cache [opções] comando\n"
-"            apt-cache [opções] show pacote1 [pacote2 ...]\n"
-"\n"
-"O apt-cache é uma ferramenta de baixo nível utilizada para questionar\n"
-" informação dos ficheiros de cache binários do APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opções:\n"
-"  -h   Este texto de ajuda.\n"
-"  -p=? A cache de pacotes.\n"
-"  -s=? A cache de fontes.\n"
-"  -q   Desabilitar o indicador de progresso.\n"
-"  -i   Mostrar apenas dependências importantes para o comando unmet.\n"
-"  -c=? Ler este ficheiro de configuração.\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
-"Para mais informações veja as páginas do manual apt-cache(8) e apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -941,7 +1138,11 @@ msgstr "Mostrar as configurações de políticas"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -987,7 +1188,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1025,37 +1225,11 @@ msgstr "Repita este processo para o resto dos CDs no seu conjunto."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Opções:\n"
-"   -h\tEste texto de ajuda.\n"
-"   -q\tSaída para registo - sem indicador de progresso\n"
-"   -qq Sem saída excepto para erros\n"
-"   -s\tNão fazer. Apenas escreve o que seria feito.\n"
-"   -f\tler/escrever marcação auto/manual no ficheiro indicado\n"
-"   -c=? Ler este ficheiro de configuração\n"
-"   -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
-"tmp\n"
-"Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "os argumentos não estão em pares"
@@ -1064,24 +1238,9 @@ msgstr "os argumentos não estão em pares"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Utilização: apt-config [opções] comando\n"
-"\n"
-"O apt-config é uma ferramenta simples para ler o ficheiro de config do APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Opções:\n"
-"  -h   Este texto de ajuda.\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1092,31 +1251,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
@@ -1139,194 +1273,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"AVISO: o empacotamento de '%s' é mantido no sistema de controle de versões "
-"'%s' em:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Por favor utilize:\n"
-"%s\n"
-"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
-
-#. 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"
-msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Obter código fonte %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Falhou obter alguns arquivos."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "O comando de descompactação '%s' falhou.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "O comando de compilação '%s' falhou.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Deve especificar pelo menos um pacote para verificar as dependências de "
-"compilação"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Nenhuma informação de arquitectura disponível para %s. Para configuração "
-"veja apt.conf(5) APT::Architectures"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Falhou processar as dependências de compilação"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-"Não foi possível obter informações de dependências de compilação para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s não tem dependências de compilação.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"a dependência de %s por %s não pode ser satisfeita porque %s não é permitido "
-"em pacotes '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
-"pôde ser encontrado"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
-"demasiado novo"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"a dependência de %s para %s não pode ser satisfeita porque a versão "
-"candidata do pacote %s não pode satisfazer os requisitos de versão"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"a dependência de %s para %s não pode ser satisfeita porque o pacote %s não "
-"tem versão candidata"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Falhou processar as dependências de compilação"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Utilização: apt-get [opções] comando\n"
 "            apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
@@ -1337,45 +1297,6 @@ msgstr ""
 "são update e install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opções:\n"
-"  -h  Este texto de ajuda\n"
-"  -q  Saída para registo - sem indicador de progresso\n"
-"  -qq Sem saída, excepto para erros\n"
-"  -d  Fazer apenas o download - NÃO instalar ou descompactar arquivos\n"
-"  -s  Não agir. Executar simulação de ordens\n"
-"  -y  Assumir Sim para todas as perguntas e não fazer perguntas\n"
-"  -f  Tentar corrigir um sistema com dependências erradas\n"
-"  -m  Tentar continuar se os arquivos não poderem ser localizados\n"
-"  -u  Mostrar também uma lista de pacotes actualizados\n"
-"  -b  Construir o pacote de código-fonte depois de o obter\n"
-"  -V  Mostrar números da versão detalhados\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
-"tmp\n"
-"Para mais informações e opções veja as páginas do manual\n"
-"apt-get(8), sources.list(5) e apt.conf(5)\n"
-"                         Este APT tem Poderes de Super Vaca.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Obter novas listas de pacotes"
 
@@ -1454,11 +1375,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1533,7 +1451,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 can also list marks.\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"
 msgstr ""
 "Utilização: apt-mark [opções] {auto|manual} pacote1 [pacote2...]\n"
 "\n"
@@ -1542,29 +1462,6 @@ msgstr ""
 "marcações.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Opções:\n"
-"   -h\tEste texto de ajuda.\n"
-"   -q\tSaída para registo - sem indicador de progresso\n"
-"   -qq Sem saída excepto para erros\n"
-"   -s\tNão fazer. Apenas escreve o que seria feito.\n"
-"   -f\tler/escrever marcação auto/manual no ficheiro indicado\n"
-"   -c=? Ler este ficheiro de configuração\n"
-"   -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
-"tmp\n"
-"Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Marca os pacotes como instalados automaticamente"
 
@@ -2056,17 +1953,13 @@ msgid "Merging available information"
 msgstr "A juntar a informação disponível"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
 "\n"
@@ -2095,17 +1988,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Utilização: apt-internal-solver\n"
 "\n"
@@ -2126,26 +2014,10 @@ msgstr "Registo de pacote desconhecido!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n"
-"\n"
-"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n"
-"A opção -s é utilizada para indicar que tipo de ficheiro é.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -s   Utilizar a ordenação de ficheiros de código-fonte\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3919,6 +3791,137 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "A calcular a actualização"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Utilização: apt-cache [opções] comando\n"
+#~ "            apt-cache [opções] show pacote1 [pacote2 ...]\n"
+#~ "\n"
+#~ "O apt-cache é uma ferramenta de baixo nível utilizada para questionar\n"
+#~ " informação dos ficheiros de cache binários do APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opções:\n"
+#~ "  -h   Este texto de ajuda.\n"
+#~ "  -p=? A cache de pacotes.\n"
+#~ "  -s=? A cache de fontes.\n"
+#~ "  -q   Desabilitar o indicador de progresso.\n"
+#~ "  -i   Mostrar apenas dependências importantes para o comando unmet.\n"
+#~ "  -c=? Ler este ficheiro de configuração.\n"
+#~ "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+#~ "tmp\n"
+#~ "Para mais informações veja as páginas do manual apt-cache(8) e apt."
+#~ "conf(5).\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Opções:\n"
+#~ "   -h\tEste texto de ajuda.\n"
+#~ "   -q\tSaída para registo - sem indicador de progresso\n"
+#~ "   -qq Sem saída excepto para erros\n"
+#~ "   -s\tNão fazer. Apenas escreve o que seria feito.\n"
+#~ "   -f\tler/escrever marcação auto/manual no ficheiro indicado\n"
+#~ "   -c=? Ler este ficheiro de configuração\n"
+#~ "   -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Utilização: apt-config [opções] comando\n"
+#~ "\n"
+#~ "O apt-config é uma ferramenta simples para ler o ficheiro de config do "
+#~ "APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opções:\n"
+#~ "  -h   Este texto de ajuda.\n"
+#~ "  -c=? Ler este ficheiro de configuração\n"
+#~ "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+#~ "tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Opções:\n"
+#~ "   -h\tEste texto de ajuda.\n"
+#~ "   -q\tSaída para registo - sem indicador de progresso\n"
+#~ "   -qq Sem saída excepto para erros\n"
+#~ "   -s\tNão fazer. Apenas escreve o que seria feito.\n"
+#~ "   -f\tler/escrever marcação auto/manual no ficheiro indicado\n"
+#~ "   -c=? Ler este ficheiro de configuração\n"
+#~ "   -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n"
+#~ "\n"
+#~ "O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de "
+#~ "pacotes.\n"
+#~ "A opção -s é utilizada para indicar que tipo de ficheiro é.\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -h   Este texto de ajuda\n"
+#~ "  -s   Utilizar a ordenação de ficheiros de código-fonte\n"
+#~ "  -c=? Ler este ficheiro de configuração\n"
+#~ "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "O processo filho falhou"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c53de487..3fbc89bb5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -172,6 +172,36 @@ msgstr "O pacote %s não está instalado, então não será removido\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, selecionando %s ao invés de %s\n"
 
+#: 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 "Este APT tem Poderes de Super Vaca."
+
+#: 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 "Nenhum pacote encontrado"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
@@ -216,6 +246,10 @@ msgstr "Não foi possível determinar o espaço livre em %s"
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço suficiente em %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Impossível criar trava no diretório de download"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
@@ -314,7 +348,7 @@ msgstr "Você quer continuar?"
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: 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 "Baixar completo e no modo somente baixar (\"download only\")"
 
@@ -703,9 +737,243 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nenhum pacote encontrado"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossível encontrar o pacote %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Arquivos de pacote:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"O cache está fora de sincronia, não foi possível fazer a referência cruzada "
+"de um arquivo de pacote"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pacotes alfinetados (\"pinned\"):"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(não encontrado)"
+
+#. 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 "  Instalado: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidato: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(nenhum)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pacote alfinetado (\"pin\"): "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabela de versão:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Impossível achar pacote %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Impossível achar pacote %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Impossível achar pacote %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
+
+#: 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 "Deve-se especificar pelo menos um pacote para que se busque o fonte"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Impossível encontrar um pacote fonte para %s"
+
+#: 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 "Pulando arquivo já baixado '%s'\n"
+
+#. 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 "Preciso obter %sB/%sB de arquivos fonte.\n"
+
+#. 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 "Preciso obter %sB de arquivos fonte.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Obter fonte %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Falhou ao buscar alguns arquivos."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Comando de desempacotamento '%s' falhou.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Comando de construção '%s' falhou.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
+"de construção"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Falhou ao processar as dependências de construção"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Impossível conseguir informações de dependência de construção para %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s não tem dependências de construção.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
+"pode ser encontrado"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
+"pode ser encontrado"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
+"novo"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
+"disponível do pacote %s pode satisfazer os requerimentos de versão"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
+"pode ser encontrado"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Não foi possível satisfazer as dependências de compilação para %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Falhou ao processar as dependências de construção"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -812,99 +1080,18 @@ msgstr "Total de espaço contabilizado para: "
 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 "Impossível encontrar o pacote %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Arquivos de pacote:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"O cache está fora de sincronia, não foi possível fazer a referência cruzada "
-"de um arquivo de pacote"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pacotes alfinetados (\"pinned\"):"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(não encontrado)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalado: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidato: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(nenhum)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pacote alfinetado (\"pin\"): "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabela de versão:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Uso: apt-cache [opções] comando\n"
-"     apt-cache [opções] show pacote1 [pacote2 ...]\n"
-"\n"
-"O apt-cache é uma ferramenta de baixo nível usada para manipular os\n"
-"arquivos de cache binários do APT e para buscar informações neles\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opções:\n"
-"  -h   Este texto de ajuda.\n"
-"  -p=? O cache de pacotes.\n"
-"  -s=? O cache de fontes.\n"
-"  -q   Desabilita o indicador de progresso.\n"
-"  -i   Mostra somente dependências importantes para o comando \"unmet\".\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-"Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais informações.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -938,7 +1125,11 @@ msgstr "Mostra as configurações de políticas"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -984,7 +1175,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1023,24 +1213,9 @@ msgstr "Repita este processo para o restante dos CDs em seu conjunto."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1051,25 +1226,9 @@ msgstr "Argumentos não estão em pares"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Uso: apt-config [opções] comando\n"
-"\n"
-"O apt-config é uma ferramenta simples para ler o arquivo de configuração do "
-"APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opções:\n"
-"  -h   Este texto de ajuda.\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1080,31 +1239,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Impossível achar pacote %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Impossível achar pacote %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Impossível achar pacote %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
@@ -1125,184 +1259,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Impossível criar trava no diretório de download"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Impossível encontrar um pacote fonte para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Pulando arquivo já baixado '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
-
-#. 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"
-msgstr "Preciso obter %sB de arquivos fonte.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Obter fonte %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Falhou ao buscar alguns arquivos."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Comando de desempacotamento '%s' falhou.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Comando de construção '%s' falhou.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
-"de construção"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Falhou ao processar as dependências de construção"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Impossível conseguir informações de dependência de construção para %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s não tem dependências de construção.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
-"pode ser encontrado"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
-"pode ser encontrado"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
-"novo"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
-"disponível do pacote %s pode satisfazer os requerimentos de versão"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
-"pode ser encontrado"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Falhou ao processar as dependências de construção"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Uso: apt-get [opções] comando\n"
 "     apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
@@ -1313,45 +1283,6 @@ msgstr ""
 "update e install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opções:\n"
-"  -h  Este texto de ajuda\n"
-"  -q  Saída que pode ser registrada em log - sem indicador de progresso\n"
-"  -qq Sem saída, exceto para erros\n"
-"  -d  Apenas baixa - NÃO instala ou desempacota arquivos\n"
-"  -s  Não-age. Executa simulação de ordenação\n"
-"  -y  Assume Sim para todas as perguntas e não questiona\n"
-"  -f  Tenta corrigir um sistema com dependências quebradas\n"
-"  -m  Tenta continuar se os arquivos não podem ser localizados\n"
-"  -u  Mostra uma lista de pacotes atualizados também\n"
-"  -b  Constrói o pacote fonte depois de baixá-lo\n"
-"  -V  Exibe números de versões mais detalhados\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-"Veja as páginas de manual apt-get(8), sources.list(5) e apt.conf(5)\n"
-"para mais informações e opções.\n"
-"                       Este APT tem Poderes de Super Vaca.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Obtém novas listas de pacotes"
 
@@ -1430,11 +1361,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1508,20 +1436,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2023,17 +1940,13 @@ msgid "Merging available information"
 msgstr "Mesclando informação disponível"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
 "\n"
@@ -2067,13 +1980,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
 "\n"
@@ -2095,26 +2002,10 @@ msgstr "Registro de pacote desconhecido!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n"
-"A opção -s é usada para indicar que tipo de arquivo é.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -s   Usar ordenação de arquivo fonte\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3836,6 +3727,89 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculando atualização"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Uso: apt-cache [opções] comando\n"
+#~ "     apt-cache [opções] show pacote1 [pacote2 ...]\n"
+#~ "\n"
+#~ "O apt-cache é uma ferramenta de baixo nível usada para manipular os\n"
+#~ "arquivos de cache binários do APT e para buscar informações neles\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opções:\n"
+#~ "  -h   Este texto de ajuda.\n"
+#~ "  -p=? O cache de pacotes.\n"
+#~ "  -s=? O cache de fontes.\n"
+#~ "  -q   Desabilita o indicador de progresso.\n"
+#~ "  -i   Mostra somente dependências importantes para o comando \"unmet\".\n"
+#~ "  -c=? Lê o arquivo de configuração especificado.\n"
+#~ "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+#~ "tmp\n"
+#~ "Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais "
+#~ "informações.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Uso: apt-config [opções] comando\n"
+#~ "\n"
+#~ "O apt-config é uma ferramenta simples para ler o arquivo de configuração "
+#~ "do APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opções:\n"
+#~ "  -h   Este texto de ajuda.\n"
+#~ "  -c=? Lê o arquivo de configuração especificado.\n"
+#~ "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+#~ "tmp\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"
+#~ msgstr ""
+#~ "Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n"
+#~ "\n"
+#~ "O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n"
+#~ "A opção -s é usada para indicar que tipo de arquivo é.\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -h   Este texto de ajuda\n"
+#~ "  -s   Usar ordenação de arquivo fonte\n"
+#~ "  -c=? Lê o arquivo de configuração especificado.\n"
+#~ "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Processo filho falhou"
 
diff --git a/po/ro.po b/po/ro.po
index 6912f352e..e7179e994 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -173,6 +173,36 @@ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Notă, se selectează %s în locul lui %s\n"
 
+#: 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 "Acest APT are puterile unei Super Vaci."
+
+#: 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 "Nu s-au găsit pachete"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
@@ -217,6 +247,10 @@ msgstr "N-am putut determina spațiul disponibil în %s"
 msgid "You don't have enough free space in %s."
 msgstr "Nu aveți suficient spațiu în %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Nu s-a putut bloca directorul de descărcare"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
@@ -314,7 +348,7 @@ msgstr "Vreți să continuați?"
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
-#: 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 "Descărcare completă și în modul doar descărcare"
 
@@ -709,9 +743,242 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Nu s-au găsit pachete"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nu s-a putut localiza pachetul %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Fișiere pachet: "
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pachete alese special:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(negăsit)"
+
+#. 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 "  Instalat: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Candidează: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(niciunul)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pachet ales special: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabela de versiuni:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nu pot găsi pachetul %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nu pot găsi pachetul %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nu pot găsi pachetul %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Nu pot determina starea listei surse de pachete %s"
+
+#: 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 "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
+
+#: 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 "Sar peste fișierul deja descărcat '%s'\n"
+
+#. 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 "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
+
+#. 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 "Este nevoie să descărcați %sB din arhivele surselor.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Aducere sursa %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Eșec la aducerea unor arhive."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Comanda de despachetare '%s' eșuată.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Comanda de construire '%s' eșuată.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
+"înglobate"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Eșec la prelucrarea dependențelor de compilare"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nu are dependențe înglobate.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
+"poate fi găsit"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
+"poate fi găsit"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
+"prea nou"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
+"disponibilă a pachetului %s nu poate satisface versiunile cerute"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
+"poate fi găsit"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Eșec la prelucrarea dependențelor de compilare"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -819,99 +1086,20 @@ msgstr "Total spațiu contorizat pentru: "
 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 "Nu s-a putut localiza pachetul %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Fișiere pachet: "
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pachete alese special:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(negăsit)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Instalat: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Candidează: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(niciunul)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pachet ales special: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabela de versiuni:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Utilizare: apt-cache [opțiuni] comanda\n"
-"       apt-cache [opțiuni] show pachet1 [pachet2 ...]\n"
-"\n"
-"apt-cache este o unealtă de nivel scăzut pentru manipularea fișierelor\n"
-"binare din cache-ul APT, și de interogare a informațiilor din ele\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Opțiuni:\n"
-"  -h   Acest text de ajutor.\n"
-"  -p=? Cache-ul de pachete.\n"
-"  -s=? Cache-ul de surse.\n"
-"  -q   Dezactivează indicatorul de progres.\n"
-"  -i   Arată doar dependențele importante pentru comanda „unmet�.\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-"Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe informații.\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Arată înregistrările despre sursă"
 
@@ -943,7 +1131,11 @@ msgstr "Arată configurațiile de politici"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -989,7 +1181,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1027,24 +1218,9 @@ msgstr "Repetați această procedură pentru restul CD-urilor din set."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1055,24 +1231,9 @@ msgstr "Argumentele nu sunt perechi"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Utilizare: apt-config [opțiuni] comanda\n"
-"\n"
-"apt-config este o unealtă simplă pentru citirea fișierului de configurare "
-"APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Opțiuni:\n"
-"  -h   Acest text de ajutor.\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1083,31 +1244,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nu pot găsi pachetul %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nu pot găsi pachetul %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nu pot găsi pachetul %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Nu pot determina starea listei surse de pachete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
@@ -1129,184 +1265,20 @@ msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Nu s-a putut bloca directorul de descărcare"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Sar peste fișierul deja descărcat '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
-
-#. 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"
-msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Aducere sursa %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Eșec la aducerea unor arhive."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Comanda de despachetare '%s' eșuată.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Comanda de construire '%s' eșuată.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
-"înglobate"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Eșec la prelucrarea dependențelor de compilare"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s nu are dependențe înglobate.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
-"poate fi găsit"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
-"poate fi găsit"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
-"prea nou"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
-"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
-"poate fi găsit"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Eșec la prelucrarea dependențelor de compilare"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Utilizare: apt-get [opțiuni] comanda\n"
 "           apt-get [opțiuni] install|remove pachet1 [pachet2 ...]\n"
@@ -1317,45 +1289,6 @@ msgstr ""
 "și install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Opțiuni:\n"
-"  -h  Acest text de ajutor.\n"
-"  -q  Afișare jurnalizabilă - fără indicator de progres\n"
-"  -qq Fără afișare, cu excepția erorilor\n"
-"  -d  Doar descărcare - NU instala sau despacheta arhive\n"
-"  -s  Fără acțiune. Realizează o simulare\n"
-"  -y  Presupune DA ca răspuns la toate întrebările și nu\n"
-"      solicita răspuns\n"
-"  -f  Încearcă corectarea unui sistem cu dependențe corupte\n"
-"  -m  Încearcă continuarea dacă arhivele nu pot fi găsite\n"
-"  -u  Arată o listă de pachete ce pot fi înnoite\n"
-"  -b  Construiește sursa pachetului după aducere\n"
-"  -V  Arată versiunile în mod logoreic\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-"Vedeți manualele apt-get(8), sources.list(5) și apt.conf(5)\n"
-"pentru mai multe informații și opțiuni.\n"
-"                       Acest APT are puterile unei Super Vaci.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Aduce listele noi de pachete"
 
@@ -1434,11 +1367,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1512,20 +1442,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2028,17 +1947,13 @@ msgid "Merging available information"
 msgstr "Se combină informațiile disponibile"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
 "\n"
@@ -2071,13 +1986,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
 "\n"
@@ -2098,26 +2007,10 @@ msgstr "ÃŽnregistrare de pachet necunoscut!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n"
-"\n"
-"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n"
-"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n"
-"\n"
-"Opțiuni:\n"
-"  -h   Acest text de ajutor\n"
-"  -s   Folosește sortarea de fișiere-sursă\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3849,6 +3742,89 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculez înnoirea"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Utilizare: apt-cache [opțiuni] comanda\n"
+#~ "       apt-cache [opțiuni] show pachet1 [pachet2 ...]\n"
+#~ "\n"
+#~ "apt-cache este o unealtă de nivel scăzut pentru manipularea fișierelor\n"
+#~ "binare din cache-ul APT, și de interogare a informațiilor din ele\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opțiuni:\n"
+#~ "  -h   Acest text de ajutor.\n"
+#~ "  -p=? Cache-ul de pachete.\n"
+#~ "  -s=? Cache-ul de surse.\n"
+#~ "  -q   Dezactivează indicatorul de progres.\n"
+#~ "  -i   Arată doar dependențele importante pentru comanda „unmet�.\n"
+#~ "  -c=? Citește acest fișier de configurare\n"
+#~ "  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe "
+#~ "informații.\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Utilizare: apt-config [opțiuni] comanda\n"
+#~ "\n"
+#~ "apt-config este o unealtă simplă pentru citirea fișierului de configurare "
+#~ "APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Opțiuni:\n"
+#~ "  -h   Acest text de ajutor.\n"
+#~ "  -c=? Citește acest fișier de configurare\n"
+#~ "  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/"
+#~ "tmp\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"
+#~ msgstr ""
+#~ "Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n"
+#~ "Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n"
+#~ "\n"
+#~ "Opțiuni:\n"
+#~ "  -h   Acest text de ajutor\n"
+#~ "  -s   Folosește sortarea de fișiere-sursă\n"
+#~ "  -c=? Citește acest fișier de configurare\n"
+#~ "  -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Procesul copil a eșuat"
 
diff --git a/po/ru.po b/po/ru.po
index 577dd020d..e866a7716 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.9.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2015-06-23 20:40+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -181,6 +181,36 @@ msgstr "Пакет «%s» не уÑ�тановлен, поÑ�тому не можÐ
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Заметьте, вме�то «%2$s» выбирает�� «%1$s»\n"
 
+#: 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 е�ть коровь� СУПЕРСИЛ�."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "В �той программе е�ть Super Meep Powers."
+
+#: 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 "В�ИМ��ИЕ: Следующие пакеты невозможно аутентифицировать!"
@@ -225,6 +255,10 @@ msgstr "�е удало�ь определить количе�тво �вобо
 msgid "You don't have enough free space in %s."
 msgstr "�едо�таточно �вободного ме�та в %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "�евозможно заблокировать каталог, куда �кладывают�� �качиваемые файлы"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -328,7 +362,7 @@ 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 "Указан режим «только �качивание», и �качивание завершено"
 
@@ -724,9 +758,249 @@ msgstr[2] "Е�ть %i дополнительных запи�ей. И�поль
 msgid "not a real package (virtual)"
 msgstr "не реальный (виртуальный) пакет"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "�е найдено ни одного пакета"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "�е удало�ь найти пакет %s"
+
+#: 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 "Зафик�ированные пакеты:"
+
+#: 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
+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 "(от�ут�твует)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+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 "�е удало�ь найти пакет дл� архитектуры «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "�е удало�ь найти пакет «%s» вер�ии «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "�е удало�ь найти пакет «%s» в выпу�ке «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "И�пользует�� «%s» в каче�тве и�ходного пакета вме�то «%s»\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "�е удало�ь найти вер�ию «%s» пакета «%s»"
+
+#: 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 "�евозможно найти пакет � и�ходным кодом дл� %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"В�ИМ��ИЕ: упаковка «%s» поддерживает�� в �и�теме контрол� вер�ий «%s»:\n"
+"%s\n"
+
+#: 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 ""
+"И�пользуйте:\n"
+"%s\n"
+"дл� получени� по�ледних (возможно не выпущенных) обновлений пакета.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Пропу�каем уже �качанный файл «%s»\n"
+
+#. 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 "�еобходимо получить %sб/%sб архивов и�ходного кода.\n"
+
+#. 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 "�еобходимо получить %sб архивов и�ходного кода.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Получение и�ходного кода %s\n"
+
+#: 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 "Пропу�кает�� ра�паковка уже ра�пакованного и�ходного кода в %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Команда ра�паковки «%s» завершила�ь неудачно.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Проверьте, у�тановлен ли пакет «dpkg-dev».\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Команда �борки «%s» завершила�ь неудачно.\n"
+
+#: 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 ""
+"У %s от�ут�твует информаци� об архитектуре. Дл� её на�тройки �мотрите apt."
+"conf(5) APT::Architectures"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, 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"
+msgstr "�евозможно получить информацию о зави�имо�т�х дл� �борки %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s не имеет зави�имо�тей дл� �борки.\n"
+
+#: 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 ""
+"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как %s не "
+"разрешён дл� пакетов «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как пакет %s не "
+"найден"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"�е удало�ь удовлетворить зави�имо�ть типа %s дл� пакета %s: У�тановленный "
+"пакет %s новее, чем надо"
+
+#: 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"
+msgstr ""
+"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как вер�и�-"
+"кандидат пакета %s не может удовлетворить требовани�м по вер�ии"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как пакет %s не "
+"имеет вер�ии-кандидата"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "�евозможно удовлетворить зави�имо�ть типа %s дл� пакета %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Зави�имо�ти дл� �борки %s не могут быть удовлетворены."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Обработка зави�имо�тей дл� �борки завершила�ь неудачно"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -838,96 +1112,18 @@ msgstr "Полное учтённое про�тран�тво: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Эта команда у�тарела. И�пользуйте вме�то неё «apt-mark showauto»."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "�е удало�ь найти пакет %s"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "Зафик�ированные пакеты:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(не найдено)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  У�тановлен: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Кандидат: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(от�ут�твует)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Фик�атор пакета: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Таблица вер�ий:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"И�пользование: apt-cache [параметры] команда\n"
-"          или: apt-cache [параметры] show пакет1 [пакет2…]\n"
-"\n"
-"apt-cache — низкоуровневый ин�трумент дл� пои�ка\n"
-"информации в двоичных к�ш-файлах APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Команды:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Параметры:\n"
-"  -h   Эта �правка.\n"
-"  -p=? К�ш пакетов.\n"
-"  -s=? К�ш и�точников.\n"
-"  -q   �е показывать индикатор хода выполнени�.\n"
-"  -i   Показывать только важные зави�имо�ти дл� команды unmet.\n"
-"  -c=? Читать указанный файл на�тройки.\n"
-"  -o=? Задать значение произвольной на�тройки, например, -o dir::cache=/tmp\n"
-"Подробно�ти в �правочных �траницах apt-cache(8) и apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -961,11 +1157,12 @@ msgstr "показать текущую политику выбора пакет
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"И�пользование: apt [параметры] команда\n"
-"\n"
-"Интерфей� командной �троки дл� apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1006,7 +1203,6 @@ msgstr "обновить �и�тему, у�танавлива�/обновл�
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "обновить �и�тему, удал��/у�танавлива�/обновл�� пакеты"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1048,38 +1244,11 @@ msgstr "Повторите Ñ�тот процеÑ�Ñ� длÑ� вÑ�ех имеющиÑ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Параметры:\n"
-"  -h   �та �правка\n"
-"  -q   показывать �ообщени� о работе, не выводить индикатор хода работы\n"
-"  -qq  показывать только �ообщени� об ошибках\n"
-"  -s   не выполн�ть дей�тви� на �амом деле, только имитаци� работы\n"
-"  -f   читать/пи�ать данные о пометках в заданный файл\n"
-"  -c=? читать указанный файл на�тройки\n"
-"  -o=? задать значение произвольному параметру на�тройки,\n"
-"       например, -o dir::cache=/tmp\n"
-"В �правочных �траницах apt-mark(8) и apt.conf(5)\n"
-"�одержит�� дополнительна� информаци�."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "�епарные аргументы"
@@ -1088,24 +1257,9 @@ msgstr "�епарные аргументы"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"И�пользование: apt-config [параметры] команда\n"
-"\n"
-"apt-config — про�той ин�трумент дл� чтени� файла на�тройки APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Параметры:\n"
-"   -h   Этот тек�т.\n"
-"   -�=? Читать указанный файл на�тройки.\n"
-"   -o=? Задать значение произвольной на�тройке, например, -o dir::cache=/"
-"tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1117,31 +1271,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "�е удало�ь найти пакет дл� архитектуры «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "�е удало�ь найти пакет «%s» вер�ии «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "�е удало�ь найти пакет «%s» в выпу�ке «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "И�пользует�� «%s» в каче�тве и�ходного пакета вме�то «%s»\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "�е удало�ь найти вер�ию «%s» пакета «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "�е удало�ь найти пакет %s"
 
@@ -1163,192 +1292,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренн�� ошибка, решатель проблем в�ё поломал"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "�евозможно заблокировать каталог, куда �кладывают�� �качиваемые файлы"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Укажите как минимум один пакет, и�ходный код которого необходимо получить"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "�евозможно найти пакет � и�ходным кодом дл� %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"В�ИМ��ИЕ: упаковка «%s» поддерживает�� в �и�теме контрол� вер�ий «%s»:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"И�пользуйте:\n"
-"%s\n"
-"дл� получени� по�ледних (возможно не выпущенных) обновлений пакета.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Пропу�каем уже �качанный файл «%s»\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "�еобходимо получить %sб/%sб архивов и�ходного кода.\n"
-
-#. 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"
-msgstr "�еобходимо получить %sб архивов и�ходного кода.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Получение и�ходного кода %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "�екоторые архивы не удало�ь получить."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Пропу�кает�� ра�паковка уже ра�пакованного и�ходного кода в %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Команда ра�паковки «%s» завершила�ь неудачно.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Проверьте, у�тановлен ли пакет «dpkg-dev».\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Команда �борки «%s» завершила�ь неудачно.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Дл� проверки зави�имо�тей дл� �борки необходимо указать как минимум один "
-"пакет"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"У %s от�ут�твует информаци� об архитектуре. Дл� её на�тройки �мотрите apt."
-"conf(5) APT::Architectures"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Обработка зави�имо�тей дл� �борки завершила�ь неудачно"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "�евозможно получить информацию о зави�имо�т�х дл� �борки %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s не имеет зави�имо�тей дл� �борки.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как %s не "
-"разрешён дл� пакетов «%s»"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как пакет %s не "
-"найден"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"�е удало�ь удовлетворить зави�имо�ть типа %s дл� пакета %s: У�тановленный "
-"пакет %s новее, чем надо"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как вер�и�-"
-"кандидат пакета %s не может удовлетворить требовани�м по вер�ии"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Зави�имо�ть типа %s дл� %s не может быть удовлетворена, так как пакет %s не "
-"имеет вер�ии-кандидата"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "�евозможно удовлетворить зави�имо�ть типа %s дл� пакета %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Зави�имо�ти дл� �борки %s не могут быть удовлетворены."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Обработка зави�имо�тей дл� �борки завершила�ь неудачно"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "И�пользование: apt-get [параметры] команда\n"
 "               apt-get [параметры] install|remove пакет1 [пакет2…]\n"
@@ -1359,45 +1316,6 @@ msgstr ""
 "команды — update и install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Параметры:\n"
-"  -h   �та �правка\n"
-"  -q   показывать �ообщени� о работе, не выводить индикатор хода работы\n"
-"  -qq  показывать только �ообщени� об ошибках\n"
-"  -d   только �качать и �Е у�танавливать и не ра�паковывать архивы\n"
-"  -s   не выполн�ть дей�тви� на �амом деле, только имитаци� работы\n"
-"  -y   отвечать «Да» на в�е вопро�ы, �ами вопро�ы при �том не выводить\n"
-"  -f   попытать�� и�править �и�тему, имеющую �ломанные зави�имо�ти\n"
-"  -m   попытать�� продолжить, даже е�ли архивы не найдены\n"
-"  -u   показывать также �пи�ок обновл�емых пакетов\n"
-"  -b   �обрать пакет из и�ходного кода по�ле его получени�\n"
-"  -V   показывать полные номера вер�ий\n"
-"  -c=? читать указанный файл на�тройки\n"
-"  -o=? задать значение произвольному параметру на�тройки,\n"
-"       например, -o dir::cache=/tmp\n"
-"В �правочных �траницах apt-get(8), sources.list(5) и apt.conf(5)\n"
-"�одержит�� подробна� информаци� и опи�ание параметров.\n"
-"                       В APT е�ть коровь� СУПЕРСИЛ�.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "получить новые �пи�ки пакетов"
 
@@ -1473,11 +1391,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "И�пользование: apt-helper [параметры] команда\n"
 "       apt-helper [параметры] download-file uri target-path\n"
@@ -1485,10 +1405,6 @@ msgstr ""
 "apt-helper — в�помогательна� программа дл� apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "В �той программе е�ть Super Meep Powers."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "�качать файл по заданному uri в target-path"
 
@@ -1556,11 +1472,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "И�пользование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n"
 "\n"
@@ -1569,30 +1488,6 @@ msgstr ""
 "Также может показывать �пи�ки помеченных пакетов.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Параметры:\n"
-"  -h   �та �правка\n"
-"  -q   показывать �ообщени� о работе, не выводить индикатор хода работы\n"
-"  -qq  показывать только �ообщени� об ошибках\n"
-"  -s   не выполн�ть дей�тви� на �амом деле, только имитаци� работы\n"
-"  -f   читать/пи�ать данные о пометках в заданный файл\n"
-"  -c=? читать указанный файл на�тройки\n"
-"  -o=? задать значение произвольному параметру на�тройки,\n"
-"       например, -o dir::cache=/tmp\n"
-"В �правочных �траницах apt-mark(8) и apt.conf(5)\n"
-"�одержит�� дополнительна� информаци�."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "пометить указанные пакеты, как у�тановленные автоматиче�ки"
 
@@ -2087,17 +1982,13 @@ msgid "Merging available information"
 msgstr "Сли�ние до�тупной информации"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "И�пользование: apt-extracttemplates файл1 [файл2…]\n"
 "\n"
@@ -2124,17 +2015,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "�евозможно определить вер�ию debconf. Он у�тановлен?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "И�пользование: apt-internal-solver\n"
 "\n"
@@ -2155,26 +2041,10 @@ msgstr "Запи�ь о неизве�тном пакете!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"И�пользование: apt-sortpkgs [параметры] файл1 [файл2…]\n"
-"\n"
-"apt-sortpkgs — про�той ин�трумент дл� �ортировки �пи�ков пакетов. Параметр -"
-"s\n"
-"и�пользует�� дл� указани� типа �пи�ка.\n"
-"\n"
-"Параметры:\n"
-"  -h   �тот тек�т\n"
-"  -s   �ортировать �пи�ок файлов пакетов и�ходного кода\n"
-"  -c=? читать указанный файл на�тройки\n"
-"  -o=? Задать значение произвольной на�тройке, например, -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3941,6 +3811,149 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Ра�чёт обновлений"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "И�пользование: apt-cache [параметры] команда\n"
+#~ "          или: apt-cache [параметры] show пакет1 [пакет2…]\n"
+#~ "\n"
+#~ "apt-cache — низкоуровневый ин�трумент дл� пои�ка\n"
+#~ "информации в двоичных к�ш-файлах APT\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Команды:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Параметры:\n"
+#~ "  -h   Эта �правка.\n"
+#~ "  -p=? К�ш пакетов.\n"
+#~ "  -s=? К�ш и�точников.\n"
+#~ "  -q   �е показывать индикатор хода выполнени�.\n"
+#~ "  -i   Показывать только важные зави�имо�ти дл� команды unmet.\n"
+#~ "  -c=? Читать указанный файл на�тройки.\n"
+#~ "  -o=? Задать значение произвольной на�тройки, например, -o dir::cache=/"
+#~ "tmp\n"
+#~ "Подробно�ти в �правочных �траницах apt-cache(8) и apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "И�пользование: apt [параметры] команда\n"
+#~ "\n"
+#~ "Интерфей� командной �троки дл� apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Параметры:\n"
+#~ "  -h   �та �правка\n"
+#~ "  -q   показывать �ообщени� о работе, не выводить индикатор хода работы\n"
+#~ "  -qq  показывать только �ообщени� об ошибках\n"
+#~ "  -s   не выполн�ть дей�тви� на �амом деле, только имитаци� работы\n"
+#~ "  -f   читать/пи�ать данные о пометках в заданный файл\n"
+#~ "  -c=? читать указанный файл на�тройки\n"
+#~ "  -o=? задать значение произвольному параметру на�тройки,\n"
+#~ "       например, -o dir::cache=/tmp\n"
+#~ "В �правочных �траницах apt-mark(8) и apt.conf(5)\n"
+#~ "�одержит�� дополнительна� информаци�."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "И�пользование: apt-config [параметры] команда\n"
+#~ "\n"
+#~ "apt-config — про�той ин�трумент дл� чтени� файла на�тройки APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Параметры:\n"
+#~ "   -h   Этот тек�т.\n"
+#~ "   -�=? Читать указанный файл на�тройки.\n"
+#~ "   -o=? Задать значение произвольной на�тройке, например, -o dir::cache=/"
+#~ "tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Параметры:\n"
+#~ "  -h   �та �правка\n"
+#~ "  -q   показывать �ообщени� о работе, не выводить индикатор хода работы\n"
+#~ "  -qq  показывать только �ообщени� об ошибках\n"
+#~ "  -s   не выполн�ть дей�тви� на �амом деле, только имитаци� работы\n"
+#~ "  -f   читать/пи�ать данные о пометках в заданный файл\n"
+#~ "  -c=? читать указанный файл на�тройки\n"
+#~ "  -o=? задать значение произвольному параметру на�тройки,\n"
+#~ "       например, -o dir::cache=/tmp\n"
+#~ "В �правочных �траницах apt-mark(8) и apt.conf(5)\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"
+#~ msgstr ""
+#~ "И�пользование: apt-sortpkgs [параметры] файл1 [файл2…]\n"
+#~ "\n"
+#~ "apt-sortpkgs — про�той ин�трумент дл� �ортировки �пи�ков пакетов. "
+#~ "Параметр -s\n"
+#~ "и�пользует�� дл� указани� типа �пи�ка.\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -h   �тот тек�т\n"
+#~ "  -s   �ортировать �пи�ок файлов пакетов и�ходного кода\n"
+#~ "  -c=? читать указанный файл на�тройки\n"
+#~ "  -o=? Задать значение произвольной на�тройке, например, -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Порождённый проце�� завершил�� неудачно"
 
diff --git a/po/sk.po b/po/sk.po
index d7a2baea5..2905439fb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -174,6 +174,36 @@ msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Poznámka: „%s“ sa vyberá namiesto „%s“\n"
 
+#: 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 "Tento APT má schopnosti posvätnej kravy."
+
+#: 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 "Neboli nájdené žiadne balíky"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
@@ -218,6 +248,10 @@ msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 msgid "You don't have enough free space in %s."
 msgstr "Na %s nemáte dostatok voľného miesta."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Adresár pre sťahovanie sa nedá zamknúť"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
@@ -315,7 +349,7 @@ msgstr "Chcete pokra�ovať?"
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: 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 "Sťahovanie ukon�ené v režime „iba stiahnuť“"
 
@@ -716,9 +750,246 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Neboli nájdené žiadne balíky"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nedá sa nájsť balík %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Súbory balíka:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pripevnené balíky:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(nenájdené)"
+
+#. 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 "  Nainštalovaná verzia: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidát: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(žiadna)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Pripevnený balík:"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Tabuľka verzií:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nedá sa nájsť zdrojový balík pre %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"POZN.: tvorba balíka „%s“ sa spravuje v sytéme na riadenie revízií „%s“ na "
+"adrese:\n"
+"%s\n"
+
+#: 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 ""
+"Prosím, použite:\n"
+"%s\n"
+"ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
+"balíka.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
+
+#. 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 "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
+
+#. 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 "Je potrebné stiahnuť %sB zdrojových archívov.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Stiahnuť zdroj %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Zlyhalo stiahnutie niektorých archívov."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Skontrolujte, �i je nainštalovaný balík „dpkg-dev“.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
+"zostavenie"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
+"nájdete v apt.conf(5) APT::Architectures"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Spracovanie závislostí na zostavenie zlyhalo"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nedajú sa získať závislosti na zostavenie %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nemá žiadne závislosti na zostavenie.\n"
+
+#: 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 ""
+"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
+"„%s“"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
+
+#: 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"
+msgstr ""
+"%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
+"nedokáže splniť požiadavky na verziu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Závislosti na zostavenie %s nemožno splniť."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -827,99 +1098,20 @@ msgstr ""
 "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark "
 "showauto“."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nedá sa nájsť balík %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Súbory balíka:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pripevnené balíky:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(nenájdené)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Nainštalovaná verzia: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidát: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(žiadna)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Pripevnený balík:"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Tabuľka verzií:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Použitie: apt-cache [voľby] príkaz\n"
-"          apt-cache [voľby] show balík1 [balík2 ...]\n"
-"\n"
-"apt-cache je nízkoúrovňový nástroj na zisťovanie informácií\n"
-"z binárnych súborov vyrovnávacej pamäti APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Voľby:\n"
-"  -h   Tento pomocník.\n"
-"  -p=? Vyrovnávacia pamäť balíkov.\n"
-"  -s=? Vyrovnávacia pamäť zdrojov.\n"
-"  -q   Nezobrazí indikátor priebehu.\n"
-"  -i   Pri príkaze unmet zobrazí iba dôležité závislosti.\n"
-"  -c=? Na�íta tento konfigura�ný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-"Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n"
-"a apt.conf(5).\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Zobrazí zdrojové záznamy"
 
@@ -951,7 +1143,11 @@ msgstr "Zobrazí nastavenia zásad"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -997,7 +1193,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1034,36 +1229,11 @@ msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Voľby:\n"
-"  -h  Tento text pomocníka.\n"
-"  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
-"  -qq Nevypisovať ni�, len chyby\n"
-"  -s  Nevykonávať zmeny. Iba vypísať, �o by sa urobilo.\n"
-"  -f  �ítanie/zápis ozna�enia auto/manálne v uvedenom súbore\n"
-"  -c=? Na�ítať tento konfigura�ný súbor\n"
-"  -o=? Nastaviť ľubovoľný konfigura�nú voľbu, napr. -o dir::cache=/tmp\n"
-"Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf(5)."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumenty nie sú vo dvojiciach"
@@ -1072,23 +1242,9 @@ msgstr "Argumenty nie sú vo dvojiciach"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Použitie: apt-config [voľby] príkaz\n"
-"\n"
-"apt-config je jednoduchý nástroj na �ítanie konfigura�ného súboru APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Voľby:\n"
-"  -h   Tento pomocník.\n"
-"  -c=? Na�íta tento konfigura�ný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1099,31 +1255,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
@@ -1146,189 +1277,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ nie�o pokazil"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Nedá sa nájsť zdrojový balík pre %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"POZN.: tvorba balíka „%s“ sa spravuje v sytéme na riadenie revízií „%s“ na "
-"adrese:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Prosím, použite:\n"
-"%s\n"
-"ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
-"balíka.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-
-#. 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"
-msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Stiahnuť zdroj %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Zlyhalo stiahnutie niektorých archívov."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Skontrolujte, �i je nainštalovaný balík „dpkg-dev“.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
-"zostavenie"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
-"nájdete v apt.conf(5) APT::Architectures"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Nedajú sa získať závislosti na zostavenie %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
-"„%s“"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
-"nedokáže splniť požiadavky na verziu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Závislosti na zostavenie %s nemožno splniť."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Použitie: apt-get [voľby] príkaz\n"
 "          apt-get [voľby] install|remove balík1 [balík2 ...]\n"
@@ -1338,44 +1300,6 @@ msgstr ""
 "a inštaláciu balíkov. Najpoužívanejšími príkazmi sú update a install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Voľby:\n"
-"  -h  Tento pomocník\n"
-"  -q  Nezobrazí indikátor priebehu - pre záznam\n"
-"  -qq Zobrazí iba chyby\n"
-"  -d  Iba stiahne - neinštaluje ani nerozbaľuje archívy\n"
-"  -s  Žiadna akcia. Iba simuluje postupnosť pripravených akcií\n"
-"  -y  Na všetky otázky odpovedá �no\n"
-"  -f  Pokúsi sa opraviť systém s poškodenými závislosťami\n"
-"  -m  Skúsi pokra�ovať, aj ke� sa nepodarí nájsť archívy\n"
-"  -u  Zobrazí tiež zoznam aktualizovaných balíkov\n"
-"  -b  Po stiahnutí zdrojového balíka ho aj skompiluje\n"
-"  -V  Zobrazí �ísla verzií\n"
-"  -c=? Na�íta tento konfigura�ný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-"Viac volieb nájdete v manuálových stránkach apt-get(8), sources.list(5)\n"
-"a apt.conf(5).\n"
-"                       Tento APT má schopnosti posvätnej kravy.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Získa nové zoznamy balíkov"
 
@@ -1454,11 +1378,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1528,11 +1449,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n"
 "\n"
@@ -1541,28 +1465,6 @@ msgstr ""
 "Tiež dokáže ozna�enia vypisovať.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Voľby:\n"
-"  -h  Tento text pomocníka.\n"
-"  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
-"  -qq Nevypisovať ni�, len chyby\n"
-"  -s  Nevykonávať zmeny. Iba vypísať, �o by sa urobilo.\n"
-"  -f  �ítanie/zápis ozna�enia auto/manálne v uvedenom súbore\n"
-"  -c=? Na�ítať tento konfigura�ný súbor\n"
-"  -o=? Nastaviť ľubovoľný konfigura�nú voľbu, napr. -o dir::cache=/tmp\n"
-"Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf(5)."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Ozna�í uvedené balíky ako automaticky nainštalované"
 
@@ -2047,17 +1949,13 @@ msgid "Merging available information"
 msgstr "Zlu�ujú sa dostupné informácie"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n"
 "\n"
@@ -2085,17 +1983,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nedá sa ur�iť verzia programu debconf. Je debconf nainštalovaný?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Použitie: apt-internal-solver\n"
 "\n"
@@ -2116,25 +2009,10 @@ msgstr "Neznámy záznam o balíku!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n"
-"\n"
-"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n"
-"Voľbou -s si zvolíte typ súboru.\n"
-"\n"
-"Voľby:\n"
-"  -h   Tento pomocník\n"
-"  -s   Zotriedi zdrojový súbor\n"
-"  -c=? Na�íta tento konfigura�ný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3869,6 +3747,132 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Prepo�ítava sa aktualizácia"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Použitie: apt-cache [voľby] príkaz\n"
+#~ "          apt-cache [voľby] show balík1 [balík2 ...]\n"
+#~ "\n"
+#~ "apt-cache je nízkoúrovňový nástroj na zisťovanie informácií\n"
+#~ "z binárnych súborov vyrovnávacej pamäti APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Voľby:\n"
+#~ "  -h   Tento pomocník.\n"
+#~ "  -p=? Vyrovnávacia pamäť balíkov.\n"
+#~ "  -s=? Vyrovnávacia pamäť zdrojov.\n"
+#~ "  -q   Nezobrazí indikátor priebehu.\n"
+#~ "  -i   Pri príkaze unmet zobrazí iba dôležité závislosti.\n"
+#~ "  -c=? Na�íta tento konfigura�ný súbor\n"
+#~ "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+#~ "Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n"
+#~ "a apt.conf(5).\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Voľby:\n"
+#~ "  -h  Tento text pomocníka.\n"
+#~ "  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
+#~ "  -qq Nevypisovať ni�, len chyby\n"
+#~ "  -s  Nevykonávať zmeny. Iba vypísať, �o by sa urobilo.\n"
+#~ "  -f  �ítanie/zápis ozna�enia auto/manálne v uvedenom súbore\n"
+#~ "  -c=? Na�ítať tento konfigura�ný súbor\n"
+#~ "  -o=? Nastaviť ľubovoľný konfigura�nú voľbu, napr. -o dir::cache=/tmp\n"
+#~ "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt."
+#~ "conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Použitie: apt-config [voľby] príkaz\n"
+#~ "\n"
+#~ "apt-config je jednoduchý nástroj na �ítanie konfigura�ného súboru APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Voľby:\n"
+#~ "  -h   Tento pomocník.\n"
+#~ "  -c=? Na�íta tento konfigura�ný súbor\n"
+#~ "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Voľby:\n"
+#~ "  -h  Tento text pomocníka.\n"
+#~ "  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
+#~ "  -qq Nevypisovať ni�, len chyby\n"
+#~ "  -s  Nevykonávať zmeny. Iba vypísať, �o by sa urobilo.\n"
+#~ "  -f  �ítanie/zápis ozna�enia auto/manálne v uvedenom súbore\n"
+#~ "  -c=? Na�ítať tento konfigura�ný súbor\n"
+#~ "  -o=? Nastaviť ľubovoľný konfigura�nú voľbu, napr. -o dir::cache=/tmp\n"
+#~ "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt."
+#~ "conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n"
+#~ "Voľbou -s si zvolíte typ súboru.\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -h   Tento pomocník\n"
+#~ "  -s   Zotriedi zdrojový súbor\n"
+#~ "  -c=? Na�íta tento konfigura�ný súbor\n"
+#~ "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Proces potomka zlyhal"
 
diff --git a/po/sl.po b/po/sl.po
index d20dead61..657eb30e0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -174,6 +174,36 @@ msgstr "Paket '%s' ni nameš�en, zato ni bil odstranjen\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Izbiranje '%s' namesto '%s'\n"
 
+#: 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 "Ta APT ima mo�i super krav."
+
+#: 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 "Noben paket ni bil najden"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "POZOR: Naslednjih paketov ni bilo mogo�e overiti!"
@@ -218,6 +248,10 @@ msgstr "Ni mogo�e dolo�iti prostega prostora v %s"
 msgid "You don't have enough free space in %s."
 msgstr "Na %s je premalo prostora."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Ni mogo�e zakleniti mape prejemov"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
@@ -315,7 +349,7 @@ msgstr "Ali želite nadaljevati?"
 msgid "Some files failed to download"
 msgstr "Prejem nekaterih datotek ni uspel"
 
-#: 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 "Prejem je dokon�an in uporabljen je na�in samo prejema"
 
@@ -721,9 +755,245 @@ msgstr[3] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Noben paket ni bil najden"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni mogo�e najti paketa %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Datoteke paketa:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogo�"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Pripeti paketi:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(ni najdeno)"
+
+#. 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 "  Nameš�en: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(brez)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Bucika paketa: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Preglednica razli�ic:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Prezri nerazpoložljivo razli�ico '%s' paketa '%s'"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr ""
+"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Izvornega paketa za %s ni mogo�e najti"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora razli�ice '%s' na:\n"
+"%s\n"
+
+#: 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 ""
+"Uporabite:\n"
+"%s\n"
+"za pridobitev zadnjih (morda Å¡e neizdanih) posodobitev paketa.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Preskok že prejete datoteke '%s'\n"
+
+#. 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 "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
+
+#. 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 "Potrebno je dobiti %sB izvornih arhivov.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Dobi vir %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Nekaterih arhivov ni mogo�e pridobiti."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo presko�eno\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Izberite, �e je paket 'dpkg-dev' nameš�en.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Ukaz gradnje '%s' ni uspel.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti "
+"za gradnjo"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Za %s ni bilo mogo�e najti podatkov o arhitekturi. Za nastavitev si oglejte "
+"apt.conf(5) APT::Architectures"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Obdelava odvisnosti za gradnjo je spodletela"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni mogo�e dobiti podrobnosti o odvisnostih za gradnjo za %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nima odvisnosti za gradnjo.\n"
+
+#: 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 ""
+"odvisnosti %s za %s ni mogo�e zadovoljiti, ker %s ni dovoljen na paketih '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s odvisnosti za %s ni mogo�e zadostiti, ker ni mogo�e najti paketa %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Ni mogo�e zadostiti %s odvisnosti za %s. Nameš�en paket %s je preve� nov"
+
+#: 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"
+msgstr ""
+"odvisnosti %s za %s ni mogo�e zadovoljiti, ker je razli�ica kandidata paketa "
+"%s ne more zadostiti zahtev razli�ice"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"odvisnosti %s za %s ni mogo�e zadovoljiti, ker je razli�ica kandidata paketa "
+"%s nima razli�ice kandidata"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Ni mogo�e zadostiti %s odvisnosti za %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Odvisnosti za gradnjo %s ni bilo mogo�e zadostiti."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -831,97 +1101,18 @@ msgstr "Celotna velikost, izra�unana za: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ni mogo�e najti paketa %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Datoteke paketa:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogo�"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Pripeti paketi:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ni najdeno)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Nameš�en: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(brez)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Bucika paketa: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Preglednica razli�ic:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Uporaba: apt-cache [možnosti] ukaz\n"
-"       apt-cache [možnosti] show paket1 [paket2 ...]\n"
-"\n"
-"apt-cache je orodje nizke ravni za poizvedbo podatkov\n"
-"iz binarni datotek predpomnilnika APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Možnosti:\n"
-"  -h To besedilo pomo�i.\n"
-"  -p=? Predpomnilnik paketov.\n"
-"  -s=? Predpomnilnik izvorne kode.\n"
-"  -q Onemogo�i kazalnik napredka.\n"
-"  -i Pokaže le pomembne odvisnosti za neujemajo� ukaz.\n"
-"  -c=? Prebere to nastavitveno datoteko\n"
-"  -o=? Nastavi poljubno možnost nastavitve, na primer -o dir::cache=/tmp\n"
-"Za ve� podrobnosti si oglejte strani priro�nikov apt-cache(8) in apt."
-"conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -955,7 +1146,11 @@ msgstr "Prikaže nastavitve pravil"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -1001,7 +1196,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1038,36 +1232,11 @@ msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Možnosti:\n"
-"  -h To besedilo pomo�i.\n"
-"  -q Izhod se beleži - brez kazalnika napredka\n"
-"  -qq Brez izhoda razen napak\n"
-"  -s Ne naredi ni�esar. Samo napiše kaj bi bilo narejeno.\n"
-"  -f Prebere/zapiše oznako ro�no/samodejno za dano datoteko\n"
-"  -c=? Prebere to nastavitveno datoteko\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n"
-"Za ve� podrobnosti si oglejte strani priro�nika apt-mark(8) in apt-conf(5)."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumenti niso v parih"
@@ -1076,23 +1245,9 @@ msgstr "Argumenti niso v parih"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Uporaba: apt-config [možnosti] ukaz\n"
-"\n"
-"apt-config je preprosto orodje za branje nastavitvene datoteke APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Možnosti:\n"
-"  -h   To besedilo pomo�i.\n"
-"  -c=? Prebere podano datoteko z nastavitvami\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1103,31 +1258,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Z logi�nim izrazom '%s' ni mogo�e najti nobenega paketa"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Prezri nerazpoložljivo razli�ico '%s' paketa '%s'"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogo�e najti paketa %s"
@@ -1150,188 +1280,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Ni mogo�e zakleniti mape prejemov"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Izvornega paketa za %s ni mogo�e najti"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora razli�ice '%s' na:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Uporabite:\n"
-"%s\n"
-"za pridobitev zadnjih (morda Å¡e neizdanih) posodobitev paketa.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Preskok že prejete datoteke '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-
-#. 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"
-msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Dobi vir %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Nekaterih arhivov ni mogo�e pridobiti."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo presko�eno\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Izberite, �e je paket 'dpkg-dev' nameš�en.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Ukaz gradnje '%s' ni uspel.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti "
-"za gradnjo"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Za %s ni bilo mogo�e najti podatkov o arhitekturi. Za nastavitev si oglejte "
-"apt.conf(5) APT::Architectures"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni mogo�e dobiti podrobnosti o odvisnostih za gradnjo za %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s nima odvisnosti za gradnjo.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"odvisnosti %s za %s ni mogo�e zadovoljiti, ker %s ni dovoljen na paketih '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "%s odvisnosti za %s ni mogo�e zadostiti, ker ni mogo�e najti paketa %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Ni mogo�e zadostiti %s odvisnosti za %s. Nameš�en paket %s je preve� nov"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"odvisnosti %s za %s ni mogo�e zadovoljiti, ker je razli�ica kandidata paketa "
-"%s ne more zadostiti zahtev razli�ice"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"odvisnosti %s za %s ni mogo�e zadovoljiti, ker je razli�ica kandidata paketa "
-"%s nima razli�ice kandidata"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Ni mogo�e zadostiti %s odvisnosti za %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Odvisnosti za gradnjo %s ni bilo mogo�e zadostiti."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Uporaba: apt-get [možnosti] ukaz\n"
 "       apt-get [možnosti] install|remove paket1 [paket2 ...]\n"
@@ -1341,44 +1303,6 @@ msgstr ""
 "paketov. Najbolj pogosto uporabljana ukaza sta update in install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Možnosti:\n"
-"  -h To besedilo pomo�i.\n"
-"  -q Izhod se beleži - brez kazalnika napredka\n"
-"  -qq Ni izhoda razen napak\n"
-"  -d Le prejmi - NE nameš�aj ali odpakiraj arhivov\n"
-"  -s Ne naredi ni�esar. Izvedi simulacijo ukaza\n"
-"  -y Predpostavi Da vsem poizvedbam in ne pozivaj\n"
-"  -f Poskusi popraviti sistem s pokvarjenimi odvisnostmi\n"
-"  -m Poskusi nadaljevati, �e arhivov ni mogo�e najti\n"
-"  -u Pokaži tudi seznam nadgrajenih paketov\n"
-"  -b Po pridobitvi izgradi izvorni paket\n"
-"  -V Pokaži podrobne številke razli�ic\n"
-"  -c=? Preberi to nastavitveno datoteko\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n"
-"Za ve� podrobnosti in možnosti si oglejte strani priro�nikov apt-get(8),\n"
-" sources.list(5) in apt.conf(5). \n"
-"                       Ta APT ima mo�i super krav.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Pridobi nove sezname paketov"
 
@@ -1458,11 +1382,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1532,11 +1453,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
@@ -1544,28 +1468,6 @@ msgstr ""
 "kot ro�no ali samodejno nameš�enih. Oznake lahko tudi izpiše.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Možnosti:\n"
-"  -h To besedilo pomo�i.\n"
-"  -q Izhod se beleži - brez kazalnika napredka\n"
-"  -qq Brez izhoda razen napak\n"
-"  -s Ne naredi ni�esar. Samo napiše kaj bi bilo narejeno.\n"
-"  -f Prebere/zapiše oznako ro�no/samodejno za dano datoteko\n"
-"  -c=? Prebere to nastavitveno datoteko\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n"
-"Za ve� podrobnosti si oglejte strani priro�nika apt-mark(8) in apt-conf(5)."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Ozna�i dane pakete kot samodejno nameš�ene"
 
@@ -2051,17 +1953,13 @@ msgid "Merging available information"
 msgstr "Združevanje razpoložljivih podaktov"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Uporaba: apt-extracttemplates dat1 [dat2 ...]\n"
 "\n"
@@ -2089,17 +1987,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni mogo�e ugotoviti razli�ice debconfa. Je sploh nameš�en?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Uporaba: apt-internal-solver\n"
 "\n"
@@ -2121,26 +2014,10 @@ msgstr "Neznan zapis paketa!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
-"\n"
-"apt-sortpkgs je preprosto orodje za razvrš�anje paketnih datotek. Možnost -"
-"s\n"
-"dolo�a vrsto datoteke.\n"
-"\n"
-"Možnosti:\n"
-"  -h   to besedilo pomo�i\n"
-"  -s   uporabi razvrš�anje izvornih datotek\n"
-"  -c=? Prebere podano datoteko z nastavitvami\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3875,6 +3752,136 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Prera�unavanje nadgradnje"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Uporaba: apt-cache [možnosti] ukaz\n"
+#~ "       apt-cache [možnosti] show paket1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-cache je orodje nizke ravni za poizvedbo podatkov\n"
+#~ "iz binarni datotek predpomnilnika APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Možnosti:\n"
+#~ "  -h To besedilo pomo�i.\n"
+#~ "  -p=? Predpomnilnik paketov.\n"
+#~ "  -s=? Predpomnilnik izvorne kode.\n"
+#~ "  -q Onemogo�i kazalnik napredka.\n"
+#~ "  -i Pokaže le pomembne odvisnosti za neujemajo� ukaz.\n"
+#~ "  -c=? Prebere to nastavitveno datoteko\n"
+#~ "  -o=? Nastavi poljubno možnost nastavitve, na primer -o dir::cache=/tmp\n"
+#~ "Za ve� podrobnosti si oglejte strani priro�nikov apt-cache(8) in apt."
+#~ "conf(5).\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Možnosti:\n"
+#~ "  -h To besedilo pomo�i.\n"
+#~ "  -q Izhod se beleži - brez kazalnika napredka\n"
+#~ "  -qq Brez izhoda razen napak\n"
+#~ "  -s Ne naredi ni�esar. Samo napiše kaj bi bilo narejeno.\n"
+#~ "  -f Prebere/zapiše oznako ro�no/samodejno za dano datoteko\n"
+#~ "  -c=? Prebere to nastavitveno datoteko\n"
+#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/"
+#~ "tmp\n"
+#~ "Za ve� podrobnosti si oglejte strani priro�nika apt-mark(8) in apt-"
+#~ "conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Uporaba: apt-config [možnosti] ukaz\n"
+#~ "\n"
+#~ "apt-config je preprosto orodje za branje nastavitvene datoteke APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Možnosti:\n"
+#~ "  -h   To besedilo pomo�i.\n"
+#~ "  -c=? Prebere podano datoteko z nastavitvami\n"
+#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/"
+#~ "tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Možnosti:\n"
+#~ "  -h To besedilo pomo�i.\n"
+#~ "  -q Izhod se beleži - brez kazalnika napredka\n"
+#~ "  -qq Brez izhoda razen napak\n"
+#~ "  -s Ne naredi ni�esar. Samo napiše kaj bi bilo narejeno.\n"
+#~ "  -f Prebere/zapiše oznako ro�no/samodejno za dano datoteko\n"
+#~ "  -c=? Prebere to nastavitveno datoteko\n"
+#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/"
+#~ "tmp\n"
+#~ "Za ve� podrobnosti si oglejte strani priro�nika apt-mark(8) in apt-"
+#~ "conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs je preprosto orodje za razvrš�anje paketnih datotek. Možnost "
+#~ "-s\n"
+#~ "dolo�a vrsto datoteke.\n"
+#~ "\n"
+#~ "Možnosti:\n"
+#~ "  -h   to besedilo pomo�i\n"
+#~ "  -s   uporabi razvrš�anje izvornih datotek\n"
+#~ "  -c=? Prebere podano datoteko z nastavitvami\n"
+#~ "  -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Podrejeno opravilo ni uspelo"
 
diff --git a/po/sv.po b/po/sv.po
index e93e29282..ec61327ba 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2015-08-19 21:33+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -175,6 +175,36 @@ msgstr "Paketet �%s� är inte installerat, så det tas inte bort\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Observera, väljer \"%s\" istället för \"%s\"\n"
 
+#: 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 "Denna APT har Speciella Ko-Krafter."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Denna APT-hjälpare har speciella Meep-krafter."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Inga paket hittades"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VARNING: Följande paket kunde inte autentiseras!"
@@ -219,6 +249,10 @@ msgstr "Kunde inte fastställa ledigt utrymme i %s"
 msgid "You don't have enough free space in %s."
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Kunde inte låsa hämtningskatalogen"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
@@ -319,7 +353,7 @@ msgstr "Vill du fortsätta?"
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
-#: 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 "Hämtningen färdig i �endast-hämta�-läge"
 
@@ -713,9 +747,248 @@ msgstr[1] "Det finns %i ytterligare poster. Använd växeln �-a� för att se
 msgid "not a real package (virtual)"
 msgstr "inte ett riktigt paket (virtuellt)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Inga paket hittades"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kunde inte hitta paketet %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "�Package�-filer:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Fastnålade paket:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(hittades inte)"
+
+#. 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 "  Installerad: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidat: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(ingen)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Paketnålning: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Versionstabell:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Kan inte hitta något paket för arkitekturen �%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Kan inte hitta något paket �%s� med versionen �%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Kunde inte hitta något paket �%s� med utgåvan �%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Väljer �%s� som källkodspaket istället för �%s�\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Kan inte hitta versionen �%s� av paketet �%s�"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Du måste ange minst ett paket att hämta källkod för"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Kunde inte hitta något källkodspaket för %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"OBSERVERA: paketering av �%s� hanteras i versionshanteringssystemet �%s� "
+"på:\n"
+"%s\n"
+
+#: 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 ""
+"Använd:\n"
+"%s\n"
+"för att hämta de senaste (möjligen inte utgivna) uppdateringarna av "
+"paketet.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hoppar över redan hämtade filen �%s�\n"
+
+#. 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 "Behöver hämta %sB/%sB källkodsarkiv.\n"
+
+#. 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 "Behöver hämta %sB källkodsarkiv.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Hämtar källkoden %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Misslyckades med att hämta vissa arkiv."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Packar inte upp redan uppackad källkod i %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Uppackningskommandot �%s� misslyckades.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Försäkra dig om att paketet �dpkg-dev� är installerat.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Byggkommandot �%s� misslyckades.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Ingen arkitekturinformation tillgänglig för %s. Se apt.conf(5) APT::"
+"Architectures för inställning"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr "Observera, använder katalogen �%s� för att få byggberoendena\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Observera, använder filen �%s� för att få byggberoendena\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Kunde inte hämta information om byggberoenden för %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s har inga byggberoenden.\n"
+
+#: 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 ""
+"%s-beroendet på %s kan inte tillfredsställas eftersom %s inte är tillåtet på "
+"�%s�-paket"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
+"hittas"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
+"paketet %s är för nytt"
+
+#: 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"
+msgstr ""
+"%s-beroendet på %s kan inte tillfredsställas eftersom kandidatversionen av "
+"paketet %s inte tillfredsställer versionskraven"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte har "
+"någon kandidatversion"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Byggberoenden för %s kunde inte tillfredsställas."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Misslyckades med att behandla byggberoenden"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -824,96 +1097,18 @@ msgstr "Totalt utrymme som kan redogöras för: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Detta kommando är föråldrat. Använd �apt-mark showauto� istället."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kunde inte hitta paketet %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "�Package�-filer:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Fastnålade paket:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(hittades inte)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Installerad: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidat: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ingen)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Paketnålning: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Versionstabell:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Användning: apt-cache [flaggor] kommando\n"
-"            apt-cache [flaggor] show paket1 [paket2 …]\n"
-"\n"
-"apt-cache är ett lågnivåverktyg för att hämta information\n"
-"från APTs binära cachefiler\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Kommandon:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -p=? Paketcachen.\n"
-"  -s=? Källcachen.\n"
-"  -q   Inaktivera förloppsindikatorn.\n"
-"  -i   Visa endast viktiga beroenden för �unmet�-kommandot.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-"Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -947,11 +1142,12 @@ msgstr "Visa policyinställningar"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Användning: apt [flaggor] kommando\n"
-"\n"
-"Kommandoradsgränssnitt för apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -992,7 +1188,6 @@ msgstr "uppgradera systemet genom att installera/uppgradera paket"
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "uppgradera systemet genom att ta bort/installera/uppgradera paket"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1033,36 +1228,10 @@ msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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 ""
-"Flaggor:\n"
-"  -h  Denna hjälptext.\n"
-"  -q  Loggbar utdata - ingen förloppsindikator\n"
-"  -qq Ingen utdata förutom vid fel\n"
-"  -s  Gör ingenting, simulera vad som skulle hända.\n"
-"  -f  läs/skriv markering som automatiskt/manuellt installerad i angiven "
-"fil\n"
-"  -c=? Läs denna konfigurationsfil\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-"Se manualsidorna för apt-mark(8) och apt.conf(5) för mer information."
 
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
@@ -1072,23 +1241,9 @@ msgstr "Argumenten gavs inte parvis"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Användning: apt-config [flaggor] kommando\n"
-"\n"
-"apt-config är ett enkelt verktyg för att läsa APTs konfigurationsfil\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1100,31 +1255,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Kan inte hitta något paket för arkitekturen �%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Kan inte hitta något paket �%s� med versionen �%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Kunde inte hitta något paket �%s� med utgåvan �%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Väljer �%s� som källkodspaket istället för �%s�\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Kan inte hitta versionen �%s� av paketet �%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
@@ -1146,191 +1276,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Kunde inte låsa hämtningskatalogen"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Du måste ange minst ett paket att hämta källkod för"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Kunde inte hitta något källkodspaket för %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"OBSERVERA: paketering av �%s� hanteras i versionshanteringssystemet �%s� "
-"på:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Använd:\n"
-"%s\n"
-"för att hämta de senaste (möjligen inte utgivna) uppdateringarna av "
-"paketet.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Hoppar över redan hämtade filen �%s�\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
-
-#. 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"
-msgstr "Behöver hämta %sB källkodsarkiv.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Hämtar källkoden %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Misslyckades med att hämta vissa arkiv."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Packar inte upp redan uppackad källkod i %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Uppackningskommandot �%s� misslyckades.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Försäkra dig om att paketet �dpkg-dev� är installerat.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Byggkommandot �%s� misslyckades.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Ingen arkitekturinformation tillgänglig för %s. Se apt.conf(5) APT::"
-"Architectures för inställning"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr "Observera, använder katalogen �%s� för att få byggberoendena\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Observera, använder filen �%s� för att få byggberoendena\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Kunde inte hämta information om byggberoenden för %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s har inga byggberoenden.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"%s-beroendet på %s kan inte tillfredsställas eftersom %s inte är tillåtet på "
-"�%s�-paket"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
-"hittas"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
-"paketet %s är för nytt"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%s-beroendet på %s kan inte tillfredsställas eftersom kandidatversionen av "
-"paketet %s inte tillfredsställer versionskraven"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte har "
-"någon kandidatversion"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Misslyckades med att behandla byggberoenden"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Användning: apt-get [flaggor] kommando\n"
 "       apt-get [flaggor] install|remove paket1 [paket2 …]\n"
@@ -1340,44 +1299,6 @@ msgstr ""
 "paket. De mest använda kommandona är �update� och �install�.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -q   Loggbar utdata - ingen förloppsindikator.\n"
-"  -qq  Ingen utdata förutom vid fel.\n"
-"  -d   Bara hämta - VARKEN installera eller packa upp arkiven.\n"
-"  -s   Gör ingenting, simulera vad som skulle hända.\n"
-"  -y   Antag ja på alla frågor utan att fråga.\n"
-"  -f   Försök rätta ett system med otillfredsställda beroenden.\n"
-"  -m   Försök fortsätta även om arkiven inte kan hittas.\n"
-"  -u   Visa även en lista över uppgraderade paket.\n"
-"  -b   Bygg källkodspaketet när det hämtats.\n"
-"  -V   Visa pratsamma versionsnummer.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-"Se manualsidorna för apt-get(8), sources.list(5) och apt.conf(5)\n"
-"för mer information och flaggor.\n"
-"                     Denna APT har Speciella Ko-Krafter.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Hämta nya paketlistor"
 
@@ -1451,11 +1372,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Användning: apt-helper [flaggor] kommando\n"
 "       apt-helper [flaggor] download-file uri målsökväg\n"
@@ -1463,10 +1386,6 @@ msgstr ""
 "apt-helper är en intern hjälpare för apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Denna APT-hjälpare har speciella Meep-krafter."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "hämta angiven uri till målsökvägen"
 
@@ -1533,11 +1452,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Användning: apt-mark [flaggor] {auto|manual} paket1 [paket2 …]\n"
 "\n"
@@ -1546,29 +1468,6 @@ msgstr ""
 "lista markeringar.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Flaggor:\n"
-"  -h  Denna hjälptext.\n"
-"  -q  Loggbar utdata - ingen förloppsindikator\n"
-"  -qq Ingen utdata förutom vid fel\n"
-"  -s  Gör ingenting, simulera vad som skulle hända.\n"
-"  -f  läs/skriv markering som automatiskt/manuellt installerad i angiven "
-"fil\n"
-"  -c=? Läs denna konfigurationsfil\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-"Se manualsidorna för apt-mark(8) och apt.conf(5) för mer information."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Markera de angivna paketen som automatiskt installerade"
 
@@ -2065,17 +1964,13 @@ msgid "Merging available information"
 msgstr "Sammanfogar tillgänglig information"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Användning: apt-extracttemplates fil1 [fil2 …]\n"
 "\n"
@@ -2103,17 +1998,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Användning: apt-internal-solver\n"
 "\n"
@@ -2135,25 +2025,10 @@ msgstr "Okänd paketpost!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Användning: apt-sortpkgs [flaggor] fil1 [fil2 …]\n"
-"\n"
-"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n"
-"-s anges för att ange filens typ.\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -s   Använd källkodsfilssortering.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3910,6 +3785,148 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Beräknar uppgradering"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Användning: apt-cache [flaggor] kommando\n"
+#~ "            apt-cache [flaggor] show paket1 [paket2 …]\n"
+#~ "\n"
+#~ "apt-cache är ett lågnivåverktyg för att hämta information\n"
+#~ "från APTs binära cachefiler\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Kommandon:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Flaggor:\n"
+#~ "  -h   Denna hjälptext.\n"
+#~ "  -p=? Paketcachen.\n"
+#~ "  -s=? Källcachen.\n"
+#~ "  -q   Inaktivera förloppsindikatorn.\n"
+#~ "  -i   Visa endast viktiga beroenden för �unmet�-kommandot.\n"
+#~ "  -c=? Läs denna konfigurationsfil.\n"
+#~ "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/"
+#~ "tmp\n"
+#~ "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Användning: apt [flaggor] kommando\n"
+#~ "\n"
+#~ "Kommandoradsgränssnitt för apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Flaggor:\n"
+#~ "  -h  Denna hjälptext.\n"
+#~ "  -q  Loggbar utdata - ingen förloppsindikator\n"
+#~ "  -qq Ingen utdata förutom vid fel\n"
+#~ "  -s  Gör ingenting, simulera vad som skulle hända.\n"
+#~ "  -f  läs/skriv markering som automatiskt/manuellt installerad i angiven "
+#~ "fil\n"
+#~ "  -c=? Läs denna konfigurationsfil\n"
+#~ "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/"
+#~ "tmp\n"
+#~ "Se manualsidorna för apt-mark(8) och apt.conf(5) för mer information."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Användning: apt-config [flaggor] kommando\n"
+#~ "\n"
+#~ "apt-config är ett enkelt verktyg för att läsa APTs konfigurationsfil\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Flaggor:\n"
+#~ "  -h   Denna hjälptext.\n"
+#~ "  -c=? Läs denna konfigurationsfil.\n"
+#~ "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/"
+#~ "tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Flaggor:\n"
+#~ "  -h  Denna hjälptext.\n"
+#~ "  -q  Loggbar utdata - ingen förloppsindikator\n"
+#~ "  -qq Ingen utdata förutom vid fel\n"
+#~ "  -s  Gör ingenting, simulera vad som skulle hända.\n"
+#~ "  -f  läs/skriv markering som automatiskt/manuellt installerad i angiven "
+#~ "fil\n"
+#~ "  -c=? Läs denna konfigurationsfil\n"
+#~ "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/"
+#~ "tmp\n"
+#~ "Se manualsidorna för apt-mark(8) och apt.conf(5) för mer information."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Användning: apt-sortpkgs [flaggor] fil1 [fil2 …]\n"
+#~ "\n"
+#~ "apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n"
+#~ "-s anges för att ange filens typ.\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -h   Denna hjälptext.\n"
+#~ "  -s   Använd källkodsfilssortering.\n"
+#~ "  -c=? Läs denna konfigurationsfil.\n"
+#~ "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Use --allow-insecure-repositories to force the update"
 #~ msgstr "Använd --allow-insecure-repositories för att tvinga uppdateringen"
 
diff --git a/po/th.po b/po/th.po
index 0394f3330..74ebca034 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-12-12 13:00+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -170,6 +170,36 @@ msgstr "�พ�เ�จ '%s' ไม่ได้ติดตั้งไว้
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "หมายเหตุ: จะเลือ� '%s' �ทน '%s'\n"
 
+#: 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 นี้มีพลังของ Super Cow"
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "โปร��รมช่วยเหลือของ APT นี้มีพลัง Super Meep"
+
+#: 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 "*คำเตือน*: �พ�เ�จต่อไปนี้ไม่สามารถยืนยัน�หล่งต้นตอได้!"
@@ -214,6 +244,10 @@ msgstr "ไม่สามารถคำนวณพื้นที่ว่า
 msgid "You don't have enough free space in %s."
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "ไม่สามารถล็อคไดเร�ทอรีดาวน์โหลด"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เ�ิดข้อผิดพลาดภายใน: มี�ารเรีย� InstallPackages ด้วย�พ�เ�จที่เสีย!"
@@ -309,7 +343,7 @@ 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 "ดาวน์โหลดสำเร็จ�ล้ว �ละอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
@@ -683,9 +717,238 @@ msgstr[0] "มีอีà¸� %i ระเบียน à¸�รุณาใช้ตà
 msgid "not a real package (virtual)"
 msgstr "ไม่ใช่�พ�เ�จจริง (เสมือน)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "ไม่พบ�พ�เ�จ"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "ไม่พบ�พ�เ�จ %s"
+
+#: 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 "�พ�เ�จที่ถู�ตรึง:"
+
+#: 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
+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 "(ไม่มี)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+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 "ไม่พบ�พ�เ�จสำหรับสถาปัตย�รรม '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "ไม่พบ�พ�เ�จ '%s' ที่มีรุ่นเป็น '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "ไม่พบ�พ�เ�จ '%s' ที่มีชุดจัด�จ�เป็น '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "จะเลือ� '%s' เป็น�พ�เ�จซอร์ส�ทน '%s'\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "ไม่พบรุ่น '%s' ของ�พ�เ�จ '%s'"
+
+#: 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 "ไม่พบ�พ�เ�จซอร์สโค้ดสำหรับ %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"ข้อสังเ�ต: �ารจัดทำ�พ�เ�จ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n"
+"%s\n"
+
+#: 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 ""
+"�รุณาใช้:\n"
+"%s\n"
+"เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออ�มา) ของตัว�พ�เ�จ\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "จะข้าม�ฟ้ม '%s' ที่ดาวน์โหลดไว้�ล้ว\n"
+
+#. 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 "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
+
+#. 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 "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "ดาวน์โหลดซอร์ส %s\n"
+
+#: 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 "จะข้าม�าร�ต�ซอร์สของซอร์สที่�ต�ไว้�ล้วใน %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "คำสั่ง�ต��ฟ้ม '%s' ล้มเหลว\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "�รุณาตรวจสอบว่าได้ติดตั้ง�พ�เ�จ 'dpkg-dev' �ล้ว\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "คำสั่ง build '%s' ล้มเหลว\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "ต้องระบุ�พ�เ�จอย่างน้อยหนึ่ง�พ�เ�จที่จะตรวจสอบสิ่งที่ต้อง�ารสำหรับ�าร build"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"ไม่มีข้อมูลสถาปัตย�รรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ไม่สำเร็จ"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้อง�ารสำหรับ�าร build ของ %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s ไม่ต้อง�ารสิ่งใดสำหรับ build\n"
+
+#: 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 ""
+"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s �ับ�พ�เ�จ '%s' ได้"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบ�พ�เ�จ %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: �พ�เ�จ %s ที่ติดตั้งไว้ใหม่เ�ินไป"
+
+#: 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"
+msgstr ""
+"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มี�พ�เ�จ %s "
+"รุ่นที่จะสอดคล้อง�ับความต้อง�ารรุ่นของ�พ�เ�จได้"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ของ %s ได้"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ไม่สำเร็จ"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -791,95 +1054,18 @@ msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "คำสั่งนี้ไม่�นะนำให้ใช้�ล้ว �รุณาใช้ 'apt-mark showauto' �ทน"
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "ไม่พบ�พ�เ�จ %s"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "�พ�เ�จที่ถู�ตรึง:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(ไม่พบ)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  ที่ติดตั้งอยู่: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  รุ่นที่ติดตั้งได้: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ไม่มี)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  �ารตรึง�พ�เ�จ: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  ตารางรุ่น:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"วิธีใช้: apt-cache [ตัวเลือ�] คำสั่ง\n"
-"       apt-cache [ตัวเลือ�] show pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache เป็นเครื่องมือระดับล่างสำหรับสืบค้นข้อมูลจา��ฟ้ม�คชไบนารีของ APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "คำสั่ง:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"ตัวเลือ�:\n"
-"  -h   �สดงข้อความช่วยเหลือนี้\n"
-"  -p=? �ฟ้ม�คชของ�พ�เ�จ\n"
-"  -s=? �ฟ้ม�คชของซอร์ส\n"
-"  -q   ปิด�ถบ�สดงความคืบหน้า\n"
-"  -i   �สดงเฉพาะข้อมูลความเชื่อมโยงที่สำคั�สำหรับคำสั่ง unmet\n"
-"  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
-"  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-"�รุณาอ่านข้อมูลเพิ่มเติมจา� manual page apt-cache(8) �ละ apt.conf(5)\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -913,11 +1099,12 @@ msgstr "�สดงค่าตั้งนโยบาย"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"วิธีใช้: apt [ตัวเลือ�] คำสั่ง\n"
-"\n"
-"บรรทัดคำสั่งสำหรับ apt\n"
 
 #. query
 #: cmdline/apt.cc
@@ -958,7 +1145,6 @@ msgstr "ปรับรุ่นระบบโดยติดตั้ง/ปà¸
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "ปรับรุ่นระบบโดยถอดถอน/ติดตั้ง/ปรับรุ่น�พ�เ�จต่างๆ"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -997,36 +1183,11 @@ msgstr "ทำเช่นนี้ต่อไป�ับ�ผ่นซีด
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"ตัวเลือ�:\n"
-"  -h  �สดงข้อความช่วยเหลือนี้\n"
-"  -q  �สดงผลลัพธ์�บบบันทึ�ลง�ฟ้มได้ - ไม่ต้อง�สดงความคืบหน้า\n"
-"  -qq ไม่ต้อง�สดงผลลัพธ์ ย�เว้นข้อผิดพลาด\n"
-"  -s  ไม่ต้องทำจริง เพียงจำลองลำดับ�ารทำงานเท่านั้น\n"
-"  -f  อ่าน/เขียน เครื่องหมาย อัตโนมัติ/เลือ�เอง ใน�ฟ้มที่�ำหนด\n"
-"  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
-"  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-"�รุณาอ่านข้อมูลเพิ่มเติมจา� manual page apt-mark(8) �ละ apt.conf(5)"
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "อาร์�ิวเมนต์ไม่ได้ระบุเป็นคู่ๆ"
@@ -1035,23 +1196,9 @@ msgstr "อาร์�ิวเมนต์ไม่ได้ระบุเป
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"วิธีใช้: apt-config [ตัวเลือ�] คำสั่ง\n"
-"\n"
-"apt-config เป็นเครื่องมือง่ายๆ ที่ใช้อ่าน�ฟ้มค่าตั้ง APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"ตัวเลือ�:\n"
-"  -h   ข้อความช่วยเหลือนี้\n"
-"  -c=? อ่าน�ฟ้มค่าตั้งที่�ำหนด\n"
-"  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1063,31 +1210,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "ไม่พบ�พ�เ�จสำหรับสถาปัตย�รรม '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "ไม่พบ�พ�เ�จ '%s' ที่มีรุ่นเป็น '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "ไม่พบ�พ�เ�จ '%s' ที่มีชุดจัด�จ�เป็น '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "จะเลือ� '%s' เป็น�พ�เ�จซอร์ส�ทน '%s'\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "ไม่พบรุ่น '%s' ของ�พ�เ�จ '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบ�พ�เ�จ %s"
 
@@ -1107,181 +1229,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "เ�ิดข้อผิดพลาดภายใน: �ลไ��าร��้ปั�หาทำความเสียหาย"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "ไม่สามารถล็อคไดเร�ทอรีดาวน์โหลด"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "ต้องระบุ�พ�เ�จอย่างน้อยหนึ่ง�พ�เ�จที่จะดาวน์โหลดซอร์สโค้ด"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "ไม่พบ�พ�เ�จซอร์สโค้ดสำหรับ %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"ข้อสังเ�ต: �ารจัดทำ�พ�เ�จ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"�รุณาใช้:\n"
-"%s\n"
-"เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออ�มา) ของตัว�พ�เ�จ\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "จะข้าม�ฟ้ม '%s' ที่ดาวน์โหลดไว้�ล้ว\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
-
-#. 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"
-msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "ดาวน์โหลดซอร์ส %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "ไม่สามารถดาวน์โหลดบาง�ฟ้ม"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "จะข้าม�าร�ต�ซอร์สของซอร์สที่�ต�ไว้�ล้วใน %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "คำสั่ง�ต��ฟ้ม '%s' ล้มเหลว\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "�รุณาตรวจสอบว่าได้ติดตั้ง�พ�เ�จ 'dpkg-dev' �ล้ว\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "ต้องระบุ�พ�เ�จอย่างน้อยหนึ่ง�พ�เ�จที่จะตรวจสอบสิ่งที่ต้อง�ารสำหรับ�าร build"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"ไม่มีข้อมูลสถาปัตย�รรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ไม่สำเร็จ"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้อง�ารสำหรับ�าร build ของ %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s ไม่ต้อง�ารสิ่งใดสำหรับ build\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s �ับ�พ�เ�จ '%s' ได้"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบ�พ�เ�จ %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: �พ�เ�จ %s ที่ติดตั้งไว้ใหม่เ�ินไป"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มี�พ�เ�จ %s "
-"รุ่นที่จะสอดคล้อง�ับความต้อง�ารรุ่นของ�พ�เ�จได้"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ของ %s ได้"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับ�าร build ไม่สำเร็จ"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "วิธีใช้:  apt-get [ตัวเลือ�] คำสั่ง\n"
 "       apt-get [ตัวเลือ�] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,44 +1252,6 @@ msgstr ""
 "update �ละ install\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"ตัวเลือ�:\n"
-"  -h  �สดงข้อความช่วยเหลือนี้\n"
-"  -q  �สดงผลลัพธ์�บบบันทึ�ลง�ฟ้มได้ - ไม่ต้อง�สดงความคืบหน้า\n"
-"  -qq ไม่ต้อง�สดงผลลัพธ์ ย�เว้นข้อผิดพลาด\n"
-"  -d  ดาวน์โหลดอย่างเดียว - *ไม่ต้อง* ติดตั้งหรือ�ต��พ�เ�จ\n"
-"  -s  ไม่ต้องทำจริง เพียงจำลองลำดับ�ารทำงานเท่านั้น\n"
-"  -y  ตอบ Yes สำหรับทุ�คำถามโดยไม่ต้องถาม\n"
-"  -f  พยายาม��้ไขระบบใน�รณีที่มีปั�หาความขึ้นต่อ�ันระหว่าง�พ�เ�จ\n"
-"  -m  พยายามดำเนิน�ารต่อถ้าหา�ฟ้ม�พ�เ�จไม่พบ\n"
-"  -u  �สดงรายชื่อของ�พ�เ�จที่จะปรับรุ่นทั้งหมดด้วย\n"
-"  -b  build �พ�เ�จซอร์สหลังจา�ดาวน์โหลดมา�ล้วด้วย\n"
-"  -V  �สดงเลขรุ่น�บบยาวของโปร��รม\n"
-"  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
-"  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-"�รุณาอ่านข้อมูล�ละตัวเลือ�เพิ่มเติมจา� manual page apt-get(8), sources.list(5)\n"
-"�ละ apt.conf(5)\n"
-"                       APT นี้มีพลังของ Super Cow\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "ดาวน์โหลดรายชื่อ�พ�เ�จชุดใหม่"
 
@@ -1402,11 +1325,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "วิธีใช้: apt-helper [ตัวเลือ�] คำสั่ง\n"
 "      apt-helper [ตัวเลือ�] download-file URI พาธปลายทาง\n"
@@ -1414,10 +1339,6 @@ msgstr ""
 "apt-helper เป็นโปร��รมช่วยเหลือภายในของ apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "โปร��รมช่วยเหลือของ APT นี้มีพลัง Super Meep"
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "ดาวน์โหลด URI ที่�ำหนดลงในพาธปลายทาง"
 
@@ -1484,11 +1405,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "วิธีใช้: apt-mark [ตัวเลือ�] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1496,28 +1420,6 @@ msgstr ""
 "ว่าเป็น�ารติดตั้ง�บบเลือ�เองหรือ�บบอัตโนมัติ �ละสามารถ�สดง�ารทำเครื่องหมายต่างๆ ได้ด้วย\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"ตัวเลือ�:\n"
-"  -h  �สดงข้อความช่วยเหลือนี้\n"
-"  -q  �สดงผลลัพธ์�บบบันทึ�ลง�ฟ้มได้ - ไม่ต้อง�สดงความคืบหน้า\n"
-"  -qq ไม่ต้อง�สดงผลลัพธ์ ย�เว้นข้อผิดพลาด\n"
-"  -s  ไม่ต้องทำจริง เพียงจำลองลำดับ�ารทำงานเท่านั้น\n"
-"  -f  อ่าน/เขียน เครื่องหมาย อัตโนมัติ/เลือ�เอง ใน�ฟ้มที่�ำหนด\n"
-"  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
-"  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-"�รุณาอ่านข้อมูลเพิ่มเติมจา� manual page apt-mark(8) �ละ apt.conf(5)"
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "ทำเครื่องหมาย�พ�เ�จที่�ำหนดให้เป็น�ารติดตั้ง�บบอัตโนมัติ"
 
@@ -1996,17 +1898,13 @@ msgid "Merging available information"
 msgstr "�ำลังผสานรายชื่อของ�พ�เ�จที่มี"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2034,17 +1932,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "วิธีใช้: apt-internal-solver\n"
 "\n"
@@ -2066,25 +1959,10 @@ msgstr "พบระเบียน�พ�เ�จที่ไม่รู้
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"วิธีใช้: apt-sortpkgs [ตัวเลือ�] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับ�ฟ้มรายชื่อ�พ�เ�จ ตัวเลือ� -s\n"
-"ใช้สำหรับระบุชนิดของ�ฟ้มที่เรียง\n"
-"\n"
-"ตัวเลือ�:\n"
-"  -h   �สดงข้อความช่วยเหลือนี้\n"
-"  -s   เรียงตาม�ฟ้มซอร์สโค้ด\n"
-"  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
-"  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3784,6 +3662,140 @@ msgstr "ดาวน์โหลด�ฟ้มดัชนีบาง�ฟ้
 msgid "Calculating upgrade"
 msgstr "�ำลังคำนวณ�ารปรับรุ่น"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "วิธีใช้: apt-cache [ตัวเลือ�] คำสั่ง\n"
+#~ "       apt-cache [ตัวเลือ�] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache เป็นเครื่องมือระดับล่างสำหรับสืบค้นข้อมูลจา��ฟ้ม�คชไบนารีของ APT\n"
+
+#~ msgid "Commands:"
+#~ msgstr "คำสั่ง:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "ตัวเลือ�:\n"
+#~ "  -h   �สดงข้อความช่วยเหลือนี้\n"
+#~ "  -p=? �ฟ้ม�คชของ�พ�เ�จ\n"
+#~ "  -s=? �ฟ้ม�คชของซอร์ส\n"
+#~ "  -q   ปิด�ถบ�สดงความคืบหน้า\n"
+#~ "  -i   �สดงเฉพาะข้อมูลความเชื่อมโยงที่สำคั�สำหรับคำสั่ง unmet\n"
+#~ "  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
+#~ "  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+#~ "�รุณาอ่านข้อมูลเพิ่มเติมจา� manual page apt-cache(8) �ละ apt.conf(5)\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "วิธีใช้: apt [ตัวเลือ�] คำสั่ง\n"
+#~ "\n"
+#~ "บรรทัดคำสั่งสำหรับ apt\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "ตัวเลือ�:\n"
+#~ "  -h  �สดงข้อความช่วยเหลือนี้\n"
+#~ "  -q  �สดงผลลัพธ์�บบบันทึ�ลง�ฟ้มได้ - ไม่ต้อง�สดงความคืบหน้า\n"
+#~ "  -qq ไม่ต้อง�สดงผลลัพธ์ ย�เว้นข้อผิดพลาด\n"
+#~ "  -s  ไม่ต้องทำจริง เพียงจำลองลำดับ�ารทำงานเท่านั้น\n"
+#~ "  -f  อ่าน/เขียน เครื่องหมาย อัตโนมัติ/เลือ�เอง ใน�ฟ้มที่�ำหนด\n"
+#~ "  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
+#~ "  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+#~ "�รุณาอ่านข้อมูลเพิ่มเติมจา� manual page apt-mark(8) �ละ apt.conf(5)"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "วิธีใช้: apt-config [ตัวเลือ�] คำสั่ง\n"
+#~ "\n"
+#~ "apt-config เป็นเครื่องมือง่ายๆ ที่ใช้อ่าน�ฟ้มค่าตั้ง APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "ตัวเลือ�:\n"
+#~ "  -h   ข้อความช่วยเหลือนี้\n"
+#~ "  -c=? อ่าน�ฟ้มค่าตั้งที่�ำหนด\n"
+#~ "  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "ตัวเลือ�:\n"
+#~ "  -h  �สดงข้อความช่วยเหลือนี้\n"
+#~ "  -q  �สดงผลลัพธ์�บบบันทึ�ลง�ฟ้มได้ - ไม่ต้อง�สดงความคืบหน้า\n"
+#~ "  -qq ไม่ต้อง�สดงผลลัพธ์ ย�เว้นข้อผิดพลาด\n"
+#~ "  -s  ไม่ต้องทำจริง เพียงจำลองลำดับ�ารทำงานเท่านั้น\n"
+#~ "  -f  อ่าน/เขียน เครื่องหมาย อัตโนมัติ/เลือ�เอง ใน�ฟ้มที่�ำหนด\n"
+#~ "  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
+#~ "  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+#~ "�รุณาอ่านข้อมูลเพิ่มเติมจา� manual page apt-mark(8) �ละ apt.conf(5)"
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "วิธีใช้: apt-sortpkgs [ตัวเลือ�] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับ�ฟ้มรายชื่อ�พ�เ�จ ตัวเลือ� -s\n"
+#~ "ใช้สำหรับระบุชนิดของ�ฟ้มที่เรียง\n"
+#~ "\n"
+#~ "ตัวเลือ�:\n"
+#~ "  -h   �สดงข้อความช่วยเหลือนี้\n"
+#~ "  -s   เรียงตาม�ฟ้มซอร์สโค้ด\n"
+#~ "  -c=? อ่าน�ฟ้มค่าตั้งนี้\n"
+#~ "  -o=? �ำหนดตัวเลือ�ค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "โพรเซสลู�ล้มเหลว"
 
diff --git a/po/tl.po b/po/tl.po
index c82adf1dd..1e123e0ad 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -174,6 +174,36 @@ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
+#: 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 "Ang APT na ito ay may Kapangyarihan Super Kalabaw."
+
+#: 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 "Walang nahanap na mga pakete"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
@@ -220,6 +250,10 @@ msgstr "Hindi matantsa ang libreng puwang sa %s"
 msgid "You don't have enough free space in %s."
 msgstr "Kulang kayo ng libreng puwang sa %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Hindi maaldaba ang directory ng download"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -320,7 +354,7 @@ msgstr "Nais niyo bang magpatuloy?"
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: 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 "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
@@ -702,9 +736,239 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Walang nahanap na mga pakete"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Talaksang Pakete:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Mga naka-Pin na Pakete:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(hindi nahanap)"
+
+#. 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 "  Nakaluklok: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Kandidato: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(wala)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Naka-Pin na Pakete: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Talaang Bersyon:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
+
+#: 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 "Kailangang magtakda ng kahit isang pakete na kunan ng source"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Hindi mahanap ang paketeng source para sa %s"
+
+#: 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 "Linaktawan ang nakuha na na talaksan '%s'\n"
+
+#. 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 "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
+
+#. 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 "Kailangang kumuha ng %sB ng arkibong source.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Kunin ang Source %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Bigo sa pagkuha ng ilang mga arkibo."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Utos na build '%s' ay bigo.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
+
+#: 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
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Bigo sa pagproseso ng build dependencies"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Walang build depends ang %s.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
+"mahanap"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
+"mahanap"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng "
+"%s ay bagong-bago pa lamang."
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
+"ng paketeng %s na tumutugon sa kinakailangang bersyon"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
+"mahanap"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Hindi mabuo ang build-dependencies para sa %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Bigo sa pagproseso ng build dependencies"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -813,100 +1077,20 @@ msgstr "Kabuuan ng puwang na napag-tuosan: "
 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 "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Talaksang Pakete:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Mga naka-Pin na Pakete:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(hindi nahanap)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Nakaluklok: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Kandidato: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(wala)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Naka-Pin na Pakete: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Talaang Bersyon:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Pag-gamit: apt-cache [mga option] utos\n"
-"       apt-cache [mga option] show pkt1 [pkt2 ...]\n"
-"\n"
-"apt-cache ay isang kagamitang low-level para sa pag-manipula\n"
-"ng mga talaksan sa binary cache ng APT, at upang makakuha ng\n"
-"impormasyon mula sa kanila\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Mga option:\n"
-"  -h   Itong tulong na ito.\n"
-"  -p=? Ang cache ng mga pakete.\n"
-"  -s=? Ang cache ng mga source.\n"
-"  -q   Huwag ipakita ang hudyat ng progreso.\n"
-"  -i   Ipakita lamang ang importanteng mga dep para sa utos na unmet\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Magtakda ng isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
-"Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
-"karagdagang impormasyon\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "Ipakita ang mga record ng source"
 
@@ -938,7 +1122,11 @@ msgstr "Ipakita ang pagkaayos ng mga policy"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -984,7 +1172,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1022,24 +1209,9 @@ msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1050,24 +1222,9 @@ msgstr "Mga argumento ay hindi naka-pares"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Pag-gamit: apt-config [mga option] utos\n"
-"\n"
-"Ang apt-config ay simpleng kagamitan sa pagbasa ng talaksang pagkaayos ng "
-"APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Mga option:\n"
-"  -h   Itong tulong na ito.\n"
-"  -c=? Basahin itong talaksang pagkaayos\n"
-"  -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1078,31 +1235,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
@@ -1123,182 +1255,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Hindi maaldaba ang directory ng download"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Hindi mahanap ang paketeng source para sa %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-
-#. 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"
-msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Kunin ang Source %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Utos na build '%s' ay bigo.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Bigo sa pagproseso ng build dependencies"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Walang build depends ang %s.\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
-"mahanap"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
-"mahanap"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng "
-"%s ay bagong-bago pa lamang."
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
-"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
-"mahanap"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Hindi mabuo ang build-dependencies para sa %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Bigo sa pagproseso ng build dependencies"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Pag-gamit: apt-get [mga option] utos\n"
 "           apt-get [mga option] install|remove pkt1 [pkt2 ...]\n"
@@ -1309,44 +1279,6 @@ msgstr ""
 "at install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Mga option:\n"
-"  -h  Itong tulong na ito.\n"
-"  -q  Output na maaaring itala - walang indikator ng progreso\n"
-"  -qq Walang output maliban sa mga error\n"
-"  -d  Kunin lamang - HINDI mag-instol o mag-buklat ng mga arkibo\n"
-"  -s  Walang gagawin. Mag-simulate lamang ang pagkasunod-sunod.\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Subukang magpatuloy kung bigo ang pagsuri ng integridad\n"
-"  -m  Subukang magpatuloy kung hindi mahanap ang mga arkibo\n"
-"  -u  Ipakita rin ang listahan ng mga paketeng i-upgrade\n"
-"  -b  Ibuo ang paketeng source matapos kunin ito\n"
-"  -V  Ipakita ng buo ang bilang ng bersyon\n"
-"  -c=? Basahin itong talaksang pagkaayos\n"
-"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
-"Basahin ang pahinang manwal ng apt-get(8), sources.list(5) at apt.conf(5)\n"
-"para sa karagdagang impormasyon at mga option.\n"
-"                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Kunin ang bagong listahan ng mga pakete"
 
@@ -1425,11 +1357,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1503,20 +1432,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -2010,17 +1928,13 @@ msgid "Merging available information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
 "\n"
@@ -2053,13 +1967,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
 "\n"
@@ -2080,26 +1988,10 @@ msgstr "Di kilalang record ng pakete!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
-"pakete.\n"
-"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n"
-"\n"
-"Mga option:\n"
-"  -h   Itong tulong na ito\n"
-"  -s   Gamitin ang pag-sort ng talaksang source\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3829,6 +3721,89 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Sinusuri ang pag-upgrade"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Pag-gamit: apt-cache [mga option] utos\n"
+#~ "       apt-cache [mga option] show pkt1 [pkt2 ...]\n"
+#~ "\n"
+#~ "apt-cache ay isang kagamitang low-level para sa pag-manipula\n"
+#~ "ng mga talaksan sa binary cache ng APT, at upang makakuha ng\n"
+#~ "impormasyon mula sa kanila\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Mga option:\n"
+#~ "  -h   Itong tulong na ito.\n"
+#~ "  -p=? Ang cache ng mga pakete.\n"
+#~ "  -s=? Ang cache ng mga source.\n"
+#~ "  -q   Huwag ipakita ang hudyat ng progreso.\n"
+#~ "  -i   Ipakita lamang ang importanteng mga dep para sa utos na unmet\n"
+#~ "  -c=? Basahin ang talaksang pagkaayos na ito\n"
+#~ "  -o=? Magtakda ng isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+#~ "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
+#~ "karagdagang impormasyon\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Pag-gamit: apt-config [mga option] utos\n"
+#~ "\n"
+#~ "Ang apt-config ay simpleng kagamitan sa pagbasa ng talaksang pagkaayos ng "
+#~ "APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Mga option:\n"
+#~ "  -h   Itong tulong na ito.\n"
+#~ "  -c=? Basahin itong talaksang pagkaayos\n"
+#~ "  -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\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"
+#~ msgstr ""
+#~ "Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
+#~ "\n"
+#~ "Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
+#~ "pakete.\n"
+#~ "Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan "
+#~ "ito.\n"
+#~ "\n"
+#~ "Mga option:\n"
+#~ "  -h   Itong tulong na ito\n"
+#~ "  -s   Gamitin ang pag-sort ng talaksang source\n"
+#~ "  -c=? Basahin ang talaksang pagkaayos na ito\n"
+#~ "  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Bigo ang prosesong anak"
 
diff --git a/po/tr.po b/po/tr.po
index d2f0844be..38ba5bcab 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2015-10-21 18:21+0300\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -177,6 +177,36 @@ msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Not, '%2$s' yerine '%1$s' seçiliyor\n"
 
+#: 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 "Bu APT'nin Süper İnek Güçleri vardır."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Bu APT yardımcısının Süper Meep Güçleri var."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Hiç paket bulunamadı"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UYARI: Aşağıdaki paketlerin aslına uygunluğu doğrulanamıyor!"
@@ -224,6 +254,10 @@ msgstr "%s içindeki boş alan miktarı belirlenemedi"
 msgid "You don't have enough free space in %s."
 msgstr "%s içinde yeterli boş alanınız yok."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Ä°ndirme dizini kilitlenemiyor"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
@@ -327,7 +361,7 @@ msgstr "Devam etmek istiyor musunuz?"
 msgid "Some files failed to download"
 msgstr "Bazı dosyalar indirilemedi"
 
-#: 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 "İndirme işlemi tamamlandı ve sadece indirme kipinde"
 
@@ -721,9 +755,244 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr "gerçek bir paket değil (sanal)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Hiç paket bulunamadı"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%s paketi bulunamadı"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Paket dosyaları:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "SabitlenmiÅŸ paketler:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(bulunamadı)"
+
+#. 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 "%s -> %s (öncelik: %d)\n"
+
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr "  Kurulu: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Aday: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Paket sabitleme: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Sürüm çizelgesi:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "'%s' mimarisi için bir paket bulunamadı"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "'%s' paketinin '%s' sürümü bulunamadı"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "'%s' paketi '%s' dağıtım sürümünde bulunamadı"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "'%2$s' paketinin '%1$s' sürümünü bulunamadı"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "%s paketinin kaynak paketi bulunamadı"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"NOT: '%s' paketlemesi '%s' sürüm kontrol sistemiyle aşağıdaki adreste "
+"yapılmaktadır:\n"
+"%s\n"
+
+#: 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 ""
+"Bu paketin en son (ve muhtemelen henüz yayımlanmamış olan)\n"
+"sürümünü edinmek için lütfen:\n"
+"%s\n"
+"komutunu kullanın.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
+
+#. 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 "%sB/%sB kaynak arÅŸivi indirilecek.\n"
+
+#. 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 "%sB kaynak arÅŸivi indirilecek.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "%s kaynağını al\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Bazı arşivler alınamadı."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Paket açma komutu '%s' başarısız.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "'dpkg-dev' paketinin kurulu olduÄŸundan emin olun.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "İnşa komutu '%s' başarısız oldu.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmelidir"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"%s mimarisinin bilgileri mevcut değil. Kurulum için apt.conf(5) rehber "
+"sayfasındaki APT::Architectures kısmına göz atın"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr "Not, inşa bağımlılıklarını indirmek için '%s' dizini kullanılıyor\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Not, inşa bağımlılıklarını indirmek için '%s' dosyası kullanılıyor\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
+
+#: 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 ""
+"'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s "
+"bağımlılığı karşılanamıyor"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni"
+
+#: 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"
+msgstr ""
+"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü "
+"gerekli sürüm şartlarını karşılamıyor"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s için inşa bağımlılıkları karşılanamadı."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -834,98 +1103,18 @@ msgstr ""
 "Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' "
 "komutunu kullanın."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "%s paketi bulunamadı"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Paket dosyaları:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "SabitlenmiÅŸ paketler:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(bulunamadı)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr "%s -> %s (öncelik: %d)\n"
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  Kurulu: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Aday: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(hiçbiri)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Paket sabitleme: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Sürüm çizelgesi:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Kullanım: apt-cache [seçenekler] komut\n"
-"          apt-cache [seçenekler] show paket1 [paket2 ...]\n"
-"\n"
-"apt-cache APT'nin ikili paket önbelleğindeki dosyaları\n"
-"sorgulamakta kullanılan alt seviye bir araçtır.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Komutlar:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Options:\n"
-"  -h   Bu yardım metni.\n"
-"  -p=? Paket önbelleği.\n"
-"  -s=? Kaynak önbelleği.\n"
-"  -q   İlerleme göstergesini kapat.\n"
-"  -i   unmet komutunda sadece önemli bağımlılıkları görüntüle.\n"
-"  -c=? Belirtilen yapılandırma dosyasını kullan\n"
-"  -o=? Herhangi bir yapılandırma seçeneğini ayarla, örneğin -o dir::cache=/"
-"tmp\n"
-"Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz "
-"atın.\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -959,11 +1148,12 @@ msgstr "İlke seçeneklerini görüntüle"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Kullanım: apt [seçenekler] komut\n"
-"\n"
-"apt için komut satırı arayüzü.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1004,7 +1194,6 @@ msgstr "sistemi yükselt (paket kurarak ve yükselterek)"
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "sistemi yükselt (paket kurarak, yükselterek ve kaldırarak)"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1044,36 +1233,10 @@ msgstr "Kalan CD'leriniz için bu işlemi yineleyin."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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 ""
-"Seçenekler:\n"
-"  -h  Bu yardım metni.\n"
-"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
-"  -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n"
-"  -s  Bir şey yapma. Sadece ne yapılacağını söyler.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Belirtilen yapılandırma dosyası kullan\n"
-"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
-"Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n"
-"bakabilirsiniz."
 
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
@@ -1083,24 +1246,9 @@ msgstr "Argümanlar çiftler halinde değil"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Kullanım: apt-config [seçenekler] komut\n"
-"\n"
-"apt-config, APT ayar dosyasını okumaya yarayan basit bir araçtır\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Seçenekler:\n"
-"  -h Bu yardım dosyası.\n"
-"  -c=? Belirtilen ayar dosyasını görüntüler\n"
-"  -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::"
-"cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1112,31 +1260,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "'%s' mimarisi için bir paket bulunamadı"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "'%s' paketinin '%s' sürümü bulunamadı"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "'%s' paketi '%s' dağıtım sürümünde bulunamadı"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "'%2$s' paketinin '%1$s' sürümünü bulunamadı"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "%s paketi bulunamadı"
 
@@ -1158,187 +1281,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "İç hata, sorun çözücü nesneyi bozdu"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Ä°ndirme dizini kilitlenemiyor"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "%s paketinin kaynak paketi bulunamadı"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"NOT: '%s' paketlemesi '%s' sürüm kontrol sistemiyle aşağıdaki adreste "
-"yapılmaktadır:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Bu paketin en son (ve muhtemelen henüz yayımlanmamış olan)\n"
-"sürümünü edinmek için lütfen:\n"
-"%s\n"
-"komutunu kullanın.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%sB/%sB kaynak arÅŸivi indirilecek.\n"
-
-#. 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"
-msgstr "%sB kaynak arÅŸivi indirilecek.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "%s kaynağını al\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Bazı arşivler alınamadı."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Paket açma komutu '%s' başarısız.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "'dpkg-dev' paketinin kurulu olduÄŸundan emin olun.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "İnşa komutu '%s' başarısız oldu.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmelidir"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"%s mimarisinin bilgileri mevcut değil. Kurulum için apt.conf(5) rehber "
-"sayfasındaki APT::Architectures kısmına göz atın"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr "Not, inşa bağımlılıklarını indirmek için '%s' dizini kullanılıyor\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Not, inşa bağımlılıklarını indirmek için '%s' dosyası kullanılıyor\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s "
-"bağımlılığı karşılanamıyor"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü "
-"gerekli sürüm şartlarını karşılamıyor"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s için inşa bağımlılıkları karşılanamadı."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Desteklenen birimler:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Kullanım: apt-get [seçenekler] komut\n"
 "          apt-get [seçenekler] install|remove paket1 [paket2 ...]\n"
@@ -1349,44 +1305,6 @@ msgstr ""
 "(install) komutlarıdır.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Seçenekler:\n"
-"  -h  Bu yardım metni.\n"
-"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
-"  -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n"
-"  -d  Sadece indir - Paketleri açmaz ve kurmaz\n"
-"  -s  Bir şey yapma. Simülasyon kipinde çalış\n"
-"  -y  Tüm sorulara Evet yanıtını ver ve soru sorma\n"
-"  -f  Eksik bağımlılıklara sahip bir sistemi onarmaya çalış\n"
-"  -m  Eksik paketleri görmezden gel ve işleme devam et\n"
-"  -u  Yükseltilen paketlerin listesini de görüntüle\n"
-"  -b  Kaynak paketi indirdikten sonra inÅŸa et\n"
-"  -V  Sürüm numaralarını daha ayrıntılı göster\n"
-"  -c=? Belirtilen yapılandırma dosyası kullan\n"
-"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
-"Ayrıntılı bilgi için apt-get(8), sources.list(5) ve apt.conf(5) rehber\n"
-"sayfalarına bakabilirsiniz.\n"
-"                       Bu APT'nin Süper İnek Güçleri vardır.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Paket listelerini yenile"
 
@@ -1460,11 +1378,13 @@ msgid "GetSrvRec failed for %s"
 msgstr "%s için GetSrvRec başarısız oldu"
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Kullanım: apt-helper [seçenekler] komut\n"
 "          apt-helper [seçenekler] download-file uri hedef-konum\n"
@@ -1472,10 +1392,6 @@ msgstr ""
 "apt-helper apt'nin bir dâhilî yardımcı aracıdır\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Bu APT yardımcısının Süper Meep Güçleri var."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "verilen adresi (uri) hedef yola kaydet"
 
@@ -1542,11 +1458,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Kullanım: apt-mark [seçenekler] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
@@ -1554,29 +1473,6 @@ msgstr ""
 "ve mevcut işaretleri görmeye yarayan basit bir komut satırı arayüzüdür.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Seçenekler:\n"
-"  -h  Bu yardım metni.\n"
-"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
-"  -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n"
-"  -s  Bir şey yapma. Sadece ne yapılacağını söyler.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Belirtilen yapılandırma dosyası kullan\n"
-"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
-"Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n"
-"bakabilirsiniz."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "Belirtilen paketleri otomatik kurulmuÅŸ olarak iÅŸaretle"
 
@@ -2064,17 +1960,13 @@ msgid "Merging available information"
 msgstr "Kullanılabilir bilgiler birleştiriliyor"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n"
 "\n"
@@ -2102,17 +1994,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Kullanım: apt-internal-solver\n"
 "\n"
@@ -2134,26 +2021,10 @@ msgstr "Bilinmeyen paket kaydı!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n"
-"\n"
-"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n"
-"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n"
-"\n"
-"Seçenekler:\n"
-"  -h Bu yardım metni\n"
-"  -s Kaynak dosyası sıralamayı kullan\n"
-"  -c=? Belirtilen yapılandırma dosyasını oku\n"
-"  -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
-"tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3904,6 +3775,147 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Yükseltme hesaplanıyor"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Kullanım: apt-cache [seçenekler] komut\n"
+#~ "          apt-cache [seçenekler] show paket1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-cache APT'nin ikili paket önbelleğindeki dosyaları\n"
+#~ "sorgulamakta kullanılan alt seviye bir araçtır.\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Komutlar:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Options:\n"
+#~ "  -h   Bu yardım metni.\n"
+#~ "  -p=? Paket önbelleği.\n"
+#~ "  -s=? Kaynak önbelleği.\n"
+#~ "  -q   İlerleme göstergesini kapat.\n"
+#~ "  -i   unmet komutunda sadece önemli bağımlılıkları görüntüle.\n"
+#~ "  -c=? Belirtilen yapılandırma dosyasını kullan\n"
+#~ "  -o=? Herhangi bir yapılandırma seçeneğini ayarla, örneğin -o dir::"
+#~ "cache=/tmp\n"
+#~ "Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz "
+#~ "atın.\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Kullanım: apt [seçenekler] komut\n"
+#~ "\n"
+#~ "apt için komut satırı arayüzü.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Seçenekler:\n"
+#~ "  -h  Bu yardım metni.\n"
+#~ "  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
+#~ "  -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n"
+#~ "  -s  Bir şey yapma. Sadece ne yapılacağını söyler.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Belirtilen yapılandırma dosyası kullan\n"
+#~ "  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
+#~ "Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n"
+#~ "bakabilirsiniz."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Kullanım: apt-config [seçenekler] komut\n"
+#~ "\n"
+#~ "apt-config, APT ayar dosyasını okumaya yarayan basit bir araçtır\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Seçenekler:\n"
+#~ "  -h Bu yardım dosyası.\n"
+#~ "  -c=? Belirtilen ayar dosyasını görüntüler\n"
+#~ "  -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::"
+#~ "cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Seçenekler:\n"
+#~ "  -h  Bu yardım metni.\n"
+#~ "  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
+#~ "  -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n"
+#~ "  -s  Bir şey yapma. Sadece ne yapılacağını söyler.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Belirtilen yapılandırma dosyası kullan\n"
+#~ "  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
+#~ "Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n"
+#~ "bakabilirsiniz."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n"
+#~ "-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -h Bu yardım metni\n"
+#~ "  -s Kaynak dosyası sıralamayı kullan\n"
+#~ "  -c=? Belirtilen yapılandırma dosyasını oku\n"
+#~ "  -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
+#~ "tmp\n"
+
 #~ msgid "Use --allow-insecure-repositories to force the update"
 #~ msgstr ""
 #~ "Buna rağmen güncellemeyi yapmak için --allow-insecure-repositories "
diff --git a/po/uk.po b/po/uk.po
index ead75963b..9dcea7c6a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Україн�ька <uk@li.org>\n"
@@ -181,6 +181,36 @@ msgstr "Пакунок '%s' не вÑ�тановлений, тому не видÐ
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Помітьте, вибираєть�� '%s' замі�ть '%s'\n"
 
+#: 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 має Супер-Коров'�чу Силу."
+
+#: 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 "УВ�Г�: �а�тупні пакунки неможливо автентифікувати!"
@@ -225,6 +255,10 @@ msgstr "�е вдало�� визначити кількі�ть вільног
 msgid "You don't have enough free space in %s."
 msgstr "�едо�татньо вільного мі�ц� в %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "�еможливо заблокувати директорію дл� завантаженн�"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -325,7 +359,7 @@ 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 "Завантаженн� завершено в режимі \"тільки завантаженн�\""
 
@@ -725,9 +759,250 @@ msgstr[2] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "�е знайдено жодного пакунка"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "�е можу знайти пакунок %s"
+
+#: 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 "Зафік�овані пакунки:"
+
+#: 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
+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 "(від�утній)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Фік�атор(pin) пакунка: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Таблиц� вер�ій:"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Обираю '%s' �к пакунок вихідних тек�тів, замі�ть '%s'\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Ігнорувати недо�тупну вер�ію '%s' пакунку '%s'"
+
+#: 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 "�еможливо знайти пакунок з вихідними тек�тами дл� %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"УВ�Г�: Пакуванн� '%s' відбуваєть�� в �и�темі контролю вер�ій '%s' на:\n"
+"%s\n"
+
+#: 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 ""
+"Будь-ла�ка викори�товуйте:\n"
+"%s\n"
+"щоб отримати найновіші (потенційно не випущені) оновленн� до пакунку.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Пропу�каємо вже завантажений файл '%s'\n"
+
+#. 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 "�еобхідно завантажити %sB/%sB з архівів вихідних тек�тів.\n"
+
+#. 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 "Потрібно завантажити %sB архівів з вихідними тек�тами.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Завантаженн� вихідних тек�тів %s\n"
+
+#: 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 ""
+"Пропу�каєть�� розпакуванн� вихідних тек�тів, тому що вже розпаковано в %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Команда розпакуванн� '%s' завершила�� невдало.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Перевірте, чи в�тановлений пакунок 'dpkg-dev'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Команда побудови '%s' закінчила�� невдало.\n"
+
+#: 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 ""
+"Від�утн� інформаці� про архітектуру дл� %s. Диви�ь apt.conf(5) APT::"
+"�рхітектури дл� налащтуванн�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, 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"
+msgstr "�еможливо одержати інформацію про залежно�ті дл� побудови %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s не має залежно�тей дл� побудови.\n"
+
+#: 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 ""
+"Залежні�ть типу %s дл� %s не може бути задоволена, бо %s не є дозволеним на "
+"'%s' пакунках"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Залежні�ть типу %s дл� %s не може бути задоволена, бо пакунок %s не знайдено"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"�е вдало�� задовольнити залежні�ть типу %s дл� %s: В�тановлений пакунок %s "
+"новіше, аніж треба"
+
+#: 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"
+msgstr ""
+"Залежні�ть типу %s дл� %s не може бути задоволена, бо вер�і� пакунку-"
+"кандидата %s не задовольн�є умови по вер�і�м"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Залежні�ть типу %s дл� %s не може бути задоволена, бо немає пакунку-"
+"кандидата %s потрібної вер�ії"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "�еможливо задовольнити залежні�ть типу %s дл� пакунка %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Залежно�ті дл� побудови %s не можуть бути задоволені."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Обробка залежно�тей дл� побудови закінчила�� невдало"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -836,96 +1111,18 @@ msgstr "Загальний про�тір полічений дл�: "
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ц� команда є за�тарілою. Будь-ла�ка викори�товуйте 'apt-mark showauto'"
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "�е можу знайти пакунок %s"
-
-#: 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
-msgid "Pinned packages:"
-msgstr "Зафік�овані пакунки:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(не знайдено)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  В�тановлено: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Кандидат: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(від�утній)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Фік�атор(pin) пакунка: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Таблиц� вер�ій:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"Викори�танн�: apt-cache [опції] команда\n"
-"              apt-cache [опції] show пакунок1 [пкн2 ...]\n"
-"\n"
-"apt-cache - низькорівневий ін�трумент, що викори�товуєть�� дл� запиту\n"
-"інформації з двійкових кеш-файлів APT\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Опції:\n"
-"  -h   Цей тек�т допомоги.\n"
-"  -p=? Кеш пакунків.\n"
-"  -s=? Кеш вихідних тек�тів.\n"
-"  -q   �е показувати індикатор прогре�у.\n"
-"  -i   Показувати тільки важливі залежно�ті дл� команди unmet.\n"
-"  -c=? Читати зазначений файл конфігурації.\n"
-"  -o=? В�тановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
-"Дивіть�� подробиці на man-�торінках apt-cache(8) і apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -959,7 +1156,11 @@ msgstr "показати поточну політику"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -1005,7 +1206,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1042,36 +1242,11 @@ msgstr "Повторіть цей процеÑ� длÑ� решти CD з вашоÐ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"Опції:\n"
-"  -h   Цей тек�т допомоги.\n"
-"  -q   �е показувати індикатор прогре�у.\n"
-"  -qq Виводити тільки повідомленн� про помилки\n"
-"  -s  �е виконувати реальних дій. Імітаці� роботи\n"
-"  -f   Читати/пи�ати позначки авто/вручну у вказаному файлі\n"
-"  -c=? Читати зазначений файл конфігурації.\n"
-"  -o=? В�тановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
-"Дл� докладної інформації дивіть�� керівництва дл� apt-mark(8) і apt.conf(5)."
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "�ргументи не в парах"
@@ -1080,23 +1255,9 @@ msgstr "�ргументи не в парах"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\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"
 msgstr ""
-"Викори�танн�: apt-config [опції] команда\n"
-"\n"
-"apt-config - про�тий ін�трумент дл� зчитуванн� конфігураційного файла APT\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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 ""
-"Опції:\n"
-"   -h   Цей тек�т допомоги.\n"
-"   -�=? Читати зазначений конфігураційний файл.\n"
-"   -o=? В�тановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1107,31 +1268,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "�еможливо знайти ні�кий пакунок через рег.вираз '%s'"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Обираю '%s' �к пакунок вихідних тек�тів, замі�ть '%s'\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Ігнорувати недо�тупну вер�ію '%s' пакунку '%s'"
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "�е можу знайти пакунок %s"
@@ -1154,193 +1290,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішн� помилка, вирішувач проблем що�ь поламав"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "�еможливо заблокувати директорію дл� завантаженн�"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Вкажіть �к мінімум один пакунок, дл� �кого необхідно завантажити вихідні "
-"тек�ти"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "�еможливо знайти пакунок з вихідними тек�тами дл� %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"УВ�Г�: Пакуванн� '%s' відбуваєть�� в �и�темі контролю вер�ій '%s' на:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Будь-ла�ка викори�товуйте:\n"
-"%s\n"
-"щоб отримати найновіші (потенційно не випущені) оновленн� до пакунку.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Пропу�каємо вже завантажений файл '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "�еобхідно завантажити %sB/%sB з архівів вихідних тек�тів.\n"
-
-#. 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"
-msgstr "Потрібно завантажити %sB архівів з вихідними тек�тами.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Завантаженн� вихідних тек�тів %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Де�кі архіви не вдало�� завантажити."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"Пропу�каєть�� розпакуванн� вихідних тек�тів, тому що вже розпаковано в %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Команда розпакуванн� '%s' завершила�� невдало.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Перевірте, чи в�тановлений пакунок 'dpkg-dev'.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Команда побудови '%s' закінчила�� невдало.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Дл� перевірки залежно�тей дл� побудови необхідно вказати �к мінімум один "
-"пакунок"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Від�утн� інформаці� про архітектуру дл� %s. Диви�ь apt.conf(5) APT::"
-"�рхітектури дл� налащтуванн�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Обробка залежно�тей дл� побудови закінчила�� невдало"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "�еможливо одержати інформацію про залежно�ті дл� побудови %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s не має залежно�тей дл� побудови.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Залежні�ть типу %s дл� %s не може бути задоволена, бо %s не є дозволеним на "
-"'%s' пакунках"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Залежні�ть типу %s дл� %s не може бути задоволена, бо пакунок %s не знайдено"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"�е вдало�� задовольнити залежні�ть типу %s дл� %s: В�тановлений пакунок %s "
-"новіше, аніж треба"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Залежні�ть типу %s дл� %s не може бути задоволена, бо вер�і� пакунку-"
-"кандидата %s не задовольн�є умови по вер�і�м"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"Залежні�ть типу %s дл� %s не може бути задоволена, бо немає пакунку-"
-"кандидата %s потрібної вер�ії"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "�еможливо задовольнити залежні�ть типу %s дл� пакунка %s: %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Залежно�ті дл� побудови %s не можуть бути задоволені."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Обробка залежно�тей дл� побудови закінчила�� невдало"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Викори�танн�: apt-get [опції] команда\n"
 "               apt-get [опції] install|remove пакунок1 [пкн2 ...]\n"
@@ -1351,46 +1314,6 @@ msgstr ""
 "Ñ– install.\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Опції:\n"
-"  -h  Цей тек�т допомоги.\n"
-"  -q  Виводити повідомленн�, придатні дл� запи�у у файл журналу.\n"
-"      �е виводити індикатор прогре�у\n"
-"  -qq Виводити тільки повідомленн� про помилки\n"
-"  -d  Тільки завантажити - не в�тановлювати й не розпаковувати архіви\n"
-"  -s  �е виконувати реальних дій. Імітаці� роботи\n"
-"  -y  Відповідати 'Так' на в�і запитанн�. Самі запитанн� при цьому не\n"
-"      вивод�ть��\n"
-"  -f  Спробувати виправити �и�тему зі зламаними залежно�т�ми\n"
-"  -m  Продовжувати, навіть �кщо мі�це розташуванн� архівів невідомо\n"
-"  -u  Показувати �пи�ок оновлюваних пакунків\n"
-"  -b  Компілювати пакунок з вихідними тек�тами пі�л� завантаженн�\n"
-"  -V  Показувати докладну інформацію про вер�ії пакунків\n"
-"  -c=? Читати зазначений файл конфігурації\n"
-"  -o=? В�тановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
-"Сторінки керівництв apt-get(8), sources.list(5) і apt.conf(5)\n"
-"мі�т�ть більше інформації і опцій.\n"
-"                       Цей APT має Супер-Коров'�чу Силу.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "завантажити нові переліки пакунків"
 
@@ -1473,11 +1396,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1547,11 +1467,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Викори�танн�: apt-mark [опції] {auto|manual} пакунок1 [пакунок2 ...]\n"
 "\n"
@@ -1560,28 +1483,6 @@ msgstr ""
 "показувати позначки.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Опції:\n"
-"  -h   Цей тек�т допомоги.\n"
-"  -q   �е показувати індикатор прогре�у.\n"
-"  -qq Виводити тільки повідомленн� про помилки\n"
-"  -s  �е виконувати реальних дій. Імітаці� роботи\n"
-"  -f   Читати/пи�ати позначки авто/вручну у вказаному файлі\n"
-"  -c=? Читати зазначений файл конфігурації.\n"
-"  -o=? В�тановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
-"Дл� докладної інформації дивіть�� керівництва дл� apt-mark(8) і apt.conf(5)."
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "позначити вказані пакунки �к автоматично в�тановлені"
 
@@ -2073,17 +1974,13 @@ msgid "Merging available information"
 msgstr "Об'єднанн� до�тупної інформації"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Викори�танн�: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -2111,17 +2008,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "�еможливо визначити вер�ію debconf. Він в�тановлений?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Викори�танн�: apt-internal-solver\n"
 "\n"
@@ -2144,26 +2036,10 @@ msgstr "�евідомий запи� про пакунок!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Викори�танн�: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs - про�тий ін�трумент дл� �ортуванн� переліків пакунків. Опці� -"
-"s\n"
-"викори�таєть��, щоб вказати тип �пи�ку.\n"
-"\n"
-"Опції:\n"
-"  -h   цей тек�т\n"
-"  -s   �ортувати �пи�ок файлів з вихідними тек�тами\n"
-"  -c=? читати зазначений файл конфігурації\n"
-"  -o=? в�тановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3933,6 +3809,136 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Обчи�ленн� оновлень"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Викори�танн�: apt-cache [опції] команда\n"
+#~ "              apt-cache [опції] show пакунок1 [пкн2 ...]\n"
+#~ "\n"
+#~ "apt-cache - низькорівневий ін�трумент, що викори�товуєть�� дл� запиту\n"
+#~ "інформації з двійкових кеш-файлів APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Опції:\n"
+#~ "  -h   Цей тек�т допомоги.\n"
+#~ "  -p=? Кеш пакунків.\n"
+#~ "  -s=? Кеш вихідних тек�тів.\n"
+#~ "  -q   �е показувати індикатор прогре�у.\n"
+#~ "  -i   Показувати тільки важливі залежно�ті дл� команди unmet.\n"
+#~ "  -c=? Читати зазначений файл конфігурації.\n"
+#~ "  -o=? В�тановити умовну опцію конфігурації, наприклад, -o dir::cache=/"
+#~ "tmp\n"
+#~ "Дивіть�� подробиці на man-�торінках apt-cache(8) і apt.conf(5).\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Опції:\n"
+#~ "  -h   Цей тек�т допомоги.\n"
+#~ "  -q   �е показувати індикатор прогре�у.\n"
+#~ "  -qq Виводити тільки повідомленн� про помилки\n"
+#~ "  -s  �е виконувати реальних дій. Імітаці� роботи\n"
+#~ "  -f   Читати/пи�ати позначки авто/вручну у вказаному файлі\n"
+#~ "  -c=? Читати зазначений файл конфігурації.\n"
+#~ "  -o=? В�тановити умовну опцію конфігурації, наприклад, -o dir::cache=/"
+#~ "tmp\n"
+#~ "Дл� докладної інформації дивіть�� керівництва дл� apt-mark(8) і apt."
+#~ "conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Викори�танн�: apt-config [опції] команда\n"
+#~ "\n"
+#~ "apt-config - про�тий ін�трумент дл� зчитуванн� конфігураційного файла "
+#~ "APT\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Опції:\n"
+#~ "   -h   Цей тек�т допомоги.\n"
+#~ "   -�=? Читати зазначений конфігураційний файл.\n"
+#~ "   -o=? В�тановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Опції:\n"
+#~ "  -h   Цей тек�т допомоги.\n"
+#~ "  -q   �е показувати індикатор прогре�у.\n"
+#~ "  -qq Виводити тільки повідомленн� про помилки\n"
+#~ "  -s  �е виконувати реальних дій. Імітаці� роботи\n"
+#~ "  -f   Читати/пи�ати позначки авто/вручну у вказаному файлі\n"
+#~ "  -c=? Читати зазначений файл конфігурації.\n"
+#~ "  -o=? В�тановити умовну опцію конфігурації, наприклад, -o dir::cache=/"
+#~ "tmp\n"
+#~ "Дл� докладної інформації дивіть�� керівництва дл� apt-mark(8) і apt."
+#~ "conf(5)."
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Викори�танн�: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs - про�тий ін�трумент дл� �ортуванн� переліків пакунків. "
+#~ "Опці� -s\n"
+#~ "викори�таєть��, щоб вказати тип �пи�ку.\n"
+#~ "\n"
+#~ "Опції:\n"
+#~ "  -h   цей тек�т\n"
+#~ "  -s   �ортувати �пи�ок файлів з вихідними тек�тами\n"
+#~ "  -c=? читати зазначений файл конфігурації\n"
+#~ "  -o=? в�тановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Породжений проце� завершив�� невдало"
 
diff --git a/po/vi.po b/po/vi.po
index 727a439d0..0ecae44a0 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-09-12 13:48+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -175,6 +175,36 @@ msgstr "Gói %s chÆ°a được cài đặt, thế nên không thể gỡ bá»� nÃ
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Ghi chú: đang ch�n “%s� thay cho “%s�\n"
 
+#: 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 "Trình APT này có năng lực của siêu bò."
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep�."
+
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Không tìm thấy gói"
+
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "CẢNH B�O: Không thể xác thực những gói sau đây!"
@@ -219,6 +249,10 @@ msgstr "Không thể tìm được chỗ trống trong %s"
 msgid "You don't have enough free space in %s."
 msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Không thể khoá thư mục tải v�"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được g�i với gói bị h�ng!"
@@ -318,7 +352,7 @@ msgstr "Bạn có muốn tiếp tục không?"
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải v� được"
 
-#: 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 "Hoàn tất việc tải v� và trong chế độ chỉ tải v�"
 
@@ -697,9 +731,248 @@ msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chá»�n “-aâ
 msgid "not a real package (virtual)"
 msgstr "không là gói thật (ảo)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "Không tìm thấy gói"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Không thể định vị gói %s"
+
+#: apt-private/private-show.cc
+msgid "Package files:"
+msgstr "Tập tin gói:"
+
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+msgid "Pinned packages:"
+msgstr "Các gói đã ghim:"
+
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(không tìm thấy)"
+
+#. 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 "  �ã cài đặt: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Ứng cử: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(không)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  Ghim gói: "
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  Bảng phiên bản:"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Không tìm thấy gói cho kiến trúc “%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Không tìm thấy gói “%s� với phiên bản “%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Không tìm thấy gói “%s� với số phát hành “%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "�ang ch�n “%s� làm gói nguồn, thay thế cho “%s�\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "Không tìm thấy phiên bản “%s� của gói “%s�"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn v� cho nó"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Không tìm thấy gói nguồn cho %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"GHI CHÚ: việc đóng gói “%s� được bảo trì trong hệ thống quản lý mã nguồn "
+"“%s� tại:\n"
+"%s\n"
+
+#: 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 ""
+"Hãy dùng lệnh:\n"
+"%s\n"
+"để lấy các gói mới nhất (có thể là chưa phát hành).\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "�ang b� qua tập tin đã được tải v� “%s�\n"
+
+#. 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 "Cần phải lấy %sB/%sB kho nguồn.\n"
+
+#. 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 "Cần phải lấy %sB từ kho nguồn.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Lấy mã nguồn %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Gặp lỗi khi lấy một số kho."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "�ang b� qua giải nén nguồn đã giải nén trong %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Lệnh giải nén “%s� bị lỗi.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Hãy kiểm tra xem gói “dpkg-dev� đã được cài đặt chưa.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Lệnh biên dịch “%s� bị lỗi.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+"Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::"
+"Architectures để cài đặt"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Không thể lấy thông tin v� các phần phụ thuộc khi biên dịch cho %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s không phụ thuộc vào gì khi biên dịch.\n"
+
+#: 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 ""
+"Phần phụ thuộc %s cho %s không ổn th�a bởi vì %s không được cho phép trên "
+"gói “%s�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Phần phụ thuộc %s cho %s không thể được th�a mãn vì không tìm thấy gói %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Việc cố th�a mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là "
+"quá mới"
+
+#: 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"
+msgstr ""
+"phần phụ thuộc %s cho %s không thể được th�a mãn phiên bản ứng cử của gói %s "
+"có thể th�a mãn đi�u kiện phiên bản"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"phần phụ thuộc %s cho %s không thể được th�a mãn bởi vì gói %s không có bản "
+"ứng cử"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Việc cố th�a cách phụ thuộc %s cho %s bị lỗi: %s."
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Không thể th�a mãn quan hệ phụ thuộc khi biên dịch cho %s."
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -806,98 +1079,18 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Lệnh này đã lỗi th�i. Xin hãy dùng lệnh “apt-mark showauto� để thay thế."
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Không thể định vị gói %s"
-
-#: cmdline/apt-cache.cc
-msgid "Package files:"
-msgstr "Tập tin gói:"
-
-#: cmdline/apt-cache.cc
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-"Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "Các gói đã ghim:"
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(không tìm thấy)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  �ã cài đặt: "
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  Ứng cử: "
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(không)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  Ghim gói: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  Bảng phiên bản:"
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"Cách dùng: apt-cache [tùy_ch�n...] lệnh\n"
-"           apt-cache [tùy_ch�n...] show gói1 [gói2 ...]\n"
-"\n"
-"apt-cache là một công cụ ở mức thấp dùng để truy vấn\n"
-"thông tin từ các tập tin bộ nhớ tạm nhị phân của APT.\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "Các lệnh:"
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"Tùy ch�n:\n"
-"  -h   Hiển thị trợ giúp này.\n"
-"  -p=? Bộ nhớ tạm gói.\n"
-"  -s=? Bộ nhớ tạm nguồn.\n"
-"  -q   Không hiển thị diễn tiến công việc.\n"
-"  -i   Chỉ hiển thị những phụ thuộc quan tr�ng cho lệnh unmet.\n"
-"  -c=? ��c tập tin cấu hình này\n"
-"  -o=? �ặt một tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
-"�ể tìm thông tin thêm, xem hai trang hướng dẫn\n"
-"                 apt-cache(8) và apt.conf(5).\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -931,11 +1124,12 @@ msgstr "Hiển thị các cài đặt v� chính sách"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"Cách dùng: apt [các tùy ch�n] lệnh\n"
-"\n"
-"CLI (giao diện dòng lệnh) dành cho apt.\n"
 
 #. query
 #: cmdline/apt.cc
@@ -976,7 +1170,6 @@ msgstr "nâng cấp các gói trong hệ thống"
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "nâng cấp hệ thống bằng cách gỡ b�, cài đặt, nâng cấp các gói"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -1017,36 +1210,10 @@ msgstr "Hãy lặp lại tiến trình này cho các �ĩa còn lại trong bộ
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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 ""
-"Tùy ch�n:\n"
-"  -h   Trợ giúp này.\n"
-"  -q   Dữ liệu xuất có thể ghi nhật ký - không hiển thị diễn biến công việc\n"
-"  -qq  Không xuất thông tin nào, trừ lỗi\n"
-"  -s   Không làm gì chỉ in những cái sẽ làm.\n"
-"  -f   đánh dấu đ�c/ghi tự-động/thủ-công trong tập tin đã cho.\n"
-"  -c=? ��c tập tin cấu hình này\n"
-"  -o=? �ặt một tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
-"�ể tìm thông tin thêm, xem hai trang man (hướng dẫn)\n"
-"                          apt-mark(8) và apt.conf(5)"
 
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
@@ -1056,25 +1223,9 @@ msgstr "Các đối số không thành cặp"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"Cách dùng: apt-config [tùy_ch�n...] lệnh\n"
-"\n"
-"(config: viết tắt cho từ configuration: cấu hình)\n"
-"\n"
-"apt-config là một công cụ đơn giản để đ�c tập tin cấu hình APT.\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"Tùy ch�n:\n"
-"  -h   Trợ giúp này\n"
-"  -c=? ��c tập tin cấu hình này\n"
-"  -o=? �ặt một tùy ch�n cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1086,31 +1237,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Không tìm thấy gói cho kiến trúc “%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Không tìm thấy gói “%s� với phiên bản “%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Không tìm thấy gói “%s� với số phát hành “%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "�ang ch�n “%s� làm gói nguồn, thay thế cho “%s�\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "Không tìm thấy phiên bản “%s� của gói “%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 
@@ -1132,190 +1258,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đ� đã ngắt gì"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "Không thể khoá thư mục tải v�"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn v� cho nó"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Không tìm thấy gói nguồn cho %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"GHI CHÚ: việc đóng gói “%s� được bảo trì trong hệ thống quản lý mã nguồn "
-"“%s� tại:\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"Hãy dùng lệnh:\n"
-"%s\n"
-"để lấy các gói mới nhất (có thể là chưa phát hành).\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "�ang b� qua tập tin đã được tải v� “%s�\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-
-#. 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"
-msgstr "Cần phải lấy %sB từ kho nguồn.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Lấy mã nguồn %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "Gặp lỗi khi lấy một số kho."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "�ang b� qua giải nén nguồn đã giải nén trong %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Lệnh giải nén “%s� bị lỗi.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Hãy kiểm tra xem gói “dpkg-dev� đã được cài đặt chưa.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Lệnh biên dịch “%s� bị lỗi.\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::"
-"Architectures để cài đặt"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Không thể lấy thông tin v� các phần phụ thuộc khi biên dịch cho %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s không phụ thuộc vào gì khi biên dịch.\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"Phần phụ thuộc %s cho %s không ổn th�a bởi vì %s không được cho phép trên "
-"gói “%s�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Phần phụ thuộc %s cho %s không thể được th�a mãn vì không tìm thấy gói %s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Việc cố th�a mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là "
-"quá mới"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"phần phụ thuộc %s cho %s không thể được th�a mãn phiên bản ứng cử của gói %s "
-"có thể th�a mãn đi�u kiện phiên bản"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr ""
-"phần phụ thuộc %s cho %s không thể được th�a mãn bởi vì gói %s không có bản "
-"ứng cử"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Việc cố th�a cách phụ thuộc %s cho %s bị lỗi: %s."
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Không thể th�a mãn quan hệ phụ thuộc khi biên dịch cho %s."
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "Hỗ trợ các mô-đun:"
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "Cách dùng: apt-get [tùy_ch�n...] lệnh\n"
 "           apt-get [tùy_ch�n...] install|remove gói1 [gói2 ...]\n"
@@ -1331,44 +1287,6 @@ msgstr ""
 "Những lệnh được dùng thư�ng nhất là update (cập nhật) và install (cài đặt).\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"Tùy ch�n:\n"
-"  -h  Trợ giúp này.\n"
-"  -q  Dữ liệu xuất có thể ghi nhật ký - không hiển thị tiến triển công việc\n"
-"  -qq Không xuất thông tin nào, trừ lỗi\n"
-"  -d  Chỉ tải v�, KHÔNG cài đặt hay giải nén kho\n"
-"  -s  Không làm gì cả. Chỉ mô ph�ng\n"
-"  -y  Trả l�i Có (yes) m�i khi gặp câu h�i\n"
-"  -f  Thử sửa chữa một hệ thống có quan hệ phụ thuộc bị sai h�ng\n"
-"  -m  Thử tiếp tục lại nếu không thể xác định vị trí từ kho\n"
-"  -u  Hiển thị danh sách các gói đã nâng cấp\n"
-"  -b  Biên dịch gói nguồn sau khi lấy nó v�\n"
-"  -V  Hiển thị số thứ tự phiên bản dạng chi tiết\n"
-"  -c=? ��c tập tin cấu hình này\n"
-"  -o=? �ặt tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
-"�ể có thêm thông tin và tùy ch�n thì hãy xem trang hướng dẫn\n"
-"       apt-get(8), sources.list(5) và apt.conf(5).\n"
-"                  Trình APT này có năng lực của siêu bò.\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "Lấy danh sách gói mới (cập nhật cơ sở dữ liệu)"
 
@@ -1442,11 +1360,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Cách dùng: apt-helper [các-tùy-ch�n] lệnh\n"
 "           apt-helper [các-tùy-ch�n] download-file uri đư�ng-dẫn-đích\n"
@@ -1454,10 +1374,6 @@ msgstr ""
 "apt-helper là phần trợ giúp dành cho apt\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep�."
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "tải v� uri đã cho v� đư�ng-dẫn-đích"
 
@@ -1526,11 +1442,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "Cách dùng: apt-mark [tùy-ch�n...] {auto|manual} gói1 [gói2 ...]\n"
 "\n"
@@ -1539,29 +1458,6 @@ msgstr ""
 "dấu.\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"Tùy ch�n:\n"
-"  -h   Trợ giúp này.\n"
-"  -q   Dữ liệu xuất có thể ghi nhật ký - không hiển thị diễn biến công việc\n"
-"  -qq  Không xuất thông tin nào, trừ lỗi\n"
-"  -s   Không làm gì chỉ in những cái sẽ làm.\n"
-"  -f   đánh dấu đ�c/ghi tự-động/thủ-công trong tập tin đã cho.\n"
-"  -c=? ��c tập tin cấu hình này\n"
-"  -o=? �ặt một tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
-"�ể tìm thông tin thêm, xem hai trang man (hướng dẫn)\n"
-"                          apt-mark(8) và apt.conf(5)"
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "�ánh dấu các gói đưa ra là được cài đặt tự động"
 
@@ -2052,17 +1948,13 @@ msgid "Merging available information"
 msgstr "�ang hòa trộn các thông tin sẵn có..."
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
 "\n"
@@ -2094,17 +1986,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "Cách dùng: apt-internal-solver\n"
 "\n"
@@ -2126,27 +2013,10 @@ msgstr "Không hiểu bản ghi gói!"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"Cách dùng: apt-sortpkgs [tùy_ch�n...] tập_tin1 [tập_tin2 ...]\n"
-"\n"
-"[sortpkgs: sort packages: sắp xếp các gói]\n"
-"\n"
-"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
-"Tùy ch�n “-s� dùng để ngầm chỉ kiểu tập tin là gì.\n"
-"\n"
-"Tùy ch�n:\n"
-"  -h   Trợ giúp_ này\n"
-"  -s   Sắp xếp những tập tin _nguồn_\n"
-"  -c=? ��c tập tin cấu hình này\n"
-"  -o=? �ặt tùy ch�n cấu hình tùy ý, v.d. “-o dir::cache=/tmp�\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3908,6 +3778,150 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "�ang tính toán nâng cấp"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Cách dùng: apt-cache [tùy_ch�n...] lệnh\n"
+#~ "           apt-cache [tùy_ch�n...] show gói1 [gói2 ...]\n"
+#~ "\n"
+#~ "apt-cache là một công cụ ở mức thấp dùng để truy vấn\n"
+#~ "thông tin từ các tập tin bộ nhớ tạm nhị phân của APT.\n"
+
+#~ msgid "Commands:"
+#~ msgstr "Các lệnh:"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Tùy ch�n:\n"
+#~ "  -h   Hiển thị trợ giúp này.\n"
+#~ "  -p=? Bộ nhớ tạm gói.\n"
+#~ "  -s=? Bộ nhớ tạm nguồn.\n"
+#~ "  -q   Không hiển thị diễn tiến công việc.\n"
+#~ "  -i   Chỉ hiển thị những phụ thuộc quan tr�ng cho lệnh unmet.\n"
+#~ "  -c=? ��c tập tin cấu hình này\n"
+#~ "  -o=? �ặt một tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
+#~ "�ể tìm thông tin thêm, xem hai trang hướng dẫn\n"
+#~ "                 apt-cache(8) và apt.conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "Cách dùng: apt [các tùy ch�n] lệnh\n"
+#~ "\n"
+#~ "CLI (giao diện dòng lệnh) dành cho apt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "Tùy ch�n:\n"
+#~ "  -h   Trợ giúp này.\n"
+#~ "  -q   Dữ liệu xuất có thể ghi nhật ký - không hiển thị diễn biến công "
+#~ "việc\n"
+#~ "  -qq  Không xuất thông tin nào, trừ lỗi\n"
+#~ "  -s   Không làm gì chỉ in những cái sẽ làm.\n"
+#~ "  -f   đánh dấu đ�c/ghi tự-động/thủ-công trong tập tin đã cho.\n"
+#~ "  -c=? ��c tập tin cấu hình này\n"
+#~ "  -o=? �ặt một tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
+#~ "�ể tìm thông tin thêm, xem hai trang man (hướng dẫn)\n"
+#~ "                          apt-mark(8) và apt.conf(5)"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "Cách dùng: apt-config [tùy_ch�n...] lệnh\n"
+#~ "\n"
+#~ "(config: viết tắt cho từ configuration: cấu hình)\n"
+#~ "\n"
+#~ "apt-config là một công cụ đơn giản để đ�c tập tin cấu hình APT.\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Tùy ch�n:\n"
+#~ "  -h   Trợ giúp này\n"
+#~ "  -c=? ��c tập tin cấu hình này\n"
+#~ "  -o=? �ặt một tùy ch�n cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Tùy ch�n:\n"
+#~ "  -h   Trợ giúp này.\n"
+#~ "  -q   Dữ liệu xuất có thể ghi nhật ký - không hiển thị diễn biến công "
+#~ "việc\n"
+#~ "  -qq  Không xuất thông tin nào, trừ lỗi\n"
+#~ "  -s   Không làm gì chỉ in những cái sẽ làm.\n"
+#~ "  -f   đánh dấu đ�c/ghi tự-động/thủ-công trong tập tin đã cho.\n"
+#~ "  -c=? ��c tập tin cấu hình này\n"
+#~ "  -o=? �ặt một tùy ch�n cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
+#~ "�ể tìm thông tin thêm, xem hai trang man (hướng dẫn)\n"
+#~ "                          apt-mark(8) và apt.conf(5)"
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Cách dùng: apt-sortpkgs [tùy_ch�n...] tập_tin1 [tập_tin2 ...]\n"
+#~ "\n"
+#~ "[sortpkgs: sort packages: sắp xếp các gói]\n"
+#~ "\n"
+#~ "apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
+#~ "Tùy ch�n “-s� dùng để ngầm chỉ kiểu tập tin là gì.\n"
+#~ "\n"
+#~ "Tùy ch�n:\n"
+#~ "  -h   Trợ giúp_ này\n"
+#~ "  -s   Sắp xếp những tập tin _nguồn_\n"
+#~ "  -c=? ��c tập tin cấu hình này\n"
+#~ "  -o=? �ặt tùy ch�n cấu hình tùy ý, v.d. “-o dir::cache=/tmp�\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "Tiến trình con bị lỗi"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8c4593ddf..446af6586 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2014-12-04 04:42+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -173,6 +173,36 @@ msgstr "软件包 %s 还未安装，因而�会被�载\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注�，选� %s 而� %s\n"
 
+#: 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 具有超级牛力。"
+
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr "本 APT 助手具有超级喵力。"
+
+#: 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 "�警告】：下列软件包�能通过验��"
@@ -217,6 +247,10 @@ msgstr "无法获知您在 %s 上的�用空间"
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的�用空间。"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "无法�定下载目录"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上�"
@@ -312,7 +346,7 @@ 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 "下载完毕，目�是“仅下载�模�"
 
@@ -681,9 +715,238 @@ msgstr[0] "有 %i �附加记录。请加上 ‘-a’ �数�查看它们"
 msgid "not a real package (virtual)"
 msgstr "�是一个实包(虚包)"
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "没有�现匹�的软件包"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "无法定�软件包 %s"
+
+#: 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 "缓存尚未�步，无法交差引�(x-ref)一个软件包文件"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+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
+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 "(æ— )"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+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 "找�到‘%s’体系结构下的软件包"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "找�到软件包‘%s’的‘%s’版本"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "找�到软件包‘%s’的‘%s’�行"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "选择 %s 作为�代�包而� %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "找�到 %2$s 软件包的 %1$s 版本"
+
+#: 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 "无法找到与 %s 对应的�代�包"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"�示：%s 的打包工作被维护于以下�置的 %s 版本控制系统中：\n"
+"%s\n"
+
+#: 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 ""
+"请使用：\n"
+"%s\n"
+"获得该软件包的最近更新(�能尚未正��布)。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载的文件“%s�\n"
+
+#. 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 "需�下载 %sB/%sB 的�代�包。\n"
+
+#. 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 "需�下载 %sB 的�代�包。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "下载�代� %s\n"
+
+#: 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 "忽略已�被解包到 %s 目录的�代�包\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "�行解包的命令“%s�出错。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "请检查是�安装了“dpkg-dev�软件包。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "执行构造软件包命令“%s�失败。\n"
+
+#: 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 ""
+"找�到关于 %s 的有效体系结构信�。请�� apt.conf(5) APT::Architectures for "
+"setup"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, fuzzy, 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"
+msgstr "无法获得 %s 的构建�赖关系信�"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr " %s 没有构建�赖关系信�。\n"
+
+#: 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 ""
+"由于 %3$s �被软件包 %4$s 所�许，因此�能满足 %2$s 所�求的 %1$s �赖关系"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "由于无法找到软件包 %3$s ，因此�能满足 %2$s 所�求的 %1$s �赖关系"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "无法满足 %2$s 所�求 %1$s �赖关系：已安装的软件包 %3$s 太新"
+
+#: 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"
+msgstr ""
+"软件包 %3$s 的候选版本�能满足版本�求，因此 %2$s 软件包的 %1$s �赖无法满足"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "软件包 %3$s 没有�用的候选版本，因此 %2$s 的 %1$s �赖无法满足"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "无法满足 %2$s 所�求 %1$s �赖关系：%3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "�能满足软件包 %s 所�求的构建�赖关系。"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "无法处�构建�赖关系"
 
 #: apt-private/private-sources.cc
 #, c-format
@@ -789,96 +1052,18 @@ msgstr "总�用空间："
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "该命令已废弃。请使用‘apt-mark showauto’。"
 
-#: cmdline/apt-cache.cc apt-pkg/cacheset.cc
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "无法定�软件包 %s"
-
-#: 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 "缓存尚未�步，无法交差引�(x-ref)一个软件包文件"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "被�定的软件包："
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(没有找到)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  已安装："
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  候选："
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(æ— )"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  软件包�："
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  版本列表："
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
-"用法： apt-cache [选项] 命令\n"
-"　　　 apt-cache [选项] show 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-cache 是一个底层的工具，它�以在 APT 的\n"
-"二进制缓存文件中查询信�\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
-msgstr "命令："
-
-#: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"选项：\n"
-"  -h   本帮助文档。\n"
-"  -p=? 软件包的缓存。\n"
-"  -s=? �代�包的缓存。\n"
-"  -q   关闭进度显示。\n"
-"  -i   仅为 unmet 命令显示��的�赖关系。\n"
-"  -c=? 读�指定�置文件\n"
-"  -o=? 设置任�指定的�置选项，例如 -o dir::cache=/tmp\n"
-"若�了解更多信�，您还�以查阅 apt-cache(8) 和 apt.conf(5) �考手册。\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -912,11 +1097,12 @@ msgstr "显示软件包的安装设置状�"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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 ""
-"用法： apt [选项] 命令\n"
-"\n"
-"apt 的命令行界�。\n"
 
 #. query
 #: cmdline/apt.cc
@@ -957,7 +1143,6 @@ msgstr "通过 安装/�级 软件�更新系统"
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr "通过 �载/安装/�级 �更新系统"
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 msgid "edit the source information file"
@@ -996,36 +1181,11 @@ msgstr "请对您的盘片套件中的其它盘片��相�的�作。"
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\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-cdrom.cc
-#, fuzzy
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\n"
-msgstr ""
-"选项：\n"
-"  -h  显示本帮助信�\n"
-"  -q  日志型输出 - �显示进度\n"
-"  -qq 安�模�，�输出错误信�\n"
-"  -s  无动作。�说明将��什么。\n"
-"  -f  读�/写入 指定文件的  自动/手动 标记\n"
-"  -c=? 读�指定的�置文件\n"
-"  -o=? 任�设置一个�置项，比如 -o dir::cache=/tmp\n"
-"更多细节请�� the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
-
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "�数��对"
@@ -1034,23 +1194,9 @@ msgstr "�数��对"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"用法：apt-config [选项] 命令\n"
-"\n"
-"apt-config 是一个用于读�APT �置文件的简�工具\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"选项：\n"
-"  -h   显示本帮助文本。\n"
-"  -c=? 读�指定的�置文件\n"
-"  -o=? 设置任�指定的�置选项，例如：-o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1062,31 +1208,6 @@ msgstr ""
 
 #: cmdline/apt-get.cc
 #, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "找�到‘%s’体系结构下的软件包"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "找�到软件包‘%s’的‘%s’版本"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "找�到软件包‘%s’的‘%s’�行"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "选择 %s 作为�代�包而� %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr "找�到 %2$s 软件包的 %1$s 版本"
-
-#: cmdline/apt-get.cc
-#, c-format
 msgid "Couldn't find package %s"
 msgstr "找�到软件包 %s"
 
@@ -1106,181 +1227,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具�事了"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "无法�定下载目录"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "�下载�代�，必须指定至少一个对应的软件包"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "无法找到与 %s 对应的�代�包"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"�示：%s 的打包工作被维护于以下�置的 %s 版本控制系统中：\n"
-"%s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"请使用：\n"
-"%s\n"
-"获得该软件包的最近更新(�能尚未正��布)。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载的文件“%s�\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "需�下载 %sB/%sB 的�代�包。\n"
-
-#. 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"
-msgstr "需�下载 %sB 的�代�包。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "下载�代� %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "有一些包文件无法下载。"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "忽略已�被解包到 %s 目录的�代�包\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "�行解包的命令“%s�出错。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "请检查是�安装了“dpkg-dev�软件包。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "执行构造软件包命令“%s�失败。\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "�检查生�软件包的构建�赖关系，必须指定至少一个软件包"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-"找�到关于 %s 的有效体系结构信�。请�� apt.conf(5) APT::Architectures for "
-"setup"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "无法处�构建�赖关系"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "无法获得 %s 的构建�赖关系信�"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr " %s 没有构建�赖关系信�。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"由于 %3$s �被软件包 %4$s 所�许，因此�能满足 %2$s 所�求的 %1$s �赖关系"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "由于无法找到软件包 %3$s ，因此�能满足 %2$s 所�求的 %1$s �赖关系"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所�求 %1$s �赖关系：已安装的软件包 %3$s 太新"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"软件包 %3$s 的候选版本�能满足版本�求，因此 %2$s 软件包的 %1$s �赖无法满足"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "软件包 %3$s 没有�用的候选版本，因此 %2$s 的 %1$s �赖无法满足"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "无法满足 %2$s 所�求 %1$s �赖关系：%3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "�能满足软件包 %s 所�求的构建�赖关系。"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "无法处�构建�赖关系"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "支�的模�："
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "用法： apt-get [选项] 命令\n"
 "　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
@@ -1290,44 +1250,6 @@ msgstr ""
 "最常用命令是 update 和 install。\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"选项：\n"
-"  -h  本帮助文档。\n"
-"  -q  让输出�作为日志 - �显示进度\n"
-"  -qq 除了错误外，什么都�输出\n"
-"  -d  仅仅下载 - ��】安装或解开包文件\n"
-"  -s  �作实际�作。�是�次模拟执行命令\n"
-"  -y  对所有询问都回答是(Yes)，�时�作任何�示\n"
-"  -f  当出现破�的�赖关系时，程�将�试修正系统\n"
-"  -m  当有包文件无法找到时，程���试继续执行\n"
-"  -u  显示已�级的软件包列表\n"
-"  -b  在下载完��包�，编译生�相应的软件包\n"
-"  -V  显示详尽的版本�\n"
-"  -c=? 读�指定�置文件\n"
-"  -o=? 设置任�指定的�置选项，例如 -o dir::cache=/tmp\n"
-"请查阅 apt-get(8)�sources.list(5) 和 apt.conf(5)的�考手册\n"
-"以获�更多信�和选项。\n"
-"                       本 APT 具有超级牛力。\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "�回更新的软件包列表信�"
 
@@ -1401,11 +1323,13 @@ msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #: cmdline/apt-helper.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "用法： apt-helper [选项] 命令\n"
 "       apt-helper [选项] download-file URI 目标路径\n"
@@ -1413,10 +1337,6 @@ msgstr ""
 "apt-helper 是一个 apt 的内部助手\n"
 
 #: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
-msgstr "本 APT 助手具有超级喵力。"
-
-#: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
 msgstr "将 URI 指定的文件下载到目标路径"
 
@@ -1483,11 +1403,14 @@ msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
+#, fuzzy
 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"
+"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"
 msgstr ""
 "用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
 "\n"
@@ -1495,28 +1418,6 @@ msgstr ""
 "它也能列出标记。\n"
 
 #: cmdline/apt-mark.cc
-msgid ""
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
-"选项：\n"
-"  -h  显示本帮助信�\n"
-"  -q  日志型输出 - �显示进度\n"
-"  -qq 安�模�，�输出错误信�\n"
-"  -s  无动作。�说明将��什么。\n"
-"  -f  读�/写入 指定文件的  自动/手动 标记\n"
-"  -c=? 读�指定的�置文件\n"
-"  -o=? 任�设置一个�置项，比如 -o dir::cache=/tmp\n"
-"更多细节请�� the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
-
-#: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
 msgstr "标记指定软件包为自动安装"
 
@@ -1995,17 +1896,13 @@ msgid "Merging available information"
 msgstr "正在�并�用信�"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
 "\n"
@@ -2033,17 +1930,12 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf �？"
 
 #: cmdline/apt-internal-solver.cc
+#, fuzzy
 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "用法： apt-internal-solver\n"
 "\n"
@@ -2064,25 +1956,10 @@ msgstr "未知的软件包记录�"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-sortpkgs 是对软件包索引文件内容进行排�的简�工具。-s 选项\n"
-"是用�指出���数所示文件是哪�文件。\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文档\n"
-"  -s   根��文件排�\n"
-"  -c=? 读�指定�置文件\n"
-"  -o=? 设置任�指定的�置选项，例如 -o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3785,6 +3662,141 @@ msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用
 msgid "Calculating upgrade"
 msgstr "正在对�级进行计算"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "用法： apt-cache [选项] 命令\n"
+#~ "　　　 apt-cache [选项] show 软件包1 [软件包2 ...]\n"
+#~ "\n"
+#~ "apt-cache 是一个底层的工具，它�以在 APT 的\n"
+#~ "二进制缓存文件中查询信�\n"
+
+#~ msgid "Commands:"
+#~ msgstr "命令："
+
+#~ msgid ""
+#~ "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 ""
+#~ "选项：\n"
+#~ "  -h   本帮助文档。\n"
+#~ "  -p=? 软件包的缓存。\n"
+#~ "  -s=? �代�包的缓存。\n"
+#~ "  -q   关闭进度显示。\n"
+#~ "  -i   仅为 unmet 命令显示��的�赖关系。\n"
+#~ "  -c=? 读�指定�置文件\n"
+#~ "  -o=? 设置任�指定的�置选项，例如 -o dir::cache=/tmp\n"
+#~ "若�了解更多信�，您还�以查阅 apt-cache(8) 和 apt.conf(5) �考手册。\n"
+
+#~ msgid ""
+#~ "Usage: apt [options] command\n"
+#~ "\n"
+#~ "CLI for apt.\n"
+#~ msgstr ""
+#~ "用法： apt [选项] 命令\n"
+#~ "\n"
+#~ "apt 的命令行界�。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -d   CD-ROM mount point\n"
+#~ "  -r   Rename a recognized CD-ROM\n"
+#~ "  -m   No mounting\n"
+#~ "  -f   Fast mode, don't check package files\n"
+#~ "  -a   Thorough scan mode\n"
+#~ "  --no-auto-detect Do not try to auto detect drive and mount point\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See fstab(5)\n"
+#~ msgstr ""
+#~ "选项：\n"
+#~ "  -h  显示本帮助信�\n"
+#~ "  -q  日志型输出 - �显示进度\n"
+#~ "  -qq 安�模�，�输出错误信�\n"
+#~ "  -s  无动作。�说明将��什么。\n"
+#~ "  -f  读�/写入 指定文件的  自动/手动 标记\n"
+#~ "  -c=? 读�指定的�置文件\n"
+#~ "  -o=? 任�设置一个�置项，比如 -o dir::cache=/tmp\n"
+#~ "更多细节请�� the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "用法：apt-config [选项] 命令\n"
+#~ "\n"
+#~ "apt-config 是一个用于读�APT �置文件的简�工具\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "选项：\n"
+#~ "  -h   显示本帮助文本。\n"
+#~ "  -c=? 读�指定的�置文件\n"
+#~ "  -o=? 设置任�指定的�置选项，例如：-o dir::cache=/tmp\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h  This help text.\n"
+#~ "  -q  Loggable output - no progress indicator\n"
+#~ "  -qq No output except for errors\n"
+#~ "  -s  No-act. Just prints what would be done.\n"
+#~ "  -f  read/write auto/manual marking in the given file\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "选项：\n"
+#~ "  -h  显示本帮助信�\n"
+#~ "  -q  日志型输出 - �显示进度\n"
+#~ "  -qq 安�模�，�输出错误信�\n"
+#~ "  -s  无动作。�说明将��什么。\n"
+#~ "  -f  读�/写入 指定文件的  自动/手动 标记\n"
+#~ "  -c=? 读�指定的�置文件\n"
+#~ "  -o=? 任�设置一个�置项，比如 -o dir::cache=/tmp\n"
+#~ "更多细节请�� the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
+
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs 是对软件包索引文件内容进行排�的简�工具。-s 选项\n"
+#~ "是用�指出���数所示文件是哪�文件。\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -h   本帮助文档\n"
+#~ "  -s   根��文件排�\n"
+#~ "  -c=? 读�指定�置文件\n"
+#~ "  -o=? 设置任�指定的�置选项，例如 -o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "�进程出错"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 879d6be4f..7a0c75ffb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-10-24 00:07+0200\n"
+"POT-Creation-Date: 2015-10-27 10:30+0100\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -171,6 +171,36 @@ msgstr "套件 %s 並沒有被安�，所以也�會被移除\n"
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注�，�擇了以 %s 替代 %s\n"
 
+#: 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 有著超級牛力。"
+
+#: 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 "�警告】：無法驗證下列套件�"
@@ -215,6 +245,10 @@ msgstr "無法確� %s 的未使用空間"
 msgid "You don't have enough free space in %s."
 msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "無法鎖定下載目錄"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在�毀的套件上執行 InstallPackages�"
@@ -311,7 +345,7 @@ msgstr "是�繼續進行 [Y/n]？"
 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 "下載完�，且這是『僅下載�模�"
 
@@ -689,9 +723,230 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
-msgid "No packages found"
-msgstr "未找到套件"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "找�到套件 %s"
+
+#: 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 "快�資料未�步，無法 x-ref 套件檔"
+
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+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
+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 "(ç„¡)"
+
+#: apt-private/private-show.cc
+msgid "  Package pin: "
+msgstr "  套件鎖定："
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+msgid "  Version table:"
+msgstr "  版本列表："
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "無法找到套件 %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "無法找到套件 %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "無法找到套件 %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "無法�得來�套件列表 %s 的狀態"
+
+#: 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 "無法找到 %s 的原始碼套件"
+
+#: 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 "略�已下載的檔案 '%s'\n"
+
+#. 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 "需�下載 %sB/%sB 的原始套件檔。\n"
+
+#. 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 "需�下載 %sB 的原始套件檔。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "�得原始碼 %s\n"
+
+#: 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 "�解開，因原始碼已解開至 %s\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "解開指令 '%s' 失敗。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "請檢查是�已安�了 'dpkg-dev' 套件。\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "編譯指令 '%s' 失敗。\n"
+
+#: 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
+#, fuzzy, 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"
+msgstr "無法�得 %s 的編譯相�關係資訊"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s 沒有編譯相�關係。\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "無法滿足 %2$s 所�求的 %1$s 相�關係，因為找�到套件 %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "無法滿足 %2$s 所�求的 %1$s 相�關係，因為找�到套件 %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "無法滿足 %2$s 的相�關係 %1$s：已安�的套件 %3$s 太新了"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"無法滿足 %2$s 所�求的 %1$s 相�關係，因為套件 %3$s 沒有版本符�其版本需求"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "無法滿足 %2$s 所�求的 %1$s 相�關係，因為找�到套件 %3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "無法滿足 %2$s 的相�關係 %1$s：%3$s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "無法滿足套件 %s 的編譯相�關係。"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "無法處�編譯相�關係"
 
 #: apt-private/private-sources.cc
 #, fuzzy, c-format
@@ -798,98 +1053,20 @@ 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 "找�到套件 %s"
-
-#: 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 "快�資料未�步，無法 x-ref 套件檔"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc
-msgid "Pinned packages:"
-msgstr "鎖定的套件："
-
-#: cmdline/apt-cache.cc
-msgid "(not found)"
-msgstr "(未找到)"
-
-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc
-#, c-format
-msgid "%s -> %s with priority %d\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc
-msgid "  Installed: "
-msgstr "  已安�："
-
-#: cmdline/apt-cache.cc
-msgid "  Candidate: "
-msgstr "  候�："
-
-#: cmdline/apt-cache.cc
-msgid "(none)"
-msgstr "(ç„¡)"
-
-#: cmdline/apt-cache.cc
-msgid "  Package pin: "
-msgstr "  套件鎖定："
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc
-msgid "  Version table:"
-msgstr "  版本列表："
-
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
-msgstr ""
-"用法：apt-cache [�項] 指令\n"
-"      apt-cache [�項] show 套件1 [套件2 ...]\n"
-"\n"
-"apt-cache 是一個低階的工具，�用來�作 APT 的二進制快�檔，也�用來\n"
-"查詢那些檔案中的相關訊�\n"
-
-#: cmdline/apt-cache.cc cmdline/apt.cc cmdline/apt-cdrom.cc
-#: cmdline/apt-config.cc cmdline/apt-get.cc cmdline/apt-helper.cc
-#: cmdline/apt-mark.cc
-msgid "Commands:"
+"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"
+"availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc
-msgid ""
-"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 ""
-"�項：\n"
-"  -h   本幫助訊�。\n"
-"  -p=? 套件的快�。\n"
-"  -s=? 原始碼的快�。\n"
-"  -q   關閉進度顯示。\n"
-"  -i   僅為 unmet 指令顯示��的相�關係。\n"
-"  -c=? 讀�指定的設定檔\n"
-"  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\n"
-"請�閱 apt-cache(8) � apt.conf(5) �考手冊以�得更多資訊。\n"
-
-#: cmdline/apt-cache.cc
 msgid "Show source records"
 msgstr "顯示原始碼報告"
 
@@ -921,7 +1098,11 @@ msgstr "顯示套件的�安�版本資訊"
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
-"CLI for apt.\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
@@ -967,7 +1148,6 @@ msgstr ""
 msgid "upgrade the system by removing/installing/upgrading packages"
 msgstr ""
 
-#. for compat with muscle memory
 #. misc
 #: cmdline/apt.cc
 #, fuzzy
@@ -1005,24 +1185,9 @@ msgstr "請�您的光碟組中的其它光碟�複相�的�作。"
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-"CDROM mount point and device information is taken from apt.conf,\n"
-"udev and /etc/fstab.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc
-msgid ""
-"Options:\n"
-"  -h   This help text\n"
-"  -d   CD-ROM mount point\n"
-"  -r   Rename a recognized CD-ROM\n"
-"  -m   No mounting\n"
-"  -f   Fast mode, don't check package files\n"
-"  -a   Thorough scan mode\n"
-"  --no-auto-detect Do not try to auto detect drive and mount point\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See fstab(5)\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
@@ -1033,23 +1198,9 @@ msgstr "�數並未��"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
-"apt-config is a simple tool to read the APT config file\n"
-msgstr ""
-"用法：apt-config [�項] 指令\n"
-"\n"
-"apt-config 是一個用於讀� APT 設定檔的簡單工具\n"
-
-#: cmdline/apt-config.cc
-msgid ""
-"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"
+"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"
 msgstr ""
-"�項：\n"
-"  -h   本幫助訊�。\n"
-"  -c=? 讀�指定的設定檔\n"
-"  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1060,31 +1211,6 @@ msgid "show the active configuration setting"
 msgstr ""
 
 #: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "無法找到套件 %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with version '%s'"
-msgstr "無法找到套件 %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "無法找到套件 %s"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "無法�得來�套件列表 %s 的狀態"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
@@ -1105,173 +1231,20 @@ msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，�題排除器造�了�壞"
 
 #: cmdline/apt-get.cc
-msgid "Unable to lock the download directory"
-msgstr "無法鎖定下載目錄"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to fetch source for"
-msgstr "在�得原始碼時必須至少指定一個套件"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "無法找到 %s 的原始碼套件"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"Please use:\n"
-"%s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "略�已下載的檔案 '%s'\n"
-
-#. 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
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "需�下載 %sB/%sB 的原始套件檔。\n"
-
-#. 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"
-msgstr "需�下載 %sB 的原始套件檔。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "�得原始碼 %s\n"
-
-#: cmdline/apt-get.cc
-msgid "Failed to fetch some archives."
-msgstr "無法�得�些套件檔。"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "�解開，因原始碼已解開至 %s\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "解開指令 '%s' 失敗。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "請檢查是�已安�了 'dpkg-dev' 套件。\n"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "編譯指令 '%s' 失敗。\n"
-
-#: cmdline/apt-get.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "在檢查編譯相�關係時必須至少指定一個套件"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "無法處�編譯相�關係"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "無法�得 %s 的編譯相�關係資訊"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s 沒有編譯相�關係。\n"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "無法滿足 %2$s 所�求的 %1$s 相�關係，因為找�到套件 %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "無法滿足 %2$s 所�求的 %1$s 相�關係，因為找�到套件 %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "無法滿足 %2$s 的相�關係 %1$s：已安�的套件 %3$s 太新了"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"無法滿足 %2$s 所�求的 %1$s 相�關係，因為套件 %3$s 沒有版本符�其版本需求"
-
-#: cmdline/apt-get.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "無法滿足 %2$s 所�求的 %1$s 相�關係，因為找�到套件 %3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "無法滿足 %2$s 的相�關係 %1$s：%3$s"
-
-#: cmdline/apt-get.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "無法滿足套件 %s 的編譯相�關係。"
-
-#: cmdline/apt-get.cc
-msgid "Failed to process build dependencies"
-msgstr "無法處�編譯相�關係"
-
-#: cmdline/apt-get.cc
 msgid "Supported modules:"
 msgstr "已支�模組："
 
 #: cmdline/apt-get.cc
+#, fuzzy
 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"
+"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 ""
 "用法：apt-get [�項] 指令\n"
 "      apt-get [�項] install|remove 套件1 [套件2 ...]\n"
@@ -1281,44 +1254,6 @@ msgstr ""
 "最常用指令是 update 和 install。\n"
 
 #: cmdline/apt-get.cc
-msgid ""
-"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 ""
-"�項：\n"
-"  -h  本求助訊�。\n"
-"  -q  讓輸出�作為記錄檔之用 - �顯示進度\n"
-"  -qq 除了錯誤外，�顯示其它資訊\n"
-"  -d  僅下載 - ��】安�或解開套件檔\n"
-"  -s  �實際進行。�是模擬執行指令\n"
-"  -y  �所有詢�都回答 Yes，�時�會有任何�示\n"
-"  -f  嘗試修正系統上�毀的套件相�關係\n"
-"  -m  當有套件檔無法找到時，�試著繼續進行\n"
-"  -u  顯示已�級的套件列表\n"
-"  -b  在�得套件原始碼後進行編譯\n"
-"  -V  顯示詳盡的版本號碼\n"
-"  -c=? 讀�指定的設定檔\n"
-"  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\n"
-"請�閱 apt-get(8)�sources.list(5) � apt.conf(5) 的使用手冊\n"
-"以�得更多資訊和�項。\n"
-"                        該 APT 有著超級牛力。\n"
-
-#: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
 msgstr "�得新的套件列表"
 
@@ -1397,11 +1332,8 @@ 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"
-msgstr ""
-
-#: cmdline/apt-helper.cc
-msgid "This APT helper has Super Meep Powers."
+"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"
 msgstr ""
 
 #: cmdline/apt-helper.cc
@@ -1475,20 +1407,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 can also list marks.\n"
-msgstr ""
-
-#: cmdline/apt-mark.cc
-msgid ""
-"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."
+"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"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1976,17 +1897,13 @@ msgid "Merging available information"
 msgstr "整��有的資料"
 
 #: cmdline/apt-extracttemplates.cc
+#, fuzzy
 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 ""
 "用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
 "\n"
@@ -2019,13 +1936,7 @@ 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"
+"like an external resolver for the APT family for debugging or alike.\n"
 msgstr ""
 "用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
 "\n"
@@ -2046,24 +1957,10 @@ msgstr "未知的套件記錄�"
 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"
+"It sorts by default by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
 msgstr ""
-"用法：apt-sortpkgs [�項] 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-sortpkgs 是用來排�套件檔的簡單工具。-s �項是用來指定它的檔案類型。\n"
-"\n"
-"�項：\n"
-"  -h   本幫助訊�。\n"
-"  -s   根據原始檔排�\n"
-"  -c=? 讀�指定的設定檔\n"
-"  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -3758,6 +3655,83 @@ msgstr "有一些索引檔�能下載，它們�能被略�了，或是替而
 msgid "Calculating upgrade"
 msgstr "籌備�級中"
 
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "用法：apt-cache [�項] 指令\n"
+#~ "      apt-cache [�項] show 套件1 [套件2 ...]\n"
+#~ "\n"
+#~ "apt-cache 是一個低階的工具，�用來�作 APT 的二進制快�檔，也�用來\n"
+#~ "查詢那些檔案中的相關訊�\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "�項：\n"
+#~ "  -h   本幫助訊�。\n"
+#~ "  -p=? 套件的快�。\n"
+#~ "  -s=? 原始碼的快�。\n"
+#~ "  -q   關閉進度顯示。\n"
+#~ "  -i   僅為 unmet 指令顯示��的相�關係。\n"
+#~ "  -c=? 讀�指定的設定檔\n"
+#~ "  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\n"
+#~ "請�閱 apt-cache(8) � apt.conf(5) �考手冊以�得更多資訊。\n"
+
+#~ msgid ""
+#~ "Usage: apt-config [options] command\n"
+#~ "\n"
+#~ "apt-config is a simple tool to read the APT config file\n"
+#~ msgstr ""
+#~ "用法：apt-config [�項] 指令\n"
+#~ "\n"
+#~ "apt-config 是一個用於讀� APT 設定檔的簡單工具\n"
+
+#~ msgid ""
+#~ "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 ""
+#~ "�項：\n"
+#~ "  -h   本幫助訊�。\n"
+#~ "  -c=? 讀�指定的設定檔\n"
+#~ "  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\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"
+#~ msgstr ""
+#~ "用法：apt-sortpkgs [�項] 檔案1 [檔案2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs 是用來排�套件檔的簡單工具。-s �項是用來指定它的檔案類型。\n"
+#~ "\n"
+#~ "�項：\n"
+#~ "  -h   本幫助訊�。\n"
+#~ "  -s   根據原始檔排�\n"
+#~ "  -c=? 讀�指定的設定檔\n"
+#~ "  -o=? 指定任�的設定�項，例如:-o dir::cache=/tmp\n"
+
 #~ msgid "Child process failed"
 #~ msgstr "�程�失敗"
 
diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc
index 7f6c511df..d135ddd7b 100644
--- a/test/libapt/commandline_test.cc
+++ b/test/libapt/commandline_test.cc
@@ -17,7 +17,7 @@ class CLT: public CommandLine {
       }
 };
 
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const *) {return false;}
+bool ShowHelp(CommandLine &) {return false;}
 std::vector<aptDispatchWithHelp> GetCommands() {return {};}