split up help messages for simpler reuse

That is one huge commit with busy work only: Help messages used to be
one big translateable string, which is a pain for translators and hard
to reuse for us. This change there 'explodes' this single string into
new string for each documented string trying hard to split up the
translated messages as well. This actually restores many translations as
previously adding a single command made all of the bug message fuzzy.
The splitup also highlighted that its easy to forget a line, duplicate
one and similar stuff.

Git-Dch: Ignore

68 files changed, 18729 insertions, 9104 deletions

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 40365237e..60ce90f1f 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -84,6 +84,43 @@ char const * CommandLine::GetCommand(Dispatch const * const Map,
    }
    return NULL;
 }
+char const * CommandLine::GetCommand(DispatchWithHelp const * const Map,
+      unsigned int const argc, char const * const * const argv)
+{
+   // if there is a -- on the line there must be the word we search for either
+   // before it (as -- marks the end of the options) or right after it (as we can't
+   // decide if the command is actually an option, given that in theory, you could
+   // have parameters named like commands)
+   for (size_t i = 1; i < argc; ++i)
+   {
+      if (strcmp(argv[i], "--") != 0)
+	 continue;
+      // check if command is before --
+      for (size_t k = 1; k < i; ++k)
+	 for (size_t j = 0; Map[j].Match != NULL; ++j)
+	    if (strcmp(argv[k], Map[j].Match) == 0)
+	       return Map[j].Match;
+      // see if the next token after -- is the command
+      ++i;
+      if (i < argc)
+	 for (size_t j = 0; Map[j].Match != NULL; ++j)
+	    if (strcmp(argv[i], Map[j].Match) == 0)
+	       return Map[j].Match;
+      // we found a --, but not a command
+      return NULL;
+   }
+   // no --, so search for the first word matching a command
+   // FIXME: How like is it that an option parameter will be also a valid Match ?
+   for (size_t i = 1; i < argc; ++i)
+   {
+      if (*(argv[i]) == '-')
+	 continue;
+      for (size_t j = 0; Map[j].Match != NULL; ++j)
+	 if (strcmp(argv[i], Map[j].Match) == 0)
+	    return Map[j].Match;
+   }
+   return NULL;
+}
 									/*}}}*/
 // CommandLine::Parse - Main action member				/*{{{*/
 // ---------------------------------------------------------------------
@@ -374,8 +411,29 @@ unsigned int CommandLine::FileSize() const
 }
 									/*}}}*/
 // CommandLine::DispatchArg - Do something with the first arg		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
+bool CommandLine::DispatchArg(DispatchWithHelp *Map,bool NoMatch)
+{
+   int I;
+   for (I = 0; Map[I].Match != 0; I++)
+   {
+      if (strcmp(FileList[0],Map[I].Match) == 0)
+      {
+	 bool Res = Map[I].Handler(*this);
+	 if (Res == false && _error->PendingError() == false)
+	    _error->Error("Handler silently failed");
+	 return Res;
+      }
+   }
+   
+   // No matching name
+   if (Map[I].Match == 0)
+   {
+      if (NoMatch == true)
+	 _error->Error(_("Invalid operation %s"),FileList[0]);
+   }
+   
+   return false;
+}
 bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
 {
    int I;
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 58cbaa8c3..a698a18b8 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -57,6 +57,7 @@ class CommandLine
    public:
    struct Args;
    struct Dispatch;
+   struct DispatchWithHelp;
    
    protected:
    
@@ -84,9 +85,13 @@ class CommandLine
    void ShowHelp();
    unsigned int FileSize() const APT_PURE;
    bool DispatchArg(Dispatch *List,bool NoMatch = true);
+   bool DispatchArg(DispatchWithHelp *List,bool NoMatch = true);
       
    static char const * GetCommand(Dispatch const * const Map,
 	 unsigned int const argc, char const * const * const argv) APT_PURE;
+   static char const * GetCommand(DispatchWithHelp const * const Map,
+	 unsigned int const argc, char const * const * const argv) APT_PURE;
+
 
    static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
 	 char const *ConfName, unsigned long Flags) APT_CONST;
@@ -112,5 +117,11 @@ struct CommandLine::Dispatch
    const char *Match;
    bool (*Handler)(CommandLine &);
 };
+struct CommandLine::DispatchWithHelp
+{
+   const char *Match;
+   bool (*Handler)(CommandLine &);
+   const char *Help;
+};
 
 #endif
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 9f019121c..265c5d482 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -340,8 +340,8 @@ static void BinarySpecificConfiguration(char const * const Binary)	/*{{{*/
    _config->MoveSubTree(conf.c_str(), NULL);
 }
 									/*}}}*/
-void ParseCommandLine(CommandLine &CmdL, CommandLine::Dispatch * const Cmds, CommandLine::Args * const Args,/*{{{*/
-      Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char *argv[], bool(*ShowHelp)(CommandLine &CmdL))
+void ParseCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * Cmds, CommandLine::Args * const Args,/*{{{*/
+      Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char *argv[], bool(*ShowHelp)(CommandLine &, CommandLine::DispatchWithHelp const *))
 {
    CmdL = CommandLine(Args,_config);
    if (Cnf != NULL && pkgInitConfig(**Cnf) == false)
@@ -357,21 +357,22 @@ void ParseCommandLine(CommandLine &CmdL, CommandLine::Dispatch * const Cmds, Com
        (Sys != NULL && pkgInitSystem(*_config, *Sys) == false))
    {
       if (_config->FindB("version") == true)
-	 ShowHelp(CmdL);
+	 ShowHelp(CmdL, Cmds);
 
       _error->DumpErrors();
       exit(100);
    }
 
    // See if the help should be shown
-   if (_config->FindB("help") == true || _config->FindB("version") == true)
+   if (_config->FindB("help") == true || _config->FindB("version") == true ||
+	 (CmdL.FileSize() > 0 && strcmp(CmdL.FileList[0], "help") == 0))
    {
-      ShowHelp(CmdL);
+      ShowHelp(CmdL, Cmds);
       exit(0);
    }
-   if (Cmds != NULL && CmdL.FileSize() == 0)
+   if (Cmds != nullptr && CmdL.FileSize() == 0)
    {
-      ShowHelp(CmdL);
+      ShowHelp(CmdL, Cmds);
       exit(1);
    }
 }
diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 7b468456b..0d6c0bba6 100644
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -10,8 +10,8 @@ class Configuration;
 class pkgSystem;
 
 APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd);
-APT_PUBLIC void ParseCommandLine(CommandLine &CmdL, CommandLine::Dispatch * const Cmds, CommandLine::Args * const Args,
+APT_PUBLIC void ParseCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * Cmds, CommandLine::Args * const Args,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],
-      bool(*ShowHelp)(CommandLine &CmdL));
+      bool(*ShowHelp)(CommandLine &, CommandLine::DispatchWithHelp const *));
 
 #endif
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 24ed9eef3..4b3a74922 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1522,41 +1522,30 @@ static bool GenCaches(CommandLine &)
 }
 									/*}}}*/
 // ShowHelp - Show a help screen					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
    if (_config->FindB("version") == true)
      return true;
 
-   cout << 
+   std::cout <<
     _("Usage: apt-cache [options] command\n"
-      "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-      "       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-      "\n"
-      "Commands:\n"
-      "   gencaches - Build both the package and source cache\n"
-      "   showpkg - Show some general information for a single package\n"
-      "   showsrc - Show source records\n"
-      "   stats - Show some basic statistics\n"
-      "   dump - Show the entire file in a terse form\n"
-      "   dumpavail - Print an available file to stdout\n"
-      "   unmet - Show unmet dependencies\n"
-      "   search - Search the package list for a regex pattern\n"
-      "   show - Show a readable record for the package\n"
-      "   depends - Show raw dependency information for a package\n"
-      "   rdepends - Show reverse dependency information for a package\n"
-      "   pkgnames - List the names of all packages in the system\n"
-      "   dotty - Generate package graphs for GraphViz\n"
-      "   xvcg - Generate package graphs for xvcg\n"
-      "   policy - Show policy settings\n"
-      "\n"
-      "Options:\n"
+      "from APT's binary cache files\n")
+    << std::endl
+    << _("Commands:") << std::endl;
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   std::cout << std::endl
+    << _("Options:\n"
       "  -h   This help text.\n"
       "  -p=? The package cache.\n"
       "  -s=? The source cache.\n"
@@ -1570,25 +1559,26 @@ static bool ShowHelp(CommandLine &)
 									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] =  {{"help",&ShowHelp},
-                                    {"gencaches",&GenCaches},
-                                    {"showsrc",&ShowSrcPackage},
-                                    {"showpkg",&DumpPackage},
-                                    {"stats",&Stats},
-                                    {"dump",&Dump},
-                                    {"dumpavail",&DumpAvail},
-                                    {"unmet",&UnMet},
-                                    {"search",&DoSearch},
-                                    {"depends",&Depends},
-                                    {"rdepends",&RDepends},
-                                    {"dotty",&Dotty},
-                                    {"xvcg",&XVcg},
-                                    {"show",&ShowPackage},
-                                    {"pkgnames",&ShowPkgNames},
-                                    {"showauto",&ShowAuto},
-                                    {"policy",&Policy},
-                                    {"madison",&Madison},
-                                    {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] =  {
+      {"gencaches",&GenCaches, nullptr},
+      {"showsrc",&ShowSrcPackage, _("Show source records")},
+      {"showpkg",&DumpPackage, nullptr},
+      {"stats",&Stats, nullptr},
+      {"dump",&Dump, nullptr},
+      {"dumpavail",&DumpAvail, nullptr},
+      {"unmet",&UnMet, nullptr},
+      {"search",&DoSearch, _("Search the package list for a regex pattern")},
+      {"depends",&Depends, _("Show raw dependency information for a package")},
+      {"rdepends",&RDepends, _("Show reverse dependency information for a package")},
+      {"dotty",&Dotty, nullptr},
+      {"xvcg",&XVcg, nullptr},
+      {"show",&ShowPackage, _("Show a readable record for the package")},
+      {"pkgnames",&ShowPkgNames, _("List the names of all packages in the system")},
+      {"showauto",&ShowAuto, nullptr},
+      {"policy",&Policy, _("Show policy settings")},
+      {"madison",&Madison, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt-cache", CommandLine::GetCommand(Cmds, argc, argv));
 
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index dcc784746..1838a76fe 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -203,25 +203,30 @@ static bool DoIdent(CommandLine &)
 }
 									/*}}}*/
 // ShowHelp - Show the help screen					/*{{{*/
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
    if (_config->FindB("version") == true)
       return true;
-   
-   cout << 
-      "Usage: apt-cdrom [options] command\n"
+
+   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"
-      "and /etc/fstab.\n"
-      "\n"
-      "Commands:\n"
-      "   add - Add a CDROM\n"
-      "   ident - Report the identity of a CDROM\n"
-      "\n"
-      "Options:\n"
+      "CDROM mount point and device information is taken from apt.conf,\n"
+      "udev and /etc/fstab.\n")
+      << std::endl
+      << _("Commands:") << std::endl;
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   std::cout << std::endl <<
+      _("Options:\n"
       "  -h   This help text\n"
       "  -d   CD-ROM mount point\n"
       "  -r   Rename a recognized CD-ROM\n"
@@ -231,17 +236,17 @@ static bool ShowHelp(CommandLine &)
       "  --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";
+      "See fstab(5)\n");
    return true;
 }
 									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {
-      {"add",&DoAdd},
-      {"ident",&DoIdent},
-      {"help",&ShowHelp},
-      {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"add", &DoAdd, "Add a CDROM"},
+      {"ident", &DoIdent, "Report the identity of a CDROM"},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt-cdrom", CommandLine::GetCommand(Cmds, argc, argv));
 
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 4479b84a7..e0383e019 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -78,34 +78,40 @@ static bool DoDump(CommandLine &CmdL)
 // ShowHelp - Show the help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
    if (_config->FindB("version") == true)
       return true;
 
-   cout <<
-    _("Usage: apt-config [options] command\n"
+   std::cout <<
+      _("Usage: apt-config [options] command\n"
       "\n"
-      "apt-config is a simple tool to read the APT config file\n"
-      "\n"
-      "Commands:\n"
-      "   shell - Shell mode\n"
-      "   dump - Show the configuration\n"
-      "\n"
-      "Options:\n"
-      "  -h   This help text.\n" 
-      "  -c=? Read this configuration file\n" 
+      "apt-config is a simple tool to read the APT config file\n")
+      << std::endl
+      << _("Commands:") << std::endl;
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   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");
    return true;
 }
 									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"shell",&DoShell},
-                                   {"dump",&DoDump},
-				   {"help",&ShowHelp},
-                                   {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"shell", &DoShell, _("get configuration values via shell evaluation")},
+      {"dump", &DoDump, _("show the active configuration setting")},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt-config", CommandLine::GetCommand(Cmds, argc, argv));
 
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 3e4f89286..cd52cfe33 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -217,7 +217,7 @@ bool DebFile::ParseInfo()
 // ShowHelp - show a short help text					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *)
 {
 	ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
@@ -357,7 +357,7 @@ int main(int argc, const char **argv)					/*{{{*/
 	textdomain(PACKAGE);
 
 	// Parse the command line and initialize the package library
-	CommandLine::Dispatch Cmds[] = {{NULL, NULL}};
+	CommandLine::DispatchWithHelp Cmds[] = {{nullptr, nullptr, nullptr}};
 	CommandLine CmdL;
 	ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
 
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index cef7d8c14..be5bc0851 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1536,7 +1536,7 @@ static bool DoIndexTargets(CommandLine &CmdL)
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
@@ -1581,34 +1581,26 @@ static bool ShowHelp(CommandLine &)
       
       return true;
    }
-   
-   cout << 
+
+   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"   
-      "\n"
-      "Commands:\n"
-      "   update - Retrieve new lists of packages\n"
-      "   upgrade - Perform an upgrade\n"
-      "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-      "   remove - Remove packages\n"
-      "   autoremove - Remove automatically all unused packages\n"
-      "   purge - Remove packages and config files\n"
-      "   source - Download source archives\n"
-      "   build-dep - Configure build-dependencies for source packages\n"
-      "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-      "   dselect-upgrade - Follow dselect selections\n"
-      "   clean - Erase downloaded archive files\n"
-      "   autoclean - Erase old downloaded archive files\n"
-      "   check - Verify that there are no broken dependencies\n"
-      "   changelog - Download and display the changelog for the given package\n"
-      "   download - Download the binary package into the current directory\n"
-      "\n"
-      "Options:\n"
+      "and install.\n")
+      << std::endl
+      << _("Commands:") << std::endl;
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   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"
@@ -1630,30 +1622,31 @@ static bool ShowHelp(CommandLine &)
 									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate},
-                                   {"upgrade",&DoUpgrade},
-                                   {"install",&DoInstall},
-                                   {"remove",&DoInstall},
-                                   {"purge",&DoInstall},
-				   {"autoremove",&DoInstall},
-				   {"auto-remove",&DoInstall},
-				   {"markauto",&DoMarkAuto},
-				   {"unmarkauto",&DoMarkAuto},
-                                   {"dist-upgrade",&DoDistUpgrade},
-                                   {"full-upgrade",&DoDistUpgrade},
-                                   {"dselect-upgrade",&DoDSelectUpgrade},
-				   {"build-dep",&DoBuildDep},
-                                   {"clean",&DoClean},
-                                   {"autoclean",&DoAutoClean},
-                                   {"auto-clean",&DoAutoClean},
-                                   {"check",&DoCheck},
-				   {"source",&DoSource},
-                                   {"download",&DoDownload},
-                                   {"changelog",&DoChangelog},
-				   {"indextargets",&DoIndexTargets},
-				   {"moo",&DoMoo},
-				   {"help",&ShowHelp},
-                                   {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"update", &DoUpdate, _("Retrieve new lists of packages")},
+      {"upgrade", &DoUpgrade, _("Perform an upgrade")},
+      {"install", &DoInstall, _("Install new packages (pkg is libc6 not libc6.deb)")},
+      {"remove", &DoInstall, _("Remove packages")},
+      {"purge", &DoInstall, _("Remove packages and config files")},
+      {"autoremove", &DoInstall, _("Remove automatically all unused packages")},
+      {"auto-remove", &DoInstall, nullptr},
+      {"markauto", &DoMarkAuto, nullptr},
+      {"unmarkauto", &DoMarkAuto, nullptr},
+      {"dist-upgrade", &DoDistUpgrade, _("Distribution upgrade, see apt-get(8)")},
+      {"full-upgrade", &DoDistUpgrade, nullptr},
+      {"dselect-upgrade", &DoDSelectUpgrade, _("Follow dselect selections")},
+      {"build-dep", &DoBuildDep, _("Configure build-dependencies for source packages")},
+      {"clean", &DoClean, _("Erase downloaded archive files")},
+      {"autoclean", &DoAutoClean, _("Erase old downloaded archive files")},
+      {"auto-clean", &DoAutoClean, nullptr},
+      {"check", &DoCheck, _("Verify that there are no broken dependencies")},
+      {"source", &DoSource, _("Download source archives")},
+      {"download", &DoDownload, _("Download the binary package into the current directory")},
+      {"changelog", &DoChangelog, _("Download and display the changelog for the given package")},
+      {"indextargets", &DoIndexTargets, nullptr},
+      {"moo", &DoMoo, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt-get", CommandLine::GetCommand(Cmds, argc, argv));
 
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index dc4efb32b..3df858813 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -106,7 +106,7 @@ static bool DoSrvLookup(CommandLine &CmdL)
    return true;
 }
 
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const  * Cmds)
 {
    ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
@@ -117,28 +117,34 @@ static bool ShowHelp(CommandLine &)
     _("Usage: apt-helper [options] command\n"
       "       apt-helper [options] download-file uri target-path\n"
       "\n"
-      "apt-helper is a internal helper for apt\n"
-      "\n"
-      "Commands:\n"
-      "   download-file - download the given uri to the target-path\n"
-      "   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-      "   auto-detect-proxy - detect proxy using apt.conf\n"
-      "\n"
-      "                       This APT helper has Super Meep Powers.\n");
+      "apt-helper is a internal helper for apt\n")
+    << std::endl
+    << _("Commands:") << std::endl;
+
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   std::cout << std::endl <<
+      _("This APT helper has Super Meep Powers.") << std::endl;
    return true;
 }
 
 
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
-				   {"download-file", &DoDownloadFile},
-				   {"srv-lookup", &DoSrvLookup},
-				   {"auto-detect-proxy", &DoAutoDetectProxy},
-                                   {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"download-file", &DoDownloadFile, _("download the given uri to the target-path")},
+      {"srv-lookup", &DoSrvLookup, _("lookup a SRV record (e.g. _http._tcp.ftp.debian.org)")},
+      {"auto-detect-proxy", &DoAutoDetectProxy, _("detect proxy using apt.conf")},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs(
-      "apt-download", CommandLine::GetCommand(Cmds, argc, argv));
+      "apt-helper", CommandLine::GetCommand(Cmds, argc, argv));
 
    // Set up gettext support
    setlocale(LC_ALL,"");
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 258b42ccb..fbcbf07e9 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -43,7 +43,7 @@
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-static bool ShowHelp(CommandLine &) {
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *) {
 	ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
 	std::cout <<
@@ -81,7 +81,7 @@ int main(int argc,const char *argv[])					/*{{{*/
         DropPrivileges();
 
 	CommandLine CmdL;
-	ParseCommandLine(CmdL, NULL, Args, &_config, NULL, argc, argv, ShowHelp);
+	ParseCommandLine(CmdL, nullptr, Args, &_config, NULL, argc, argv, ShowHelp);
 
 	if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
 	{
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 6080c7ea3..361d4e553 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -280,28 +280,27 @@ static bool ShowSelection(CommandLine &CmdL)				/*{{{*/
 }
 									/*}}}*/
 // ShowHelp - Show a help screen					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
-   cout <<
+   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"
-      "\n"
-      "Commands:\n"
-      "   auto - Mark the given packages as automatically installed\n"
-      "   manual - Mark the given packages as manually installed\n"
-      "   hold - Mark a package as held back\n"
-      "   unhold - Unset a package set as held back\n"
-      "   showauto - Print the list of automatically installed packages\n"
-      "   showmanual - Print the list of manually installed packages\n"
-      "   showhold - Print the list of package on hold\n"
-      "\n"
-      "Options:\n"
+      "as manually or automatically installed. It can also list marks.\n")
+    << std::endl
+    << _("Commands:") << std::endl;
+
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "   " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   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"
@@ -316,26 +315,27 @@ static bool ShowHelp(CommandLine &)
 									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
-				   {"auto",&DoAuto},
-				   {"manual",&DoAuto},
-				   {"hold",&DoSelection},
-				   {"unhold",&DoSelection},
-				   {"install",&DoSelection},
-				   {"remove",&DoSelection}, // dpkg uses deinstall, but we use remove everywhere else
-				   {"deinstall",&DoSelection},
-				   {"purge",&DoSelection},
-				   {"showauto",&ShowAuto},
-				   {"showmanual",&ShowAuto},
-				   {"showhold",&ShowSelection}, {"showholds",&ShowSelection},
-				   {"showinstall",&ShowSelection}, {"showinstalls",&ShowSelection},
-				   {"showdeinstall",&ShowSelection}, {"showdeinstalls",&ShowSelection},
-				   {"showremove",&ShowSelection}, {"showremoves",&ShowSelection},
-				   {"showpurge",&ShowSelection}, {"showpurges",&ShowSelection},
-				   // obsolete commands for compatibility
-				   {"markauto", &DoMarkAuto},
-				   {"unmarkauto", &DoMarkAuto},
-                                   {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"auto",&DoAuto, _("Mark the given packages as automatically installed")},
+      {"manual",&DoAuto, _("Mark the given packages as manually installed")},
+      {"hold",&DoSelection, _("Mark a package as held back")},
+      {"unhold",&DoSelection, _("Unset a package set as held back")},
+      {"install",&DoSelection, nullptr},
+      {"remove",&DoSelection, nullptr}, // dpkg uses deinstall, but we use remove everywhere else
+      {"deinstall",&DoSelection, nullptr},
+      {"purge",&DoSelection, nullptr},
+      {"showauto",&ShowAuto, _("Print the list of automatically installed packages")},
+      {"showmanual",&ShowAuto, _("Print the list of manually installed packages")},
+      {"showhold",&ShowSelection, _("Print the list of package on hold")}, {"showholds",&ShowSelection, nullptr},
+      {"showinstall",&ShowSelection, nullptr}, {"showinstalls",&ShowSelection, nullptr},
+      {"showdeinstall",&ShowSelection, nullptr}, {"showdeinstalls",&ShowSelection, nullptr},
+      {"showremove",&ShowSelection, nullptr}, {"showremoves",&ShowSelection, nullptr},
+      {"showpurge",&ShowSelection, nullptr}, {"showpurges",&ShowSelection, nullptr},
+      // obsolete commands for compatibility
+      {"markauto", &DoMarkAuto, nullptr},
+      {"unmarkauto", &DoMarkAuto, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt-mark", CommandLine::GetCommand(Cmds, argc, argv));
 
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index cde3069bd..e3d520a96 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -134,7 +134,7 @@ static bool DoIt(string InFile)
 // ShowHelp - Show the help text					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *)
 {
    ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
    if (_config->FindB("version") == true)
@@ -170,7 +170,7 @@ int main(int argc,const char *argv[])					/*{{{*/
    textdomain(PACKAGE);
 
    // Parse the command line and initialize the package library
-   CommandLine::Dispatch Cmds[] = {{NULL, NULL}};
+   CommandLine::DispatchWithHelp Cmds[] = {{nullptr, nullptr, nullptr}};
    CommandLine CmdL;
    ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
 
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index efc263a5d..53735356d 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -37,64 +37,53 @@
 #include <apti18n.h>
 									/*}}}*/
 
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(c1out, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
    // FIXME: generate from CommandLine
-   c1out << 
+   c1out <<
     _("Usage: apt [options] command\n"
       "\n"
-      "CLI for apt.\n"
-      "Basic commands: \n"
-      " list - list packages based on package names\n"
-      " search - search in package descriptions\n"
-      " show - show package details\n"
-      "\n"
-      " update - update list of available packages\n"
-      "\n"
-      " install - install packages\n"
-      " remove  - remove packages\n"
-      " autoremove - Remove automatically all unused packages\n"
-      "\n"
-      " upgrade - upgrade the system by installing/upgrading packages\n"
-      " full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
-      "\n"
-      " edit-sources - edit the source information file\n"
-       );
-   
+      "CLI for apt.\n")
+    << std::endl
+    << _("Commands:") << std::endl;
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
    return true;
 }
 
 int main(int argc, const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {
-                                   // query
-                                   {"list",&DoList},
-                                   {"search", &DoSearch},
-                                   {"show", &ShowPackage},
-
-                                   // package stuff
-                                   {"install",&DoInstall},
-                                   {"remove", &DoInstall},
-                                   {"autoremove", &DoInstall},
-                                   {"auto-remove", &DoInstall},
-                                   {"purge", &DoInstall},
-
-                                   // system wide stuff
-                                   {"update",&DoUpdate},
-                                   {"upgrade",&DoUpgrade},
-                                   {"full-upgrade",&DoDistUpgrade},
-                                   // for compat with muscle memory
-                                   {"dist-upgrade",&DoDistUpgrade},
-
-                                   // misc
-                                   {"edit-sources",&EditSources},
-
-                                   // helper
-                                   {"moo",&DoMoo},
-                                   {"help",&ShowHelp},
-                                   {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      // query
+      {"list", &DoList, _("list packages based on package names")},
+      {"search", &DoSearch, _("search in package descriptions")},
+      {"show", &ShowPackage, _("show package details")},
+
+      // package stuff
+      {"install", &DoInstall, _("install packages")},
+      {"remove", &DoInstall, _("remove packages")},
+      {"autoremove", &DoInstall, _("Remove automatically all unused packages")},
+      {"auto-remove", &DoInstall, nullptr},
+      {"purge", &DoInstall, nullptr},
+
+      // system wide stuff
+      {"update", &DoUpdate, _("update list of available packages")},
+      {"upgrade", &DoUpgrade, _("upgrade the system by installing/upgrading packages")},
+      {"full-upgrade", &DoDistUpgrade, _("upgrade the system by removing/installing/upgrading packages")},
+      {"dist-upgrade", &DoDistUpgrade, nullptr}, // for compat with muscle memory
+
+      // misc
+      {"edit-sources", &EditSources, _("edit the source information file")},
+      {"moo", &DoMoo, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 30e24eebd..c308771f2 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -526,170 +526,180 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more "
-"low-level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, "
-"<option>--upgradeable</option>, <option>--all-versions</option> are "
-"supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
-msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:1 apt.8.xml:1 apt.8.xml:1 apt.8.xml:1 apt.8.xml:1
+msgid "(&apt-get;)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1 apt-get.8.xml:1
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for "
-"install. Alternatively a specific distribution can be selected by following "
-"the package name with a slash and the version of the distribution or the "
-"Archive name (stable, testing, unstable)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1 apt-get.8.xml:1
+#: apt.8.xml:1
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-get.8.xml:1
-msgid "(and the"
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-get.8.xml:1
-msgid "alias since 1.1)"
+#: apt.8.xml:1 apt.8.xml:1
+msgid ","
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1 apt-get.8.xml:1
+#: apt.8.xml:1
 msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename "
+"(&stable-codename;, &testing-codename;, sid …) or suite name (stable, "
+"testing, unstable). This will also select versions from this release for "
+"dependencies of this package if needed to satisfy the request."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using "
+"&apt-mark;. Packages which you have installed explicitly via "
+"<command>install</command> are never proposed for automatic removal as well."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-mark.8.xml:1
-#: apt-config.8.xml:1 apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1
-#: apt-ftparchive.1.xml:1
-msgid "options"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:1 apt.8.xml:1
+msgid "(&apt-cache;)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
-msgid "Script usage"
+msgid ""
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1
-msgid "Differences to &apt-get;"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:1 apt.8.xml:1
+msgid "(work-in-progress)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"<option>list</option> is somewhat similar to <command>dpkg-query "
+"--list</command> in that it can display a list of packages satisfying "
+"certain criteria.  It supports &glob; patterns for matching package names as "
+"well as options to list installed (<option>--installed</option>), "
+"upgradeable (<option>--upgradeable</option>) or all available "
+"(<option>--all-versions</option>) versions."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:1
-msgid "The option <literal>APT::Color</literal> is enabled."
+msgid "Script usage and Differences to other APT tools"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -820,6 +830,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for "
+"install. Alternatively a specific distribution can be selected by following "
+"the package name with a slash and the version of the distribution or the "
+"Archive name (stable, testing, unstable)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -858,6 +879,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -946,6 +977,16 @@ msgid ""
 "<filename>&cachedir;/archives/partial/</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:1 apt-get.8.xml:1
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:1 apt-get.8.xml:1
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
@@ -961,6 +1002,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
 "<literal>changelog</literal> tries to download the changelog of a package "
 "and displays it through <command>sensible-pager</command>.  By default it "
 "displays the changelog for the version that is installed.  However, you can "
@@ -982,6 +1031,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml:1 apt-cache.8.xml:1 apt-config.8.xml:1
+#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+msgid "options"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
@@ -1843,6 +1898,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:1
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:1
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
@@ -1869,8 +1932,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:1
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of "
+"keys. Note that there are <emphasis>no</emphasis> checks performed, so it is "
+"easy to completely undermine the &apt-secure; infrastructure if used without "
+"care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1894,7 +1960,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:1 apt-cdrom.8.xml:1
+#: apt-key.8.xml:1 apt-mark.8.xml:1 apt-mark.8.xml:1 apt-cdrom.8.xml:1
 msgid "Options"
 msgstr ""
 
@@ -1953,14 +2019,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml:1
-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:1
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being "
+"automatically/manually installed or changing <command>dpkg</command> "
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or "
+"<command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml:1
+msgid "Automatically and manually installed packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1968,9 +2043,11 @@ msgstr ""
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or "
+"<command>aptitude</command> will at least suggest removing them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1992,35 +2069,46 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:1
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg "
-"--set-selections</command> and the state is therefore maintained by &dpkg; "
-"and not affected by the <option>--file</option> option."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:1
 msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:1
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml:1
+msgid "Prevent changes for a package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:1
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line.  All automatically "
-"installed packages will be listed if no package is given.  If packages are "
-"given only those which are automatically installed will be shown."
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:1
 msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2030,13 +2118,22 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml:1
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:1
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, "
+"<option>remove</option> (also known as <option>deinstall</option>) and "
+"<option>purge</option> commands.  Packages with a specific selection can be "
+"displayed with <option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2054,38 +2151,49 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to "
+"<literal>false</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml:1
+msgid ""
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1
-msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2105,12 +2213,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following "
+"pre-established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2163,10 +2272,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a "
-"per-package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2178,9 +2287,18 @@ msgstr ""
 #: apt-secure.8.xml:1
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml:1
+msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2227,7 +2345,20 @@ msgstr ""
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml:1
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and "
+"key</emphasis>.  If your users can't acquire your key securily the chain of "
+"trust described above is broken.  How you can help users add your key "
+"depends on your archive and target audience ranging from having your keyring "
+"package included in another archive users already have configured (like the "
+"default repositories of their distribution) to leverage the web of trust."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2249,7 +2380,7 @@ msgstr ""
 #: apt-secure.8.xml:1
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink "
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
@@ -2536,6 +2667,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:1
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -3372,6 +3510,40 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:1
+msgid "Binary specific configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the "
+"<option>Binary::<replaceable>specific-binary</replaceable></option> "
+"scope. Setting the option <option>APT::Get::Show-Versions</option> for the "
+"<command>apt</command> only can e.g. by done by setting "
+"<option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:1
 msgid "Directories"
 msgstr ""
 
@@ -5371,6 +5543,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:1
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
diff --git a/doc/po/de.po b/doc/po/de.po
index 20afe56d4..b8d848781 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -644,66 +644,106 @@ msgstr "Beschreibung"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
-"<command>apt</command> (Advanced Package Tool) ist das Befehlszeilenwerkzeug "
-"für den Umgang mit Paketen. Es stellt eine Befehlszeilenschnittstelle zur "
-"Verwaltung von Paketen auf dem System bereit. Tiefer ansetzende "
-"Befehlsoptionen finden sie unter &apt-get; und &apt-cache;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
-"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
-"folgenden Optionen werden unterstützt: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
-"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
-"passende Pakete an."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
+msgstr ""
+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
-"Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> wird ergänzt mit einem oder mehreren Paketnamen, "
-"von denen eine Installation oder ein Upgrade gewünscht wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
 "einem Gleichheitszeichen und der Version des Paketes zur Installation "
@@ -714,36 +754,29 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
-"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
-"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
-"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
 "automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
@@ -752,64 +785,99 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
-"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
-"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
-"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit "
-"ihren Quellen in Einklang zu bringen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
-"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
-"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
-"neue Pakete installiert, existierende jedoch nicht entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+#, fuzzy
+#| msgid ""
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
-"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
-"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
-"Paketkonflikts nötig ist."
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "Optionen"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Skriptaufruf"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 "Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann bei "
 "Versionswechseln die Ausgabe ändern. Obwohl es versucht, nicht die "
@@ -818,49 +886,15 @@ msgstr ""
 "Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
 "Skripten."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Unterschiede zu &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
-"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
-"get;. Daher unterscheiden sich einige Optionen:"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg "
-"--list</literal> ähnlich."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr ""
-"Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--with-"
-"new-pkgs</literal> aktiviert."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1049,6 +1083,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
+"einem Gleichheitszeichen und der Version des Paketes zur Installation "
+"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
+"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
+"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
+"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) "
+"ausgewählt werden."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1108,6 +1160,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
+"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
+"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
+"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
+"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1241,6 +1308,16 @@ msgstr ""
 "<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/"
 "partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1263,6 +1340,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
+"automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
+"erfüllen und die nicht mehr benötigt werden."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1304,6 +1392,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "Optionen"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2594,6 +2688,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
@@ -2621,11 +2723,11 @@ msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie den "
-"öffentlichen Schlüssel herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2660,7 +2762,7 @@ msgstr ""
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Optionen"
 
@@ -2730,28 +2832,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"
 msgstr ""
-"ein Paket als automatisch installiert markieren oder diese Markierung "
-"entfernen"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> wird ändern, ob ein Paket als automatisch "
-"installiert markiert ist."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Wenn Sie die Installation eines Paketes anfordern und andere Pakete "
 "installiert werden, um dessen Abhängigkeiten zu erfüllen, werden die "
@@ -2785,31 +2901,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
-"markieren, was verhindert, dass das Paket automatisch installiert, ein "
-"Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
-"Wrapper um <command>dpkg --set-selections</command> und der Status wird "
-"daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
-"option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
-"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2832,6 +2923,48 @@ msgstr ""
 "<literal>showauto</literal> benutzt werden, mit der Ausnahme, dass es "
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+"schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
+"&synopsis-param-filename;, anstatt vom Standardort, der "
+"<filename>extended_status</filename> im von Konfigurationselement "
+"<literal>Dir::State</literal> definierten Verzeichnis, ist."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> wird benutzt, um ein Paket als manuell installiert "
+"zu markieren, was verhindert, dass das Paket automatisch entfernt wird, wenn "
+"kein anderes Paket von ihm abhängt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
+"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2841,18 +2974,23 @@ msgstr ""
 "<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
-"schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
-"&synopsis-param-filename;, anstatt vom Standardort, der "
-"<filename>extended_status</filename> im von Konfigurationselement "
-"<literal>Dir::State</literal> definierten Verzeichnis, ist."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2870,11 +3008,17 @@ msgstr "Archivauthentifizierungsunterstützung für APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "Beginnend mit Version 0.6 enthält <command>apt</command> Code, der die "
 "Signatur der Release-Datei für alle Archive prüft. Dies stellt sicher, dass "
@@ -2884,37 +3028,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
 msgstr ""
-"Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
-"Signatur, für das APT keinen Schlüssel hat, wird dieses Paket als nicht "
-"vertrauenswürdig angesehen und es zu installieren, führt zu einer großen "
-"Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten "
-"Archiven warnen, zukünftige Releases könnten die Prüfung aller Quellen vor "
-"dem Herunterladen von Paketen von dort erzwingen."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "Die Paketoberflächen &apt-get;, &aptitude; und &synaptic; unterstützen diese "
 "neue Authentifizierungsfunktion."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Vertrauenswürdige Archive"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2944,13 +3107,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues "
 "Paket oder eine neue Version eines Pakets in das Debian-Archiv hochlädt. "
@@ -3033,11 +3205,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "Es schützt jedoch nicht gegen eine Kompromittierung des Haupt-Debian-Servers "
 "selbst (der die Pakete signiert) oder gegen eine Kompromittierung des "
@@ -3051,11 +3229,17 @@ msgstr "Benutzerkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> ist das Programm, das die Liste der von APT "
 "verwendeten Schlüssel verwaltet. Es kann benutzt werden, um Schlüssel "
@@ -3066,6 +3250,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3119,15 +3312,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit "
 "Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die "
 "Dateien im Archiv zu authentifizieren."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3150,9 +3361,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3543,6 +3762,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4831,6 +5057,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Benutzerkonfiguration"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "Verzeichnisse"
 
@@ -5756,8 +6017,7 @@ msgstr ""
 "literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Beispiele"
 
@@ -7655,6 +7915,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -10861,6 +11137,129 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) ist das "
+#~ "Befehlszeilenwerkzeug für den Umgang mit Paketen. Es stellt eine "
+#~ "Befehlszeilenschnittstelle zur Verwaltung von Paketen auf dem System "
+#~ "bereit. Tiefer ansetzende Befehlsoptionen finden sie unter &apt-get; und "
+#~ "&apt-cache;."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+#~ "passende Pakete an."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+#~ "Pakete."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> wird ergänzt mit einem oder mehreren "
+#~ "Paketnamen, von denen eine Installation oder ein Upgrade gewünscht wird."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> wird benutzt, um die Paketindexdateien wieder "
+#~ "mit ihren Quellen in Einklang zu bringen."
+
+#~ msgid "Script usage"
+#~ msgstr "Skriptaufruf"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Unterschiede zu &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+#~ "Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+#~ "get;. Daher unterscheiden sich einige Optionen:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist "
+#~ "<literal>dpkg --list</literal> ähnlich."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--"
+#~ "with-new-pkgs</literal> aktiviert."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie "
+#~ "den öffentlichen Schlüssel herunterladen."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "ein Paket als automatisch installiert markieren oder diese Markierung "
+#~ "entfernen"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> wird ändern, ob ein Paket als automatisch "
+#~ "installiert markiert ist."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
+#~ "markieren, was verhindert, dass das Paket automatisch installiert, ein "
+#~ "Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
+#~ "Wrapper um <command>dpkg --set-selections</command> und der Status wird "
+#~ "daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
+#~ "option>."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
+#~ "Signatur, für das APT keinen Schlüssel hat, wird dieses Paket als nicht "
+#~ "vertrauenswürdig angesehen und es zu installieren, führt zu einer großen "
+#~ "Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten "
+#~ "Archiven warnen, zukünftige Releases könnten die Prüfung aller Quellen "
+#~ "vor dem Herunterladen von Paketen von dort erzwingen."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/es.po b/doc/po/es.po
index 4a2bb4fd4..8dbfecd58 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -728,56 +728,88 @@ msgstr "Descripción"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "Puede seleccionar una versión especifica de un paquete poniendo a "
 "continuación del nombre del paquete un símbolo igual («=») seguido de la "
@@ -788,37 +820,29 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
-"literal> con la diferencia de que elimina los paquetes en vez de "
-"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de "
-"configuración permanecen en el sistema. Si un signo de suma precede al "
-"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
-"en cuestión será instalado en vez de eliminado."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> desinstala paquetes que se instalaron "
 "automáticamente para satisfacer las dependencias de otros paquetes pero que "
@@ -827,104 +851,86 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
 #, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
-msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
-msgstr ""
-"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
-"de la misma forma que las otras órdenes «show»."
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "Opciones"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid "Script usage"
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Differences to &apt-get;"
+msgid "Script usage and Differences to other APT tools"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "La línea <literal>Package:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "La línea <literal>Component:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
@@ -1128,6 +1134,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Puede seleccionar una versión especifica de un paquete poniendo a "
+"continuación del nombre del paquete un símbolo igual («=») seguido de la "
+"versión deseada. Esto provocará que se localice y seleccione esa versión "
+"para su instalación. Alternativamente se puede seleccionar una distribución "
+"específica poniendo a continuación del nombre del paquete una barra («/») "
+"seguida de la versión de la distribución o su nombre en el archivo de Debian "
+"(stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1186,6 +1210,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
+"literal> con la diferencia de que elimina los paquetes en vez de "
+"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de "
+"configuración permanecen en el sistema. Si un signo de suma precede al "
+"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
+"en cuestión será instalado en vez de eliminado."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1328,6 +1368,16 @@ msgstr ""
 "no usa dselect es probable que desee ejecutar <literal>apt-get clean</"
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1349,6 +1399,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> desinstala paquetes que se instalaron "
+"automáticamente para satisfacer las dependencias de otros paquetes pero que "
+"ya no son necesarios."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1391,6 +1452,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "Opciones"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2693,6 +2760,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "Elimina una clave de la lista de claves de confianza."
 
@@ -2719,11 +2794,11 @@ msgstr "Lista las huellas digitales de las claves de confianza."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"Proporciona opciones avanzadas a gpg. Puede descargar la clave pública con "
-"«adv --recv-key»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2758,7 +2833,7 @@ msgstr ""
 "de APT para Ubuntu sí es compatible."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opciones"
 
@@ -2827,26 +2902,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "Marca o desmarca un paquete como instalado automáticamente"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> conmuta si un paquete se instaló automáticamente "
-"o no."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Cuando solicita la instalación de un paquete y como resultado de ello se "
 "instalan otros paquetes para satisfacer sus dependencias, éstos se marcarán "
@@ -2880,30 +2971,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> sirve para marcar un paquete para su retención, "
-"impidiendo que el paquete se instale, actualice o elimine de forma "
-"automática. La orden es una interfaz para <command>dpkg --set-selections</"
-"command>, por lo que &dpkg; preserva el estado sin que la opción <option>--"
-"file</option> tenga efecto sobre él."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> sirve para permitir cualquier acción habitual "
-"sobre un paquete previamente marcado con «hold»."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2925,16 +2992,7 @@ msgstr ""
 "<literal>showauto</literal>, a excepción de que muestra una lista de "
 "paquetes manualmente instalados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
-"de la misma forma que las otras órdenes «show»."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
@@ -2948,6 +3006,62 @@ msgstr ""
 "directorio definido con la opción de configuración: <literal>Dir::State</"
 "literal>."
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> sirve para marcar un paquete como instalado "
+"manualmente, impidiendo la eliminación automática de este paquete si ningún "
+"otro depende de él."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> sirve para permitir cualquier acción habitual "
+"sobre un paquete previamente marcado con «hold»."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
+"de la misma forma que las otras órdenes «show»."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml
+msgid ""
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2964,11 +3078,17 @@ msgstr "Compatibilidad con la autenticación en el archivo para APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "Desde la versión 0.6, <command>apt</command> contiene el código que realiza "
 "la comprobación de la firma del fichero «Release» para todos los archivos. "
@@ -2978,37 +3098,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
 msgstr ""
-"Si el paquete viene de un archivo sin una firma o con una firma de la que "
-"apt no tiene su clave, el paquete se considerará no fiable y su instalación "
-"provocará un aviso importante. <command>apt-get</command> actualmente sólo "
-"avisa de los archivos sin firmar, puede que las próximas versiones  fuercen "
-"una comprobación de todas las fuentes antes de descargar paquetes desde "
-"ellas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "Las interfaces de gestión de paquetes &apt-get;, &aptitude; y &synaptic; "
 "pueden usar esta nueva funcionalidad de autenticación."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Archivos de confianza"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -3037,13 +3176,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "La cadena de confianza de Debian comienza cuando un mantenedor sube un nuevo "
 "paquete o una nueva versión de un paquete al archivo de Debian. Para que la "
@@ -3127,11 +3275,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "Sin embargo, esto no protege de un servidor maestro de Debian (que firma los "
 "paquetes) comprometido o contra una clave usada para firmar los ficheros "
@@ -3145,11 +3299,17 @@ msgstr "Configuración de usuario"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> es el programa que gestiona la lista de claves "
 "usadas por apt. Se puede usar para añadir o eliminar claves, aunque la "
@@ -3160,6 +3320,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3212,15 +3381,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>Publicar la huella digital de la clave</emphasis>, de modo que los "
 "usuarios conozcan qué clave necesitan importar para autenticar los ficheros "
 "del archivo."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3243,9 +3430,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3641,6 +3836,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4897,6 +5099,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuración de usuario"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "Directorios"
 
@@ -5812,8 +6049,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Ejemplos"
 
@@ -7704,6 +7940,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -10865,6 +11117,90 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#, fuzzy
+#~| msgid ""
+#~| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#~| "package has."
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>rdepends</literal> muestra las dependencias inversas de un "
+#~ "paquete."
+
+#, fuzzy
+#~| msgid ""
+#~| "<literal>showhold</literal> is used to print a list of packages on hold "
+#~| "in the same way as for the other show commands."
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>showhold</literal> muestra una lista de paquetes retenidos "
+#~ "(«hold») de la misma forma que las otras órdenes «show»."
+
+#, fuzzy
+#~| msgid "the <literal>Package:</literal> line"
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "La línea <literal>Package:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Component:</literal> line"
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "La línea <literal>Component:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Proporciona opciones avanzadas a gpg. Puede descargar la clave pública "
+#~ "con «adv --recv-key»."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "Marca o desmarca un paquete como instalado automáticamente"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> conmuta si un paquete se instaló "
+#~ "automáticamente o no."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> sirve para marcar un paquete para su retención, "
+#~ "impidiendo que el paquete se instale, actualice o elimine de forma "
+#~ "automática. La orden es una interfaz para <command>dpkg --set-selections</"
+#~ "command>, por lo que &dpkg; preserva el estado sin que la opción "
+#~ "<option>--file</option> tenga efecto sobre él."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Si el paquete viene de un archivo sin una firma o con una firma de la que "
+#~ "apt no tiene su clave, el paquete se considerará no fiable y su "
+#~ "instalación provocará un aviso importante. <command>apt-get</command> "
+#~ "actualmente sólo avisa de los archivos sin firmar, puede que las próximas "
+#~ "versiones  fuercen una comprobación de todas las fuentes antes de "
+#~ "descargar paquetes desde ellas."
+
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 4c6b6dde5..67b759120 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -640,65 +640,107 @@ msgstr "Description"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
-"<command>apt</command> (Advanced Package Tool) est un outil en ligne de "
-"commande pour gérer les paquets. Il fournit une interface en ligne de "
-"commande au système de gestion de paquets. Voir également &apt-get; et &apt-"
-"cache; pour davantage d'options en ligne de commande."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"La commande <literal>list</literal> est utilisée pour afficher une liste de "
-"paquets. Il gère les motifs du shell pour chercher les noms de paquets, "
-"ainsi que les options suivantes : <option>--installed</option>, <option>--"
-"upgradable</option>, <option>--all-versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
 msgstr ""
-"La commande <literal>search</literal> recherche le(s) terme(s) donnée(s) et "
-"affiche les paquets correspondants."
+"La commande <literal>upgrade</literal> permet d'installer les versions les "
+"plus récentes de tous les paquets présents sur le système en utilisant les "
+"sources énumérées dans <filename>/etc/apt/sources.list</filename>. De "
+"nouveaux paquets seront installés, mais les paquets installés ne seront "
+"jamais supprimés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"La commande <literal>full-upgrade</literal> remplit la même fonction que "
+"upgrade mais peut aussi supprimer des paquets installés si cela est "
+"nécessaire pour résoudre un conflit entre des paquets."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"La commande <literal>show</literal> affiche les informations sur le(s) "
-"paquet(s) donné(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"La commande <literal>install</literal> est suivie du nom de un ou plusieurs "
-"paquets dont l'installation ou la mise à jour est souhaitée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "On peut choisir d'installer une version particulière d'un paquet en faisant "
 "suivre son nom par un signe égal et par la version. Cette version sera "
@@ -708,37 +750,29 @@ msgstr ""
 "unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"La commande <literal>remove</literal> est identique à la commande "
-"<literal>install</literal>, les paquets étant alors supprimés et non "
-"installés. Veuillez noter que la suppression d'un paquet en laisse les "
-"fichiers de configuration sur le système. Quand un signe plus est accolé "
-"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
-"d'être supprimé."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
 "installés dans le but de satisfaire les dépendances d'autres paquets et qui "
@@ -747,65 +781,98 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
-"La commande <literal>edit-sources</literal> permet de modifier le fichier "
-"sources.list et fournit des vérifications de sécurité de base."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
-"La commande <literal>update</literal> permet de resynchroniser un fichier "
-"d'index répertoriant les paquets disponibles et sa source."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"La commande <literal>upgrade</literal> permet d'installer les versions les "
-"plus récentes de tous les paquets présents sur le système en utilisant les "
-"sources énumérées dans <filename>/etc/apt/sources.list</filename>. De "
-"nouveaux paquets seront installés, mais les paquets installés ne seront "
-"jamais supprimés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+#, fuzzy
+#| msgid ""
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
-"La commande <literal>full-upgrade</literal> remplit la même fonction que "
-"upgrade mais peut aussi supprimer des paquets installés si cela est "
-"nécessaire pour résoudre un conflit entre des paquets."
+"La commande <literal>list</literal> est utilisée pour afficher une liste de "
+"paquets. Il gère les motifs du shell pour chercher les noms de paquets, "
+"ainsi que les options suivantes : <option>--installed</option>, <option>--"
+"upgradable</option>, <option>--all-versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "options"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"La commande <literal>edit-sources</literal> permet de modifier le fichier "
+"sources.list et fournit des vérifications de sécurité de base."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Utilisation de scripts"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 "La ligne de commande de &apt; est conçue comme un outil pour l'utilisateur "
 "et les sorties peuvent varier selon ses versions. Bien qu'il s'efforce de ne "
@@ -814,49 +881,15 @@ msgstr ""
 "&apt-get; grâce aux options de APT. Il est conseillé d'utiliser ces "
 "commandes dans vos scripts."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Différences avec &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"La commande <command>apt</command> est sensée être agréable à l'utilisateur "
-"et ne pas avoir besoin de compatibilité ascendante comme &apt-get;. Par "
-"conséquent, certaines options sont différentes :"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "L'option <literal>DPkg::Progress-Fancy</literal> est activée."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "L'option <literal>APT::Color</literal> est activée."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Une nouvelle commande <literal>list</literal> est disponible, semblable à la "
-"commande <literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr ""
-"La commande <literal>upgrade</literal> a l'option <literal>--with-new-pkgs</"
-"literal> activée par défaut."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1045,6 +1078,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"On peut choisir d'installer une version particulière d'un paquet en faisant "
+"suivre son nom par un signe égal et par la version. Cette version sera "
+"recherchée et l'installation sera demandée. On peut aussi choisir une "
+"distribution particulière en faisant suivre le nom du paquet par une barre "
+"oblique et par le nom de la distribution ou de l'archive (stable, testing, "
+"unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1105,6 +1155,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"La commande <literal>remove</literal> est identique à la commande "
+"<literal>install</literal>, les paquets étant alors supprimés et non "
+"installés. Veuillez noter que la suppression d'un paquet en laisse les "
+"fichiers de configuration sur le système. Quand un signe plus est accolé "
+"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
+"d'être supprimé."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1236,6 +1302,16 @@ msgstr ""
 "dans <filename>&cachedir;/archives/</filename> et <filename>&cachedir;/"
 "archives/partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1257,6 +1333,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
+"installés dans le but de satisfaire les dépendances d'autres paquets et qui "
+"ne sont plus nécessaires."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1299,6 +1386,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "options"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2592,6 +2685,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "Supprimer une clé de la liste des clés fiables."
 
@@ -2618,11 +2719,11 @@ msgstr "Afficher les empreintes des clés fiables."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"Passer des options avancées à gpg. Avec la commande adv --recv-key, il est "
-"possible de télécharger une clé publique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2657,7 +2758,7 @@ msgstr ""
 "place. Par contre, la version d'Ubuntu permet de l'utiliser."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Options"
 
@@ -2724,26 +2825,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "Indiquer si un paquet a été installé automatiquement ou non"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"Avec la commande <command>apt-mark</command>, on peut indiquer si un paquet "
-"a été automatiquement installé ou pas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Lorsque l'installation d'un paquet est demandée et que par voie de "
 "dépendances d'autres paquets sont installés, ces paquets sont marqués comme "
@@ -2777,31 +2894,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> permet de marquer un paquet comme conservé, ce qui "
-"empêchera de l'installer, de le mettre à jour ou de le supprimer "
-"automatiquement. Cette commande est une simple envelopper à la commande "
-"<command>dpkg --set-selections</command>, l'état étant géré par &dpkg; et "
-"non affecté par l'option <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> est utilisé pour supprimer  l'état "
-"« hold » (conservé) d'un paquet afin de permettre toute action qui y est "
-"liée."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2824,6 +2916,49 @@ msgstr ""
 "<literal>showauto</literal> pour afficher la liste des paquets installés "
 "manuellement."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+"Lecture/écriture des statistiques d'un paquet dans &synopsis-param-filename; "
+"au lieu du fichier par défaut (<filename>extended_status</filename> dans le "
+"répertoire défini par l'élément de configuration <literal>Dir::State</"
+"literal>)."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> permet de marquer un paquet comme installé "
+"manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
+"aucun autre paquet n'en dépend."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> est utilisé pour supprimer  l'état "
+"« hold » (conservé) d'un paquet afin de permettre toute action qui y est "
+"liée."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2833,18 +2968,23 @@ msgstr ""
 "<literal>showhold</literal> permet d'afficher la liste des paquets conservés "
 "de manière analogue aux commandes de même type."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
-"Lecture/écriture des statistiques d'un paquet dans &synopsis-param-filename; "
-"au lieu du fichier par défaut (<filename>extended_status</filename> dans le "
-"répertoire défini par l'élément de configuration <literal>Dir::State</"
-"literal>)."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2862,11 +3002,17 @@ msgstr "Gestion de l'authentification d'archive avec APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "Depuis sa version 0.6, <command>apt</command> sait vérifier la signature du "
 "fichier Release de chaque archive. On s'assure ainsi que les paquets de "
@@ -2876,37 +3022,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
 msgstr ""
-"Quand un paquet provient d'une archive sans signature ou d'une archive avec "
-"une signature dont apt ne possède pas la clé, ce paquet n'est pas considéré "
-"comme fiable et son installation provoquera un avertissement. Pour "
-"l'instant, <command>apt-get</command> ne signale que les archives sans "
-"signature ; les prochaines versions pourraient rendre obligatoire la "
-"vérification des sources avant tout téléchargement de paquet."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "Les interfaces &apt-get;, &aptitude; et &synaptic; possèdent cette nouvelle "
 "fonction de certification."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Trusted archives"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2935,13 +3100,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "La chaîne de confiance dans Debian commence quand un responsable de paquet "
 "envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. "
@@ -3023,11 +3197,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "Cependant cette méthode ne protège pas contre une compromission du serveur "
 "Debian lui-même (qui signe les paquets) ni contre la compromission de la clé "
@@ -3041,11 +3221,17 @@ msgstr "Configuration utilisateur"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "Le programme qui gère la liste des clés utilisées par apt s'appelle "
 "<command>apt-key</command>. Il peut ajouter ou supprimer des clés. Cette "
@@ -3055,6 +3241,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3107,15 +3302,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>publier l'empreinte de la clé</emphasis>. Ainsi les utilisateurs "
 "de votre archive connaîtront la clé qu'ils doivent importer pour "
 "authentifier les fichiers de l'archive."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3137,9 +3350,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3532,6 +3753,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4819,6 +5047,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuration utilisateur"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "Les répertoires"
 
@@ -5742,8 +6005,7 @@ msgstr ""
 "Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Exemples"
 
@@ -7621,6 +7883,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -10817,6 +11095,125 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) est un outil en ligne de "
+#~ "commande pour gérer les paquets. Il fournit une interface en ligne de "
+#~ "commande au système de gestion de paquets. Voir également &apt-get; et "
+#~ "&apt-cache; pour davantage d'options en ligne de commande."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "La commande <literal>search</literal> recherche le(s) terme(s) donnée(s) "
+#~ "et affiche les paquets correspondants."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "La commande <literal>show</literal> affiche les informations sur le(s) "
+#~ "paquet(s) donné(s)."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "La commande <literal>install</literal> est suivie du nom de un ou "
+#~ "plusieurs paquets dont l'installation ou la mise à jour est souhaitée."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "La commande <literal>update</literal> permet de resynchroniser un fichier "
+#~ "d'index répertoriant les paquets disponibles et sa source."
+
+#~ msgid "Script usage"
+#~ msgstr "Utilisation de scripts"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Différences avec &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "La commande <command>apt</command> est sensée être agréable à "
+#~ "l'utilisateur et ne pas avoir besoin de compatibilité ascendante comme "
+#~ "&apt-get;. Par conséquent, certaines options sont différentes :"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "L'option <literal>DPkg::Progress-Fancy</literal> est activée."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "L'option <literal>APT::Color</literal> est activée."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Une nouvelle commande <literal>list</literal> est disponible, semblable à "
+#~ "la commande <literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "La commande <literal>upgrade</literal> a l'option <literal>--with-new-"
+#~ "pkgs</literal> activée par défaut."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passer des options avancées à gpg. Avec la commande adv --recv-key, il "
+#~ "est possible de télécharger une clé publique."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "Indiquer si un paquet a été installé automatiquement ou non"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "Avec la commande <command>apt-mark</command>, on peut indiquer si un "
+#~ "paquet a été automatiquement installé ou pas."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> permet de marquer un paquet comme conservé, ce "
+#~ "qui empêchera de l'installer, de le mettre à jour ou de le supprimer "
+#~ "automatiquement. Cette commande est une simple envelopper à la commande "
+#~ "<command>dpkg --set-selections</command>, l'état étant géré par &dpkg; et "
+#~ "non affecté par l'option <option>--file</option>."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Quand un paquet provient d'une archive sans signature ou d'une archive "
+#~ "avec une signature dont apt ne possède pas la clé, ce paquet n'est pas "
+#~ "considéré comme fiable et son installation provoquera un avertissement. "
+#~ "Pour l'instant, <command>apt-get</command> ne signale que les archives "
+#~ "sans signature ; les prochaines versions pourraient rendre obligatoire la "
+#~ "vérification des sources avant tout téléchargement de paquet."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/it.po b/doc/po/it.po
index 94d98ef0a..c97b09b35 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -691,67 +691,106 @@ msgstr "Descrizione"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
-"<command>apt</command> (Advanced Package Tool, strumento avanzato per "
-"pacchetti) è lo strumento a riga di comando per maneggiare i pacchetti. "
-"Fornisce un'interfaccia a riga di comando per la gestione dei pacchetti del "
-"sistema. Per altre opzioni di comandi a basso livello vedere anche &apt-get; "
-"e &apt-cache;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
-"Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
-"pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
-"<literal>search</literal> cerca i termini specificati e visualizza i "
-"pacchetti che corrispondono."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
+msgstr ""
+"<literal>upgrade</literal> viene usato per installare le versioni più "
+"recenti di tutti i pacchetti attualmente installati nel sistema prendendoli "
+"dalle fonti elencate in <filename>/etc/apt/sources.list</filename>. Nuovi "
+"pacchetti verranno installati, ma quelli esistenti non saranno mai rimossi."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> effettua la funzione di aggiornamento ma può "
+"anche rimuovere i pacchetti installati se ciò è necessario per poter "
+"risolvere un conflitto tra pacchetti."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> mostra le informazioni di pacchetto per i pacchetti "
-"specificati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> è seguito da uno o più nomi di pacchetto che si "
-"desidera vengano installati o aggiornati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "È possibile selezionare una versione specifica di un pacchetto per "
 "l'installazione scrivendo dopo il nome del pacchetto un segno di uguale e la "
@@ -762,36 +801,29 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> è identico a <literal>install</literal> tranne per "
-"il fatto che i pacchetti sono rimossi invece che installati. Notare che la "
-"rimozione di un pacchetto lascia i suoi file di configurazione nel sistema. "
-"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
-"in mezzo), il pacchetto specificato viene installato invece che rimosso."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> viene usato per rimuovere i pacchetti che sono "
 "stati installati automaticamente per soddisfare delle dipendenze per altri "
@@ -800,64 +832,99 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
-"<literal>edit-sources</literal> permette di modificare il proprio file "
-"sources.list e fornisce controlli di sanità di base."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-cache"
+msgid "(&apt-cache;)"
+msgstr "apt-cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
-"<literal>update</literal> viene usato per risincronizzare i file con gli "
-"indici dei pacchetti con le loro fonti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>upgrade</literal> viene usato per installare le versioni più "
-"recenti di tutti i pacchetti attualmente installati nel sistema prendendoli "
-"dalle fonti elencate in <filename>/etc/apt/sources.list</filename>. Nuovi "
-"pacchetti verranno installati, ma quelli esistenti non saranno mai rimossi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+#, fuzzy
+#| msgid ""
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
-"<literal>full-upgrade</literal> effettua la funzione di aggiornamento ma può "
-"anche rimuovere i pacchetti installati se ciò è necessario per poter "
-"risolvere un conflitto tra pacchetti."
+"<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
+"Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
+"pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "opzioni"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> permette di modificare il proprio file "
+"sources.list e fornisce controlli di sanità di base."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Uso di script"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 "La riga di comando di &apt; è progettata come strumento per l'utente finale "
 "e il suo output può cambiare da una versione ad un'altra. Sebbene si cerchi "
@@ -866,49 +933,15 @@ msgstr ""
 "attraverso opzioni APT. Si raccomando di preferire l'uso di questi comandi "
 "negli script."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Differenze con &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
-msgstr ""
-"Il comando <command>apt</command> non è pensato per essere facile da usare "
-"per gli utenti finali e non è necessario sia compatibile all'indietro come "
-"&apt-get;. Perciò alcune opzioni sono diverse:"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "L'opzione <literal>DPkg::Progress-Fancy</literal> è abilitata."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "L'opzione <literal>APT::Color</literal> è abilitata."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"È disponibile un nuovo comando <literal>list</literal> simile a "
-"<literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"L'opzione <literal>upgrade</literal> ha <literal>--with-new-pkgs</literal> "
-"abilitato in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1097,6 +1130,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"È possibile selezionare una versione specifica di un pacchetto per "
+"l'installazione scrivendo dopo il nome del pacchetto un segno di uguale e la "
+"versione del pacchetto da selezionare. Ciò farà sì che venga localizzata e "
+"selezionata per l'installazione quella versione. In alternativa può essere "
+"selezionata una distribuzione specifica scrivendo dopo il nome del pacchetto "
+"una sbarra («/») e la versione della distribuzione o il nome dell'archivio "
+"(stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1155,6 +1206,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> è identico a <literal>install</literal> tranne per "
+"il fatto che i pacchetti sono rimossi invece che installati. Notare che la "
+"rimozione di un pacchetto lascia i suoi file di configurazione nel sistema. "
+"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
+"in mezzo), il pacchetto specificato viene installato invece che rimosso."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1287,6 +1353,16 @@ msgstr ""
 "filename> e <filename>&cachedir;/archives/partial/</filename>,  tranne il "
 "file di lock."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1308,6 +1384,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> viene usato per rimuovere i pacchetti che sono "
+"stati installati automaticamente per soddisfare delle dipendenze per altri "
+"pacchetti e che non sono più necessari."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1349,6 +1436,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opzioni"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2631,6 +2724,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "Rimuove una chiave dall'elenco delle chiavi fidate."
 
@@ -2658,11 +2759,11 @@ msgstr "Elenca le impronte digitali delle chiavi fidate."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"Passa opzioni avanzate a gpg. Con adv --recv-key è possibile scaricare la "
-"chiave pubblica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2697,7 +2798,7 @@ msgstr ""
 "<command>update</command>; APT in Ubuntu invece lo fa."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opzioni"
 
@@ -2765,27 +2866,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"
 msgstr ""
-"mette/toglie il contrassegno di automaticamente installato ai pacchetti"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> cambia il contrassegno di un pacchetto che "
-"indica se è stato installato automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Quando viene richiesta l'installazione di un pacchetto e ciò fa sì che altri "
 "pacchetti vengano installati per soddisfare le sue dipendenze, queste ultime "
@@ -2820,30 +2936,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> viene usato per contrassegnare un pacchetto come "
-"bloccato, il che impedisce che il pacchetto venga automaticamente "
-"installato, aggiornato o rimosso. Il comando è solamente un wrapper per "
-"<command>dpkg --set-selections</command> e lo stato è pertanto mantenuto da "
-"&dpkg; e non è influenzato dall'opzione <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> viene usato per annullare un blocco impostato in "
-"precedenza, per permettere nuovamente tutte le azioni."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2866,6 +2958,48 @@ msgstr ""
 "<literal>showauto</literal>, tranne per il fatto che stampa invece un elenco "
 "dei pacchetti installati manualmente"
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+"Legge/Scrive le statistiche sui pacchetti dal file specificato con il "
+"parametro &synopsis-param-filename; invece che dalla posizione predefinita "
+"che è <filename>extended_status</filename> nella directory definita dalla "
+"voce di configurazione <literal>Dir::State</literal>."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> viene usato per contrassegnare un pacchetto come "
+"installato manualmente, il che impedisce che un pacchetto venga rimosso "
+"automaticamente se nessun altro dipende da esso."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> viene usato per annullare un blocco impostato in "
+"precedenza, per permettere nuovamente tutte le azioni."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2875,18 +3009,23 @@ msgstr ""
 "<literal>showhold</literal> viene usato per stampare un elenco di pacchetti "
 "bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
-"Legge/Scrive le statistiche sui pacchetti dal file specificato con il "
-"parametro &synopsis-param-filename; invece che dalla posizione predefinita "
-"che è <filename>extended_status</filename> nella directory definita dalla "
-"voce di configurazione <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2904,11 +3043,17 @@ msgstr "supporto per l'autenticazione degli archivi per APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "A partire dalla versione 0.6, <command>apt</command> contiene del codice che "
 "controlla le firme dei file Release per tutti gli archivi. Ciò assicura che "
@@ -2918,37 +3063,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
 msgstr ""
-"Se un pacchetto proviene da un archivio senza una firma, o con una firma per "
-"la quale apt non ha una chiave, tale pacchetto viene considerato non fidato "
-"e quando lo si installa si ottiene un importante avvertimento. <command>apt-"
-"get</command> attualmente avverte solamente in caso di archivi non firmati; "
-"le versioni future potrebbero forzare la verifica di tutte le fonti prima di "
-"scaricare pacchetti da esse."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "I frontend per i pacchetti &apt-get;, &aptitude; e &synaptic; supportano "
 "questa nuova funzionalità di autenticazione."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Archivi fidati"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2978,13 +3142,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "La catena di fiducia in Debian ha inizio quando un manutentore carica un "
 "nuovo pacchetto o una nuova versione di un pacchetto nell'archivio Debian. "
@@ -3067,11 +3240,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "Tuttavia non difende dalle compromissioni del server principale Debian "
 "stesso (che firma i pacchetti) o dalla compromissione della chiave usata per "
@@ -3085,11 +3264,17 @@ msgstr "Configurazione utente"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> è il programma che gestisce l'elenco delle chiavi "
 "usate da apt. Può essere usato per aggiungere o rimuovere chiavi, anche se "
@@ -3100,6 +3285,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3152,15 +3346,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>Pubblicare l'impronta digitale della chiave</emphasis>, in questo "
 "modo gli utenti sapranno quale chiave devono importare per poter autenticare "
 "i file nell'archivio."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3183,9 +3395,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3576,6 +3796,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4847,6 +5074,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configurazione utente"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "Directory"
 
@@ -5761,8 +6023,7 @@ msgstr ""
 "Invoke</literal> o <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Esempi"
 
@@ -7658,6 +7919,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -10822,6 +11099,127 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool, strumento avanzato per "
+#~ "pacchetti) è lo strumento a riga di comando per maneggiare i pacchetti. "
+#~ "Fornisce un'interfaccia a riga di comando per la gestione dei pacchetti "
+#~ "del sistema. Per altre opzioni di comandi a basso livello vedere anche "
+#~ "&apt-get; e &apt-cache;."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> cerca i termini specificati e visualizza i "
+#~ "pacchetti che corrispondono."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> mostra le informazioni di pacchetto per i "
+#~ "pacchetti specificati."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> è seguito da uno o più nomi di pacchetto che "
+#~ "si desidera vengano installati o aggiornati."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> viene usato per risincronizzare i file con gli "
+#~ "indici dei pacchetti con le loro fonti."
+
+#~ msgid "Script usage"
+#~ msgstr "Uso di script"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Differenze con &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "Il comando <command>apt</command> non è pensato per essere facile da "
+#~ "usare per gli utenti finali e non è necessario sia compatibile "
+#~ "all'indietro come &apt-get;. Perciò alcune opzioni sono diverse:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "L'opzione <literal>DPkg::Progress-Fancy</literal> è abilitata."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "L'opzione <literal>APT::Color</literal> è abilitata."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "È disponibile un nuovo comando <literal>list</literal> simile a "
+#~ "<literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "L'opzione <literal>upgrade</literal> ha <literal>--with-new-pkgs</"
+#~ "literal> abilitato in modo predefinito."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passa opzioni avanzate a gpg. Con adv --recv-key è possibile scaricare la "
+#~ "chiave pubblica."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "mette/toglie il contrassegno di automaticamente installato ai pacchetti"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> cambia il contrassegno di un pacchetto che "
+#~ "indica se è stato installato automaticamente."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> viene usato per contrassegnare un pacchetto come "
+#~ "bloccato, il che impedisce che il pacchetto venga automaticamente "
+#~ "installato, aggiornato o rimosso. Il comando è solamente un wrapper per "
+#~ "<command>dpkg --set-selections</command> e lo stato è pertanto mantenuto "
+#~ "da &dpkg; e non è influenzato dall'opzione <option>--file</option>."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Se un pacchetto proviene da un archivio senza una firma, o con una firma "
+#~ "per la quale apt non ha una chiave, tale pacchetto viene considerato non "
+#~ "fidato e quando lo si installa si ottiene un importante avvertimento. "
+#~ "<command>apt-get</command> attualmente avverte solamente in caso di "
+#~ "archivi non firmati; le versioni future potrebbero forzare la verifica di "
+#~ "tutte le fonti prima di scaricare pacchetti da esse."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
@@ -11660,9 +12058,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
 #~ "<date>29 February 2004</date>"
 
-#~ msgid "apt-cache"
-#~ msgstr "apt-cache"
-
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "APT strumento di gestione pacchetti -- manipolatore di cache"
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 1a88c704c..7aaff2e79 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -686,65 +686,106 @@ msgstr "説明"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
-"<command>apt</command> (Advanced Package Tool、高度パッケージツール) はパッ"
-"ケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマンドラ"
-"インインターフェイスを提供します。さらなる低レベルコマンドオプションについて"
-"は &apt-get; 及び &apt-cache; も参照してください。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
-"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
-"のマッチングにシェルパターン、そしてオプション <option>--installed</"
-"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 "
-"<option>--all-versions</option> をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New package will be "
+#| "installed, but existing package will never removed."
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
 msgstr ""
-"<literal>search</literal> では指定した語を検索して該当するパッケージを表示し"
-"ます。"
+"<literal>upgrade</literal> を使うとシステムに現在インストールされている全パッ"
+"ケージの最新版を <filename>/etc/apt/sources.list</filename> に記載されている"
+"ソースからインストールします。新しいパッケージはインストールされますが既存の"
+"パッケージが削除されることはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、パッ"
+"ケージの衝突を解決するために必要であればインストールされているパッケージの削"
+"除も行います。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> では指定したパッケージについてのパッケージ情報を表示"
-"します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> に続けてインストールやアップグレードしたいパッケー"
-"ジの名前を指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ"
 "ケージをインストールすることができます。つまり、指定のバージョンのパッケージ"
@@ -754,36 +795,29 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> は、パッケージが削除されることを除き、"
-"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、"
-"システムに残ったままになることに注意してください。プラス記号がパッケージ名に "
-"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
-"トールします。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> は、他のパッケージの依存関係を満たすために自動"
 "的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
@@ -791,70 +825,98 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
-"<literal>edit-sources</literal> では sources.list ファイルを編集させ、基礎的"
-"な健全性確認を行います。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソースと"
-"再同期します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 #, fuzzy
 #| msgid ""
-#| "<literal>upgrade</literal> is used to install the newest versions of all "
-#| "packages currently installed on the system from the sources enumerated in "
-#| "<filename>/etc/apt/sources.list</filename>. New package will be "
-#| "installed, but existing package will never removed."
-msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
-"<literal>upgrade</literal> を使うとシステムに現在インストールされている全パッ"
-"ケージの最新版を <filename>/etc/apt/sources.list</filename> に記載されている"
-"ソースからインストールします。新しいパッケージはインストールされますが既存の"
-"パッケージが削除されることはありません。"
+"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
+"のマッチングにシェルパターン、そしてオプション <option>--installed</"
+"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 "
+"<option>--all-versions</option> をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
 msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
-"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、パッ"
-"ケージの衝突を解決するために必要であればインストールされているパッケージの削"
-"除も行います。"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "オプション"
+"<literal>edit-sources</literal> では sources.list ファイルを編集させ、基礎的"
+"な健全性確認を行います。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "スクリプトでの利用"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 "&apt; コマンドラインはエンドユーザ向けツールとして設計されており、出力はバー"
 "ジョン間で変更される可能性があります。後方互換性を損なうことのないようには努"
@@ -862,50 +924,15 @@ msgstr ""
 "&apt-cache; や &apt-get; で利用可能です。スクリプトでは各コマンドの利用を選択"
 "するようにしてください。"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "&apt-get; との違い"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図して"
-"作られているため &apt-get; のように後方互換性が必ずしもあるとは限りません。し"
-"たがって、一部のオプションに異なる点があります:"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr ""
-"オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> と同"
-"じように利用できます。"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr ""
-"オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
-"literal> がデフォルトで有効になっています。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1086,6 +1113,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ"
+"ケージをインストールすることができます。つまり、指定のバージョンのパッケージ"
+"をインストールするように選択する、ということです。別の方法としては、ディスト"
+"リビューションを特定するのに、パッケージ名に続けて、スラッシュとディストリ"
+"ビューションのバージョンやアーカイブ名 (stable, testing, unstable) を記述でき"
+"ます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1140,6 +1184,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> は、パッケージが削除されることを除き、"
+"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、"
+"システムに残ったままになることに注意してください。プラス記号がパッケージ名に "
+"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
+"トールします。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1265,6 +1324,16 @@ msgstr ""
 "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/"
 "archives/partial/</filename> からロックファイル以外すべて削除します。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1286,6 +1355,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> は、他のパッケージの依存関係を満たすために自動"
+"的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1326,6 +1405,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "オプション"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2550,6 +2635,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
@@ -2576,11 +2669,11 @@ msgstr "信頼キーのフィンガープリントを一覧表示します。"
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード"
-"できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2614,7 +2707,7 @@ msgstr ""
 "有効です。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "オプション"
 
@@ -2680,26 +2773,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> は、パッケージが自動的にインストールされたかどう"
-"かのマークを変更します。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"
 "たすためにインストールされた場合、依存関係に自動的にインストールしたと印を付"
@@ -2732,30 +2841,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> は、パッケージが自動的にインストール・アップグレー"
-"ド・削除が行われないよう、パッケージに保留マークをつけるのに使用します。この"
-"コマンドは <command>dpkg --set-selections</command> のラッパーに過ぎず、その"
-"ため状態は  &dpkg; により管理され、<option>--file</option> オプションは効果が"
-"ありません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> は、以前保留したパッケージを、また操作できるよう"
-"キャンセルするのに使用します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2776,6 +2861,47 @@ msgstr ""
 "<literal>showmanual</literal> は <literal>showauto</literal> と同様に使用でき"
 "ますが、手動でインストールしたパッケージの一覧を表示します。"
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
+"トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
+"param-filename; からパッケージの状態を読み書きします。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> は、パッケージを手動でインストールしたとしてマーク"
+"します。このパッケージに依存する他のパッケージがなくなっても、このパッケージ"
+"を自動的に削除するのを防ぎます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> は、以前保留したパッケージを、また操作できるよう"
+"キャンセルするのに使用します。"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2785,17 +2911,23 @@ msgstr ""
 "<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
 "パッケージを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
-"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
-"トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
-"param-filename; からパッケージの状態を読み書きします。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2813,11 +2945,17 @@ msgstr "APT アーカイブ認証サポート"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "バージョン 0.6 より、<command>apt</command> 全アーカイブに対する Release ファ"
 "イルの署名チェックコードが含まれています。これにより、アーカイブのパッケージ"
@@ -2827,36 +2965,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
 msgstr ""
-"アーカイブ由来のパッケージが、署名されなかったり、apt が持っていないキーで署"
-"名されていた場合、信頼されていないと見なし、インストールの際に重要な警告を表"
-"示します。<command>apt-get</command> は、現在未署名のパッケージに対して警告す"
-"るだけですが、将来のリリースでは、アーカイブからパッケージをダウンロードする"
-"前に、すべてのソースに対して、強制的に検証される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "&apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、この新"
 "認証機能をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "信頼済アーカイブ"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2885,13 +3043,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "Debian における信頼の輪は、新しいパッケージやパッケージの新バージョンを、メン"
 "テナが Debian アーカイブにアップロードすることから始まります。これが有効にな"
@@ -2970,11 +3137,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "しかしこれは、(パッケージに署名する) Debian マスターサーバ自体の侵害や、"
 "Release ファイルに署名するのに使用したキーの漏洩を防げません。いずれにせよ、"
@@ -2987,11 +3160,17 @@ msgstr "ユーザの設定"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> は、apt が使用するキーリストを管理するプログラムで"
 "す。このリリースのインストールでは、Debian パッケージリポジトリで使用する、デ"
@@ -3001,6 +3180,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3053,15 +3241,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>キーの指紋を配布</emphasis>します。これにより、アーカイブ内のファイ"
 "ル認証に、どのキーをインポートする必要があるかを、ユーザに知らせることになり"
 "ます。"
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3083,9 +3289,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3458,6 +3672,13 @@ msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定�
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4662,6 +4883,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "ユーザの設定"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "ディレクトリ"
 
@@ -5524,8 +5780,7 @@ msgstr ""
 "{Pre,Post}-Invoke</literal> があります。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "サンプル"
 
@@ -7365,6 +7620,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -10427,6 +10698,127 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool、高度パッケージツール) は"
+#~ "パッケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマ"
+#~ "ンドラインインターフェイスを提供します。さらなる低レベルコマンドオプション"
+#~ "については &apt-get; 及び &apt-cache; も参照してください。"
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> では指定した語を検索して該当するパッケージを表示"
+#~ "します。"
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> では指定したパッケージについてのパッケージ情報を表"
+#~ "示します。"
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> に続けてインストールやアップグレードしたいパッ"
+#~ "ケージの名前を指定します。"
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソース"
+#~ "と再同期します。"
+
+#~ msgid "Script usage"
+#~ msgstr "スクリプトでの利用"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "&apt-get; との違い"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図"
+#~ "して作られているため &apt-get; のように後方互換性が必ずしもあるとは限りま"
+#~ "せん。したがって、一部のオプションに異なる点があります:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr ""
+#~ "オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> "
+#~ "と同じように利用できます。"
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
+#~ "literal> がデフォルトで有効になっています。"
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウン"
+#~ "ロードできます。"
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "パッケージが自動的にインストールされたかどうかのマークを変更します。"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> は、パッケージが自動的にインストールされたかど"
+#~ "うかのマークを変更します。"
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> は、パッケージが自動的にインストール・アップグレー"
+#~ "ド・削除が行われないよう、パッケージに保留マークをつけるのに使用します。こ"
+#~ "のコマンドは <command>dpkg --set-selections</command> のラッパーに過ぎず、"
+#~ "そのため状態は  &dpkg; により管理され、<option>--file</option> オプション"
+#~ "は効果がありません。"
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "アーカイブ由来のパッケージが、署名されなかったり、apt が持っていないキーで"
+#~ "署名されていた場合、信頼されていないと見なし、インストールの際に重要な警告"
+#~ "を表示します。<command>apt-get</command> は、現在未署名のパッケージに対し"
+#~ "て警告するだけですが、将来のリリースでは、アーカイブからパッケージをダウン"
+#~ "ロードする前に、すべてのソースに対して、強制的に検証される可能性がありま"
+#~ "す。"
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index a69d99f8d..37cf2fb5f 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -686,59 +686,89 @@ msgstr "Opis"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
 msgstr ""
 
-#
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>rdepends</literal> pokazuje listę wszystkich odwrotnych zależności "
-"danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "Konkretna wersja pakietu może być wybrana do zainstalowania przez "
 "umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji "
@@ -747,37 +777,30 @@ msgstr ""
 "pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa "
 "archiwum (stable, testing, unstable)."
 
-#
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
-"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu "
-"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
-"pakiet zostanie zainstalowany zamiast zostać usunięty."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> jest używane do usuwania pakietów, które  "
 "zostały zainstalowane automatycznie, żeby rozwiązać zależności w innych "
@@ -786,104 +809,86 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
 #, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
-msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
-msgstr ""
-"<literal>showhold</literal> jest używane do wypisania listy wszystkich "
-"pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "opcje"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid "Script usage"
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Differences to &apt-get;"
+msgid "Script usage and Differences to other APT tools"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "linia <literal>Package:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "linia <literal>Component:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
@@ -1095,6 +1100,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Konkretna wersja pakietu może być wybrana do zainstalowania przez "
+"umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji "
+"pakietu. Podana wersja zostanie wyszukana i wybrana do zainstalowania.  "
+"Również konkretna dystrybucja może być wybrana przez umieszczenie po nazwie "
+"pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa "
+"archiwum (stable, testing, unstable)."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1154,6 +1177,21 @@ msgstr ""
 "początek lub koniec dopasowania wyrażenia regularnego, używając znaków \"^| "
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
+"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu "
+"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
+"pakiet zostanie zainstalowany zamiast zostać usunięty."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1303,6 +1341,16 @@ msgstr ""
 "dselect, powinny od czasu do czasu uruchamiać <literal>apt-get clean</"
 "literal>, aby zwolnić trochę miejsca na dysku."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1326,6 +1374,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> jest używane do usuwania pakietów, które  "
+"zostały zainstalowane automatycznie, żeby rozwiązać zależności w innych "
+"pakietach, i nie są już potrzebne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1367,6 +1426,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opcje"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2731,6 +2796,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "Usuwa klucz z listy zaufanych kluczy."
 
@@ -2757,11 +2830,11 @@ msgstr "Wyświetla listę odcisków zaufanych kluczy."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"Przekazuje zaawansowane opcje do gpg. Na przykład adv --recv-key umożliwia "
-"pobranie klucza publicznego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2796,7 +2869,7 @@ msgstr ""
 "command>, ale APT w Ubuntu je obsługuje."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opcje"
 
@@ -2863,26 +2936,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> zmienia flagę mówiącą o tym, czy pakiet był "
-"zainstalowany automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Kiedy użytkownik zażąda zainstalowania pakietu, to zazwyczaj instalowane są "
 "również inne pakiety, zależące od żądanego pakietu. Te zależne pakiety są "
@@ -2916,31 +3005,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> jest używane do wstrzymania pakietu, co zabroni "
-"automatycznego instalowania, aktualizowania lub usuwania pakietu. Polecenie "
-"jest nakładką na <command>dpkg --set-selections</command>, stan pakietu jest "
-"zarządzany przez &dpkg;, a opcja <option>--file</option> nie wpływa na "
-"działanie tego polecenia."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> jest używane do usunięcia stanu wstrzymania "
-"pakietu ustawionego poprzednio i pozwolenia na wykonywanie wszystkich akcji "
-"na tym pakiecie."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2963,6 +3027,49 @@ msgstr ""
 "jak <literal>showauto</literal> z tym wyjątkiem, że wypisze listę ręcznie "
 "zainstalowanych pakietów."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku "
+"przekazanego w parametrze &synopsis-param-filename; zamiast z pliku "
+"domyślnego, którym jest <filename>extended_status</filename> w katalogu "
+"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> jest używane do zaznaczania pakietu jako "
+"zainstalowanego ręcznie, co go uchroni przed automatycznym usunięciem, w "
+"sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> jest używane do usunięcia stanu wstrzymania "
+"pakietu ustawionego poprzednio i pozwolenia na wykonywanie wszystkich akcji "
+"na tym pakiecie."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2972,18 +3079,23 @@ msgstr ""
 "<literal>showhold</literal> jest używane do wypisania listy wszystkich "
 "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
-"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku "
-"przekazanego w parametrze &synopsis-param-filename; zamiast z pliku "
-"domyślnego, którym jest <filename>extended_status</filename> w katalogu "
-"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><para>
@@ -3002,11 +3114,17 @@ msgstr "Wsparcie APT dla autentykacji archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "Począwszy od wersji 0.6 <command>apt</command> zawiera kod sprawdzający "
 "sygnatury plików \"Release\" wszystkich archiwów. Zapewnia to, że pakiety w "
@@ -3016,37 +3134,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
 msgstr ""
-"Jeśli pakiet pochodzi z archiwum niemającego sygnatury lub mającego "
-"sygnaturę, dla której APT nie ma klucza, to pakiet taki jest uznawany za "
-"niezaufany, a podczas jego instalacji zostanie wypisane ostrzeżenie. Obecnie "
-"<command>apt-get</command> tylko wypisuje ostrzeżenia o niepodpisanych "
-"archiwach, przyszłe wydania mogą wymuszać, by wszystkie źródła były "
-"zweryfikowane, zanim w ogóle APT spróbuje z nich pobrać pakiety."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "Nakładki na APT typu &apt-get;, &aptitude; i &synaptic; obsługują ten nowy "
 "sposób autoryzacji pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Zaufane archiwa"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -3074,13 +3211,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "Łańcuch zaufania w Debianie zaczyna się od wgrania nowego pakietu lub nowej "
 "wersji pakietu przez jego opiekuna do archiwum Debiana. Dostarczony przez "
@@ -3165,11 +3311,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "Jednakże nie chroni przed złamaniem zabezpieczeń głównego serwera Debiana "
 "(używanego do podpisywania pakietów) lub złamaniem zabezpieczeń klucza "
@@ -3183,11 +3335,17 @@ msgstr "Konfiguracja użytkownika"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> jest programem służącym do zarządzania listą "
 "kluczy używanych przez APT. Można go użyć do dodania lub usunięcia klucza, "
@@ -3198,6 +3356,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3247,15 +3414,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>Opublikować odcisk klucza (ang. \"key fingerprint\")</emphasis>, "
 "tak żeby użytkownicy wiedzieli, który klucz zaimportować, żeby móc "
 "autoryzować plików w archiwum."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3277,9 +3462,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3688,6 +3881,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4520,6 +4720,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Konfiguracja użytkownika"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr ""
 
@@ -5164,8 +5399,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Przykłady"
 
@@ -7051,6 +7285,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -9991,6 +10241,92 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
 #
+#, fuzzy
+#~| msgid ""
+#~| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#~| "package has."
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>rdepends</literal> pokazuje listę wszystkich odwrotnych "
+#~ "zależności danego pakietu."
+
+#, fuzzy
+#~| msgid ""
+#~| "<literal>showhold</literal> is used to print a list of packages on hold "
+#~| "in the same way as for the other show commands."
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>showhold</literal> jest używane do wypisania listy wszystkich "
+#~ "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
+
+#, fuzzy
+#~| msgid "the <literal>Package:</literal> line"
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "linia <literal>Package:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Component:</literal> line"
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "linia <literal>Component:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Przekazuje zaawansowane opcje do gpg. Na przykład adv --recv-key "
+#~ "umożliwia pobranie klucza publicznego."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> zmienia flagę mówiącą o tym, czy pakiet był "
+#~ "zainstalowany automatycznie."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> jest używane do wstrzymania pakietu, co zabroni "
+#~ "automatycznego instalowania, aktualizowania lub usuwania pakietu. "
+#~ "Polecenie jest nakładką na <command>dpkg --set-selections</command>, stan "
+#~ "pakietu jest zarządzany przez &dpkg;, a opcja <option>--file</option> nie "
+#~ "wpływa na działanie tego polecenia."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Jeśli pakiet pochodzi z archiwum niemającego sygnatury lub mającego "
+#~ "sygnaturę, dla której APT nie ma klucza, to pakiet taki jest uznawany za "
+#~ "niezaufany, a podczas jego instalacji zostanie wypisane ostrzeżenie. "
+#~ "Obecnie <command>apt-get</command> tylko wypisuje ostrzeżenia o "
+#~ "niepodpisanych archiwach, przyszłe wydania mogą wymuszać, by wszystkie "
+#~ "źródła były zweryfikowane, zanim w ogóle APT spróbuje z nich pobrać "
+#~ "pakiety."
+
+#
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 832d807fe..eae77d68d 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -689,65 +689,106 @@ msgstr "Descrição"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
-"<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha de "
-"comandos para manuseamento de pacotes. Disponibiliza uma interface de linha "
-"de comandos para a gestão de pacotes do sistema. Veja também &apt-get; e "
-"&apt-cache; para mais opções de baixo nível dos comandos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
-"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
-"seguintes opções <option>--installed</option>, <option>--upgradable</"
-"option>, <option>--all-versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
-"<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
-"pacotes correspondentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
+msgstr ""
+"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
+"todos os pacotes actualmente instalados no sistema a partir das fontes "
+"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
+"novos pacotes, mas pacotes existentes nunca serão removidos."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
+"remover pacotes instalados se tal for necessário de modo a resolver um "
+"conflito de pacotes."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
-"determinado(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> é seguido por um ou mais nomes de pacotes que se "
-"deseja instalar ou actualizar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "A specific version of a package can be selected for installation by "
+#| "following the package name with an equals and the version of the package "
+#| "to select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."
 msgid ""
 "A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 "Pode ser seleccionada para instalação uma versão específica de um pacote ao "
 "continuar o nome do pacote com um igual (=) e a versão do pacote a "
@@ -757,36 +798,29 @@ msgstr ""
 "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
-msgstr ""
-"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
-"excepção que os pacotes são removidos em vez de instalados. Note que remover "
-"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
-"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
-"pacote identificado será instalado em vez de removido."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> é usado para remover pacotes que foram "
 "instalados automaticamente para satisfazer dependências de outros pacotes e "
@@ -795,64 +829,98 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
-"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
-"list e disponibiliza verificações de sanidade básicas."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
-"<literal>update</literal> é usado para re-sincronizar o índice dos pacotes a "
-"partir das suas fontes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
-"todos os pacotes actualmente instalados no sistema a partir das fontes "
-"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
-"novos pacotes, mas pacotes existentes nunca serão removidos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+#, fuzzy
+#| msgid ""
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
-"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
-"remover pacotes instalados se tal for necessário de modo a resolver um "
-"conflito de pacotes."
+"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
+"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
+"seguintes opções <option>--installed</option>, <option>--upgradable</"
+"option>, <option>--all-versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "opções"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
+"list e disponibiliza verificações de sanidade básicas."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Utilização de script"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 "A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
 "final e pode variar os textos mostrados entre versões. Apesar de tentar não "
@@ -861,49 +929,15 @@ msgstr ""
 "get; via opções do APT. Por favor dê preferência a usar estes comandos nos "
 "seus scripts."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Diferenças para o &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
-msgstr ""
-"O comando  <command>apt</command> destina-se a ser agradável para os "
-"utilizadores finais e não precisa de ser compatível com as versões "
-"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "A opção <literal>APT::Color</literal> está activada."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Está disponível um novo comando <literal>list</literal> de modo semelhante a "
-"<literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
-"activado por predefinição."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1091,6 +1125,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Pode ser seleccionada para instalação uma versão específica de um pacote ao "
+"continuar o nome do pacote com um igual (=) e a versão do pacote a "
+"seleccionar. Isto irá fazer com que essa versão seja localizada e "
+"seleccionada para instalação. Alternativamente pode ser seleccionada uma "
+"distribuição específica ao continuar o nome do pacote com uma slash (/) e a "
+"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1148,6 +1199,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
+"excepção que os pacotes são removidos em vez de instalados. Note que remover "
+"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
+"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
+"pacote identificado será instalado em vez de removido."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1276,6 +1342,16 @@ msgstr ""
 "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/"
 "archives/</filename> e <filename>&cachedir;/archives/partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1297,6 +1373,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> é usado para remover pacotes que foram "
+"instalados automaticamente para satisfazer dependências de outros pacotes e "
+"que já não são necessários."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1338,6 +1425,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opções"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2605,6 +2698,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr "Remove uma chave da lista de chaves de confiança."
 
@@ -2631,11 +2732,11 @@ msgstr "Lista as fingerprints das chaves de confiança."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
-"Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a "
-"chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2669,7 +2770,7 @@ msgstr ""
 "lo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opções"
 
@@ -2737,26 +2838,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> irá modificar se um pacote foi marcado como "
-"sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 "Quando você pede que um pacote seja instalado, e como resultado outros "
 "pacotes são instalados para satisfazer as suas dependências, as dependências "
@@ -2790,30 +2907,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> é usado para marcar um pacote como retido, o que vai "
-"prevenir que o pacote seja automaticamente instalado, actualizado ou "
-"removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
-"selections</command> e o estado é assim mantido pelo &dpkg; e não é afectado "
-"pela opção <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
-"definido num pacote para permitir de novo todas as acções."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 "installed packages will be listed if no package is given.  If packages are "
@@ -2836,6 +2929,48 @@ msgstr ""
 "<literal>showauto</literal>, excepto que irá escrever uma lista dos pacotes "
 "instalados manualmente."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+"Lê/Escreve o estado de pacote a partir do nome de ficheiro dado com o "
+"parâmetro &synopsis-param-filename; em vez de o fazer a partir da "
+"localização predefinida, a qual é <filename>extended_status</filename> no "
+"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> é usado para marcar um pacote como sendo instalado "
+"manualmente, o que irá prevenir que o pacote seja removido automaticamente "
+"se nenhum outro pacote depender dele."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
+"definido num pacote para permitir de novo todas as acções."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2845,18 +2980,23 @@ msgstr ""
 "<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
 "retenção do mesmo modo que os outros comandos show."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
-"Lê/Escreve o estado de pacote a partir do nome de ficheiro dado com o "
-"parâmetro &synopsis-param-filename; em vez de o fazer a partir da "
-"localização predefinida, a qual é <filename>extended_status</filename> no "
-"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2874,11 +3014,17 @@ msgstr "Suporte de autenticação de arquivos para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 "A partir da versão 0.6, o <command>apt</command> contém código que faz "
 "verificação de assinaturas do ficheiro Release para todos os arquivos. Isto "
@@ -2888,37 +3034,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
 msgstr ""
-"Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
-"qual o apt não tem a chave, esse pacote é considerado 'não sendo de "
-"confiança' e instalá-lo irá resultar num grande aviso. Actualmente o "
-"<command>apt-get</command> irá avisar apenas de arquivos não assinados, "
-"lançamentos futuros poderão vir a forçar que todas as fontes sejam "
-"verificadas antes de descarregar pacotes delas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 "Os frontends de pacotes &apt-get;, &aptitude; e &synaptic; suportam esta "
 "nova funcionalidade de autenticação."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2947,13 +3112,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 "A corrente de confiança em Debian começa quando o responsável faz o upload "
 "de um novo pacote ou de uma nova versão de um pacote para o arquivo Debian. "
@@ -3036,11 +3210,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 "No entanto, isto não defende contra um compromisso do próprio servidor "
 "mestre da Debian (o qual assina os pacotes) ou contra um compromisso da "
@@ -3054,11 +3234,17 @@ msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
 msgstr ""
 "<command>apt-key</command> é o programa que gere a lista de chaves usada "
 "pelo apt. Pode ser usado para adicionar ou remover chaves apesar de uma "
@@ -3069,6 +3255,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3121,15 +3316,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
 msgstr ""
 "<emphasis>Publicar a impressão digital da chave</emphasis>, deste modo os "
 "seus utilizadores irão saber que chave precisam de importar de modo a "
 "autenticar os ficheiros no arquivo."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3152,9 +3365,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3541,6 +3762,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4800,6 +5028,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuração do utilizador"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr "Directórios"
 
@@ -5700,8 +5963,7 @@ msgstr ""
 "literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Exemplos"
 
@@ -7585,6 +7847,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -10729,6 +11007,125 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha "
+#~ "de comandos para manuseamento de pacotes. Disponibiliza uma interface de "
+#~ "linha de comandos para a gestão de pacotes do sistema. Veja também &apt-"
+#~ "get; e &apt-cache; para mais opções de baixo nível dos comandos."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
+#~ "pacotes correspondentes."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
+#~ "determinado(s)."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> é seguido por um ou mais nomes de pacotes que "
+#~ "se deseja instalar ou actualizar."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> é usado para re-sincronizar o índice dos "
+#~ "pacotes a partir das suas fontes."
+
+#~ msgid "Script usage"
+#~ msgstr "Utilização de script"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Diferenças para o &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "O comando  <command>apt</command> destina-se a ser agradável para os "
+#~ "utilizadores finais e não precisa de ser compatível com as versões "
+#~ "anteriores como o &apt-get;. Por isso algumas opções são diferentes."
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "A opção <literal>APT::Color</literal> está activada."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Está disponível um novo comando <literal>list</literal> de modo "
+#~ "semelhante a <literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
+#~ "activado por predefinição."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a "
+#~ "chave pública."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> irá modificar se um pacote foi marcado como "
+#~ "sendo instalado automaticamente."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> é usado para marcar um pacote como retido, o que "
+#~ "vai prevenir que o pacote seja automaticamente instalado, actualizado ou "
+#~ "removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
+#~ "selections</command> e o estado é assim mantido pelo &dpkg; e não é "
+#~ "afectado pela opção <option>--file</option>."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
+#~ "qual o apt não tem a chave, esse pacote é considerado 'não sendo de "
+#~ "confiança' e instalá-lo irá resultar num grande aviso. Actualmente o "
+#~ "<command>apt-get</command> irá avisar apenas de arquivos não assinados, "
+#~ "lançamentos futuros poderão vir a forçar que todas as fontes sejam "
+#~ "verificadas antes de descarregar pacotes delas."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b27fd139f..a96dc5e3c 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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-10-22 16:34+0200\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"
@@ -509,172 +509,185 @@ msgstr "Descrição"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--"
-"upgradeable</option>, <option>--all-versions</option> are supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
-msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+msgid "(&apt-get;)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+#: apt.8.xml
+msgid ","
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&stable-"
+"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
+"unstable). This will also select versions from this release for dependencies "
+"of this package if needed to satisfy the request."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installtion request for the accidently removed "
+"package will restore it funcation as before in that case. On the other hand "
+"you can get right of these leftovers via calling <command>purge</command> "
+"even on already removed packages.  Note that this does not effect any data "
+"or configuration stored in your home directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"Try to ensure that the list does not include applications you have grown to "
+"like even through they there once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are never proposed for automatic removal as well."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+msgid "(&apt-cache;)"
 msgstr ""
+"&apt-docinfo;\n"
+"\n"
+" "
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid "Script usage"
+msgid ""
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of the available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and many more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
-msgid "Differences to &apt-get;"
+msgid "(work-in-progress)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-#, fuzzy
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "a linha <literal>Package:</literal>"
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-#, fuzzy
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "a linha <literal>Component:</literal>"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"The &apt; commandline is designed as a end-user tool and it may change "
+"behaviour between versions. While it tries to not break backward "
+"compatibility there is no guarantee for it either if it seems benefitial for "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
-#, fuzzy
 msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "a linha <literal>Archive:</literal>"
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -803,6 +816,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -841,6 +865,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -929,6 +963,16 @@ msgid ""
 "partial/</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -944,6 +988,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>changelog</literal> tries to download the changelog of a package "
 "and displays it through <command>sensible-pager</command>.  By default it "
 "displays the changelog for the version that is installed.  However, you can "
@@ -964,6 +1016,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1818,6 +1876,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
@@ -1844,8 +1910,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1869,7 +1937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr ""
 
@@ -1930,14 +1998,22 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified frontend to set various "
+"settings for a package like marking a package as being automatically/"
+"manually installed or changing <command>dpkg</command> selections such as "
+"hold, install, deinstall and purge which are respected e.g. by <command>apt-"
+"get dselect-upgrade</command> or <command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and manually installed packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1945,9 +2021,11 @@ msgstr ""
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while package you installed explicitely is "
+"marked as manually installed.  Once a automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1969,35 +2047,46 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line.  All automatically "
-"installed packages will be listed if no package is given.  If packages are "
-"given only those which are automatically installed will be shown."
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2007,13 +2096,22 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 msgid ""
-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously sheduled changes to the install state of packages. Such "
+"changes can be sheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2031,38 +2129,49 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive doesn't have a signed Release file or no Release file at all "
+"current APT versions will raise a warning in <command>update</command> "
+"operations and frontends like <command>apt-get</command> will require "
+"explicit confirmation if an installation request includes a package from "
+"such an unauthenticated archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
@@ -2082,12 +2191,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainers keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2140,10 +2250,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2155,9 +2265,18 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"Note that a default installation already contains all keys to securily "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2204,7 +2323,20 @@ msgstr ""
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securily the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leverage the web of trust."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2226,7 +2358,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
 "(available also in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -2519,6 +2651,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -3338,6 +3477,39 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+msgid "Binary specific configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr ""
 
@@ -3968,8 +4140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
@@ -5736,6 +5907,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override this decision either with the "
+"value <literal>yes</literal>, which lets APT consider this source always as "
+"a trusted source even if it has no or fails authentication checks by "
+"disabling parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context (if at all) as otherwise security is breached. The "
+"opposite can be achieved with the value no, which causes the source to be "
+"handled as untrusted even if the authentication checks passed successfully.  "
+"The default value can't be set explicitly."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
@@ -8011,6 +8198,20 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 #, fuzzy
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "a linha <literal>Package:</literal>"
+
+#, fuzzy
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "a linha <literal>Component:</literal>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr "a linha <literal>Archive:</literal>"
+
+#, fuzzy
 #~ msgid ""
 #~ "to the versions that are not installed and do not belong to the target "
 #~ "release."
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 3f2af915b..857f0aff5 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -606,7 +606,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 // ShowHelp - Show the help text					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *)
 {
    ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
    if (_config->FindB("version") == true)
@@ -661,7 +661,7 @@ static bool ShowHelp(CommandLine &)
 static bool SimpleGenPackages(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL);
+      return ShowHelp(CmdL, nullptr);
    
    string Override;
    if (CmdL.FileSize() >= 3)
@@ -693,7 +693,7 @@ static bool SimpleGenPackages(CommandLine &CmdL)
 static bool SimpleGenContents(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL);
+      return ShowHelp(CmdL, nullptr);
    
    // Create a package writer object.
    ContentsWriter Contents(NULL, _config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture"));
@@ -715,7 +715,7 @@ static bool SimpleGenContents(CommandLine &CmdL)
 static bool SimpleGenSources(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL);
+      return ShowHelp(CmdL, nullptr);
    
    string Override;
    if (CmdL.FileSize() >= 3)
@@ -752,7 +752,7 @@ static bool SimpleGenSources(CommandLine &CmdL)
 static bool SimpleGenRelease(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL);
+      return ShowHelp(CmdL, nullptr);
 
    string Dir = CmdL.FileList[1];
 
@@ -920,7 +920,7 @@ static bool Generate(CommandLine &CmdL)
 {
    struct CacheDB::Stats SrcStats;
    if (CmdL.FileSize() < 2)
-      return ShowHelp(CmdL);
+      return ShowHelp(CmdL, nullptr);
 
    struct timeval StartTime;
    gettimeofday(&StartTime,0);
@@ -978,7 +978,7 @@ static bool Generate(CommandLine &CmdL)
 static bool Clean(CommandLine &CmdL)
 {
    if (CmdL.FileSize() != 2)
-      return ShowHelp(CmdL);
+      return ShowHelp(CmdL, nullptr);
 
    // Read the configuration file.
    Configuration Setup;
@@ -1045,14 +1045,16 @@ int main(int argc, const char *argv[])
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};
-   CommandLine::Dispatch Cmds[] = {{"packages",&SimpleGenPackages},
-                                   {"contents",&SimpleGenContents},
-                                   {"sources",&SimpleGenSources},
-                                   {"release",&SimpleGenRelease},
-                                   {"generate",&Generate},
-                                   {"clean",&Clean},
-      				   {"help",&ShowHelp},
-                                   {0,0}};
+
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"packages",&SimpleGenPackages, nullptr},
+      {"contents",&SimpleGenContents, nullptr},
+      {"sources",&SimpleGenSources, nullptr},
+      {"release",&SimpleGenRelease, nullptr},
+      {"generate",&Generate, nullptr},
+      {"clean",&Clean, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 07904688f..971b8428c 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.1~exp12ubuntu1~20151005\n"
+"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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -377,6 +377,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -631,7 +632,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr ""
 
@@ -815,29 +816,20 @@ msgstr ""
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+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"
@@ -849,27 +841,84 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
+msgstr ""
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr ""
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr ""
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc
@@ -897,6 +946,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr ""
@@ -906,17 +979,24 @@ msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
+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"
 msgstr ""
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1129,24 +1209,10 @@ msgid ""
 "apt-get is a simple command line interface for downloading and\n"
 "installing packages. The most frequently used commands are update\n"
 "and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1166,6 +1232,62 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1189,13 +1311,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1223,10 +1354,8 @@ msgstr ""
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1240,7 +1369,18 @@ msgid "Canceled hold on %s.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1249,16 +1389,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1270,6 +1404,34 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as automatically installed"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2239,7 +2401,21 @@ msgid "Retrieving file %li of %li"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2302,18 +2478,20 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
 #, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
+msgid "The repository '%s' is not signed."
 msgstr ""
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
 #, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
+msgid "The repository '%s' does not have a Release file."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
@@ -2687,6 +2865,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3364,6 +3547,11 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index f8001d8ae..4c3d4d72e 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -394,6 +394,7 @@ msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -655,7 +656,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "يجب أن تعطي صيغة واحدة بالضبط"
@@ -844,29 +845,20 @@ msgstr " جدول النسخ:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+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"
@@ -878,29 +870,92 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "قراءة قوائم الحزم"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "الحزم المُدبّسة:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "حزم معطوبة"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "دمج المعلومات المتوفرة"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -928,6 +983,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة."
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr ""
@@ -937,17 +1016,24 @@ msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
+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"
 msgstr ""
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1160,24 +1246,10 @@ msgid ""
 "apt-get is a simple command line interface for downloading and\n"
 "installing packages. The most frequently used commands are update\n"
 "and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1197,6 +1269,65 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Retrieve new lists of packages"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove packages"
+msgstr "حزم معطوبة"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Download source archives"
+msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1221,13 +1352,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1255,10 +1395,8 @@ msgstr "%s هي النسخة الأحدث.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1272,7 +1410,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "فشل فتح %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1281,16 +1430,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1302,6 +1445,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2279,7 +2454,21 @@ msgid "Retrieving file %li of %li"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2345,19 +2534,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "المسار %s طويل جداً"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "المسار %s طويل جداً"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2732,6 +2923,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3413,6 +3609,11 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index cf9f20693..8a0507ac8 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -401,7 +401,7 @@ msgstr[1] ""
 "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Usa '%s' pa desinstalalos."
@@ -673,7 +673,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación d'espresión regular - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Has de dar polo menos un patrón de gueta"
 
@@ -857,32 +857,27 @@ msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -893,34 +888,6 @@ msgid ""
 "  -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 ""
-"Usu: apt-cache [opciones] orde\n"
-"     apt-cache [opciones] add ficheru1 [ficheru2 ...]\n"
-"     apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
-"     apt-cache [opciones] showsrc 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"
-"\n"
-"Ordes:\n"
-"   add - Amesta un ficheru de paquete a la caché fonte\n"
-"   gencaches - Creal dambes cachés, la de paquetes y la de fontes\n"
-"   showpkg - Amuesa algo d'información xeneral d'un sólu paquete\n"
-"   showsrc - Amuesa los rexistros de fonte\n"
-"   stats - Amuesa dalgunes estadístiques básiques\n"
-"   dump - Amuesa'l ficheru ensembre en formatu tersu\n"
-"   dumpavail - Imprenta un ficheru disponible na salida estándar\n"
-"   unmet - Amuesa dependencies nun atopáes\n"
-"   search - Restola na llista de paquetes por el patrón d'una espresión "
-"regular\n"
-"   show - Amuesa un rexistru lleíble pal paquete\n"
-"   showauto - Amouesa una llista de paquetes instalaos automáticamente\n"
-"   depends - Amuesa la información de dependencies en bruto d'un paquete\n"
-"   rdepends - Amuesa la información de dependencies inverses d'un paquete\n"
-"   pkgnames - Llista los nomes de tolos paquetes nel sistema\n"
-"   dotty - Xenera gráfiques del paquete pa GraphViz\n"
-"   xvcg - Xenera gráfiques del paquete pa xvcg\n"
-"   policy - Amuesa los axustes de les normes\n"
-"\n"
 "Opciones:\n"
 "  -h   Esti testu d'aida.\n"
 "  -p=? La cache de paquetes.\n"
@@ -932,29 +899,91 @@ msgstr ""
 "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"
+msgstr "Amuesa los rexistros de fonte"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Restola na llista de paquetes por el patrón d'una espresión regular"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Amuesa la información de dependencies en bruto d'un paquete"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Amuesa la información de dependencies inverses d'un paquete"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Amuesa un rexistru lleíble pal paquete"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Llista los nomes de tolos paquetes nel sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Amuesa los axustes de les normes"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Lleendo llista de paquetes"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Paquetes na chincheta:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Paquetes frañaos"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Desaniciar automáticamente tolos paquetes non usaos"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s axustáu como instaláu manualmente.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Lleendo información d'estáu"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'"
@@ -981,6 +1010,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repite'l procesu colos demás CDs del conxuntu."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumentos non empareyaos"
@@ -990,29 +1043,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Usu: apt-config [opciones] orde\n"
-"\n"
-"apt-config ye una ferramienta pa lleer el ficheru de configuración d'APT.\n"
-"\n"
-"Ordes:\n"
-"   shell - Mou shell\n"
-"   dump - Amuesa la configuración\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1235,7 +1290,6 @@ 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"
@@ -1244,24 +1298,17 @@ msgid ""
 "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 ""
+"Usu: apt-get [opciones] comandu\n"
+"     apt-get [opciones] install|remove pkg1 [pkg2 ...]\n"
+"     apt-get [opciones] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get ye una interface de llínia de comandos simple pa baxar ya\n"
+"instalar paquetes. L'usu más frecuente de comandos ye p'anovar\n"
+"ya instalar.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1280,31 +1327,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Usu: apt-get [opciones] comandu\n"
-"       apt-get [opciones] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [opciones] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get ye una interface de llínia de comandos simple pa baxar ya\n"
-"instalar paquetes. L'usu más frecuente de comandos ye p'anovar\n"
-"ya instalar.\n"
-"\n"
-"Comandos:\n"
-"   update - Algamar nueva llista de paquetes\n"
-"   upgrade - Facer una anovación\n"
-"   install - Instalar nuevos paquetes (pkg ye libc6 non libc6.deb)\n"
-"   remove - Desaniciar paquetes\n"
-"   autoremove - Desaniciar automáticamente tolos paquetes non usaos\n"
-"   purge - Quitar y desaniciar paquetes\n"
-"   source - Baxar fonte del ficheru\n"
-"   build-dep - Configurar dependencies pa los paquetes fonte\n"
-"   dist-upgrade - Actualización de la distribución, ver apt-get(8)\n"
-"   dselect-upgrade - Siguir seleiciones dselect\n"
-"   clean - Esborrar los ficheros de ficheros baxaos\n"
-"   autoclean - Esborrar ficheros de ficheros vieyos baxaos\n"
-"   check - Verificar que nun hai dependencies frayaes\n"
-"   markauto - Marcar paquetes como automáticamente instalaos\n"
-"   unmarkauto - Marcar paquetes como manualmente instalaos\n"
-"\n"
 "Opciones:\n"
 "  -h  Esti testu d'aida.\n"
 "  -q  Salida Log - ensín indicación de progresu\n"
@@ -1325,6 +1347,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Facer una anovación"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instalar nuevos paquetes (pkg ye libc6 non libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Desaniciar paquetes"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Quitar y desaniciar paquetes"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Actualización de la distribución, ver apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Siguir seleiciones dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configurar dependencies pa los paquetes fonte"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Esborrar los ficheros de ficheros baxaos"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Esborrar ficheros de ficheros vieyos baxaos"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verificar que nun hai dependencies frayaes"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Baxar fonte del ficheru"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1349,13 +1427,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1383,11 +1470,9 @@ msgstr "%s yá ta na versión más nueva.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperaba %s pero nun taba ellí"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1400,7 +1485,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Nun pudo abrise %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1409,16 +1505,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1430,6 +1520,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s axustáu como instaláu automáticamente.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s axustáu como instaláu automáticamente.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s axustáu como instaláu manualmente.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2489,7 +2611,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Descargando ficheru %li de %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2556,19 +2692,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "El direutorio %s ta desviáu"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "El direutorio %s ta desviáu"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2966,6 +3104,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperaba %s pero nun taba ellí"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3673,6 +3816,11 @@ msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
diff --git a/po/bg.po b/po/bg.po
index ba271dc9e..894df1705 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -413,6 +413,7 @@ msgstr[1] ""
 "%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Използвайте „%s“ за да го премахнете."
@@ -684,7 +685,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Трябва да въведете поне един шаблон за търсене"
 
@@ -870,29 +871,25 @@ msgstr "  Таблица с версиите:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -903,30 +900,6 @@ msgid ""
 "  -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 ""
-"Употреба: apt-cache [опции] команда\n"
-"          apt-cache [опции] showpkg пакет1 [пакет2 ...]\n"
-"          apt-cache [опции] showsrc пакет1 [пакет2 ...]\n"
-"\n"
-"apt-cache е инструмент на ниско ниво за извличане на информация от\n"
-"двоичните кеш файлове на APT\n"
-"\n"
-"Команди:\n"
-"   gencaches - Генериране на кеша на пакети и пакети с изходен код\n"
-"   showpkg - Показване на обща информация за даден пакет\n"
-"   showsrc - Показване на записите за пакети с изходен код\n"
-"   stats - Показване на някои общи статистики\n"
-"   dump - Показване на целия файл в сбит вид\n"
-"   dumpavail - Извеждане на достъпните пакети на стандартния изход\n"
-"   unmet - Показване на неудовлетворените зависимости\n"
-"   search - Търсене в списъка с пакети за регулярен израз\n"
-"   show - Показване на записа за пакет\n"
-"   depends - Необработена информация за зависимостите на даден пакет\n"
-"   rdepends - Информация за обратните зависимости на даден пакет\n"
-"   pkgnames - Списък с имената на всички пакети, за които има информация\n"
-"   dotty - Генериране на графики на пакети за GraphViz\n"
-"   xvcg - Генериране на графики на пакети за xvcg\n"
-"   policy - Показване на настройките на политиката\n"
-"\n"
 "Опции:\n"
 "  -h   Този помощен текст.\n"
 "  -p=? Кешът за пакети.\n"
@@ -938,29 +911,91 @@ msgstr ""
 "cache=/tmp\n"
 "За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Показване на записите за пакети с изходен код"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Търсене в списъка с пакети за регулярен израз"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Необработена информация за зависимостите на даден пакет"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Информация за обратните зависимости на даден пакет"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Показване на записа за пакет"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Списък с имената на всички пакети, за които има информация"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Показване на настройките на политиката"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Четене на списъците с пакети"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Отбити пакети:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Счупени пакети"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Автоматично премахване на всички неизползвани пакети"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "но той е виртуален пакет"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Четене на информацията за състоянието"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Укажете име за този диск, например „Debian 5.0.3 Disk1“"
@@ -987,6 +1022,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторете този процес за останалите дискове от комплекта."
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+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 "Аргументите не са по двойки"
@@ -996,30 +1065,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Употреба: apt-config [опции] команда\n"
-"\n"
-"apt-config е опростен инструмент за четене на конфигурационния файл на APT\n"
-"\n"
-"Команди:\n"
-"   shell - Режим с обвивка\n"
-"   dump - Показва конфигурацията\n"
-"\n"
 "Опции:\n"
 "  -h   Този помощен текст.\n"
 "  -c=? Четене на този конфигурационен файл.\n"
 "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
 "tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1256,24 +1327,17 @@ msgid ""
 "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 ""
+"Употреба: apt-get [опции] команда\n"
+"          apt-get [опции] install|remove пакет1 [пакет2 ...]\n"
+"          apt-get [опции] source пакет1 [пакет2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get е опростен интерфейс за командния ред за изтегляне и\n"
+"инсталиране на пакети. Най-често използваните команди са „update“\n"
+"и „install“.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1292,32 +1356,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Употреба: apt-get [опции] команда\n"
-"          apt-get [опции] install|remove пакет1 [пакет2 ...]\n"
-"          apt-get [опции] source пакет1 [пакет2 ...]\n"
-"\n"
-"apt-get е опростен интерфейс за командния ред за изтегляне и\n"
-"инсталиране на пакети. Най-често използваните команди са „update“\n"
-"и „install“.\n"
-"\n"
-"Команди:\n"
-"   update - Изтегляне на нови списъци с пакети\n"
-"   upgrade - Обновяване на системата\n"
-"   install - Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)\n"
-"   remove - Премахване на пакети\n"
-"   autoremove - Автоматично премахване на всички неизползвани пакети\n"
-"   purge - Премахване на пакети, включително файловете им с настройки\n"
-"   source - Изтегляне на изходен код на пакети\n"
-"   build-dep - Конфигуриране на зависимостите за компилиране на пакети от\n"
-"               изходен код\n"
-"   dist-upgrade - Обновяване на дистрибуцията, вж. apt-get(8)\n"
-"   dselect-upgrade - Следване на избора на dselect\n"
-"   clean - Изтриване на изтеглените файлове\n"
-"   autoclean - Изтриване на стари изтеглени файлове\n"
-"   check - Проверка за неудовлетворени зависимости\n"
-"   changelog - Изтегляне и показване на журнала с промени в даден пакет\n"
-"   download - Изтегляне на двоичен пакет в текущата директория\n"
-"\n"
 "Опции:\n"
 "  -h  Този помощен текст.\n"
 "  -q  Изход на съобщения, подходящи за журнал - без индикатор на напредъка\n"
@@ -1337,6 +1375,62 @@ msgstr ""
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "Изтегляне на нови списъци с пакети"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Обновяване на системата"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Премахване на пакети"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Премахване на пакети, включително файловете им с настройки"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Обновяване на дистрибуцията, вж. apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Следване на избора на dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Конфигуриране на зависимостите за компилиране на пакети от изходен код"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Изтриване на изтеглените файлове"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Изтриване на стари изтеглени файлове"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Проверка за неудовлетворени зависимости"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Изтегляне на изходен код на пакети"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Изтегляне на двоичен пакет в текущата директория"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Изтегляне и показване на журнала с промени в даден пакет"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1361,13 +1455,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1395,11 +1498,9 @@ msgstr "Пакетът „%s“ вече е задуржан.\n"
 msgid "%s was already not hold.\n"
 msgstr "Пакетът „%s“ вече е задържан.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Изчака се завършването на %s, но той не беше пуснат"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1412,26 +1513,35 @@ msgid "Canceled hold on %s.\n"
 msgstr "Отмяна на задържането на пакета „%s“.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+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"
+msgstr ""
+"Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark предоставя команден интерфейс за маркиране на пакети\n"
+"като инсталирани ръчно или автоматично. Предлага се и показване\n"
+"на текущата маркировка.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1442,16 +1552,6 @@ msgid ""
 "  -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 ""
-"Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n"
-"\n"
-"apt-mark предоставя команден интерфейс за маркиране на пакети\n"
-"като инсталирани ръчно или автоматично. Предлага се и показване\n"
-"на текущата маркировка.\n"
-"\n"
-"Команди:\n"
-"   auto — Маркиране на пакети като инсталирани автоматично\n"
-"   manual — Маркиране на пакети като инсталирани ръчно\n"
-"\n"
 "Опции:\n"
 "  -h  Тази помощна информация\n"
 "  -q  Изход без информация за напредъка, подходящ за съхраняване\n"
@@ -1462,6 +1562,34 @@ msgstr ""
 "  -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 "Маркиране на пакети като инсталирани автоматично"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Маркиране на пакети като инсталирани ръчно"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2525,7 +2653,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Изтегляне на файл %li от %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2596,19 +2738,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Директорията %s е отклонена"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Директорията %s е отклонена"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3012,6 +3156,11 @@ msgid ""
 msgstr ""
 "Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Изчака се завършването на %s, но той не беше пуснат"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3728,6 +3877,11 @@ msgstr "Лошо форматиран ред %u в списъка с източ�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
diff --git a/po/bs.po b/po/bs.po
index 8b893ca28..7eec11b13 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -382,6 +382,7 @@ msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -641,7 +642,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr ""
 
@@ -828,29 +829,20 @@ msgstr ""
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+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"
@@ -862,29 +854,92 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Čitam spiskove paketa"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "  Pojedinačni virutuelni paketi:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Oštećeni paketi"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "ali se %s treba instalirati"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Sastavljam dostupne informacije"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -910,6 +965,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumenti nisu u parovima"
@@ -919,29 +998,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Upotreba: apt-config [opcije] naredba\n"
-"\n"
-"apt-config je jednostavni alat za čitanje APT konfiguracijske datoteke\n"
-"\n"
-"Naredbe:\n"
-"   shell - Shell mod\n"
-"   dump - Prikaz konfiguracije\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1154,24 +1235,10 @@ msgid ""
 "apt-get is a simple command line interface for downloading and\n"
 "installing packages. The most frequently used commands are update\n"
 "and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1191,6 +1258,64 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Retrieve new lists of packages"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove packages"
+msgstr "Oštećeni paketi"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1214,13 +1339,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1248,10 +1382,8 @@ msgstr ""
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1265,7 +1397,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1274,16 +1417,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1295,6 +1432,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2271,7 +2440,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Čitam spisak datoteke"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2335,18 +2518,20 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
 #, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
+msgid "The repository '%s' is not signed."
 msgstr ""
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
 #, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
+msgid "The repository '%s' does not have a Release file."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
@@ -2723,6 +2908,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3405,6 +3595,11 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 04d2d3b7e..46d5813dd 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -413,6 +413,7 @@ msgstr[1] ""
 "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Empreu «%s» per a suprimir-lo."
@@ -685,7 +686,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Heu de donar com a mínim un patró de cerca"
 
@@ -870,32 +871,27 @@ msgid "  Version table:"
 msgstr "  Taula de versió:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -906,32 +902,6 @@ msgid ""
 "  -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 ""
-"Forma d'ús: apt-cache [opcions] ordre\n"
-"    apt-cache [opcions] add fitxer1 [fitxer2 …]\n"
-"    apt-cache [opcions] showpkg paquet1 [paquet2 …]\n"
-"    apt-cache [opcions] showsrc 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"
-"\n"
-"Ordres:\n"
-"   gencaches - Crea la memòria cau de paquets i fonts\n"
-"   showpkg - Mostra informació general d'un sol paquet\n"
-"   showsrc - Mostra un registre d'un paquet font\n"
-"   stats - Mostra algunes estadístiques bàsiques\n"
-"   dump - Mostra el fitxer sencer en un format concís\n"
-"   dumpavail - Genera un registre llegible a stdout\n"
-"   unmet - Mostra dependències sense satisfer\n"
-"   search - Cerca en la llista de paquets per un patró d'expressió regular\n"
-"   show - Mostra un registre llegible pel paquet\n"
-"   showauto - Mostra una llista de paquets instaŀlats automàticanent\n"
-"   depends - Mostra informació de dependències (en cru) d'un paquet\n"
-"   rdepends - Mostra informació de dependències inverses d'un paquet\n"
-"   pkgnames - Llista els noms de tots els paquets del sistema\n"
-"   dotty - Genera gràfiques de paquets per a GraphViz\n"
-"   xvcg - Genera gràfiques de paquets per a xvcg\n"
-"   policy - Mostra la configuració de política\n"
-"\n"
 "Opcions:\n"
 "  -h   Aquest text d'ajuda.\n"
 "  -p=? La memòria cau de paquets.\n"
@@ -943,29 +913,91 @@ msgstr ""
 "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"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Cerca en la llista de paquets per un patró d'expressió regular"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Mostra informació de dependències (en cru) d'un paquet"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Mostra informació de dependències inverses d'un paquet"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Mostra un registre llegible pel paquet"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Llista els noms de tots els paquets del sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Mostra la configuració de política"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "S'està llegint la llista de paquets"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Paquets etiquetats:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Paquets trencats"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Suprimeix automàticament tots els paquets en desús"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "S'ha marcat %s com instaŀlat manualment.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "S'està llegint la informació de l'estat"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»"
@@ -992,6 +1024,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Els arguments no són en parells"
@@ -1001,29 +1057,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Forma d'ús: apt-config [opcions] ordre\n"
-"\n"
-"apt-config és una eina simple per llegir el fitxer de configuració d'APT\n"
-"\n"
-"Ordres:\n"
-"   shell - Mode shell\n"
-"   dump - Mostra la configuració\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1254,7 +1312,6 @@ 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"
@@ -1263,24 +1320,17 @@ msgid ""
 "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 ""
+"Forma d'ús:  apt-get [opcions] ordre\n"
+"             apt-get [opcions] install|remove paq1 [paq2 …]\n"
+"             apt-get [opcions] source paq1 [paq2 …]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get és una interfície de línia d'ordres simple per\n"
+"baixar i instaŀlar paquets. Les ordres més freqüents són\n"
+"update i install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1299,33 +1349,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Forma d'ús:  apt-get [opcions] ordre\n"
-"             apt-get [opcions] install|remove paq1 [paq2 …]\n"
-"             apt-get [opcions] source paq1 [paq2 …]\n"
-"\n"
-"apt-get és una interfície de línia d'ordres simple per\n"
-"baixar i instaŀlar paquets. Les ordres més freqüents són\n"
-"update i install.\n"
-"\n"
-"Ordres:\n"
-"   update - Obtén llistes noves dels paquets\n"
-"   upgrade - Realitza una actualització\n"
-"   install - Instaŀla nous paquets (el paquet és libc6, no libc6.deb)\n"
-"   remove - Suprimeix paquets\n"
-"   autoremove - Suprimeix automàticament tots els paquets en desús\n"
-"   purge - Suprimeix i purga paquets\n"
-"   source - Baixa arxius font\n"
-"   build-dep - Configura dependències de construcció pels paquets font\n"
-"   dist-upgrade - Actualitza la distribució, vegeu apt-get(8)\n"
-"   dselect-upgrade - Segueix les seleccions del dselect\n"
-"   clean - Suprimeix els fitxers d'arxiu baixats\n"
-"   autoclean - Suprimeix els fitxers d'arxiu antics baixats\n"
-"   check - Verifica que no hi hagi dependències trencades\n"
-"   markauto - Marca els paquets donats com a instaŀlats automàticament\n"
-"   unmarkauto - Marca els paquets donats com a instaŀlats manualment\n"
-"   changelog - Baixa i mostra el registre de canvis del paquet\n"
-"   download - Baixa el paquet binari al directori actual\n"
-"\n"
 "Opcions:\n"
 "  -h  Aquest text d'ajuda\n"
 "  -q  Sortida enregistrable - sense indicador de progrés\n"
@@ -1345,6 +1368,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Realitza una actualització"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instaŀla nous paquets (el paquet és libc6, no libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Suprimeix paquets"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Suprimeix i purga paquets"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Actualitza la distribució, vegeu apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Segueix les seleccions del dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configura dependències de construcció pels paquets font"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Suprimeix els fitxers d'arxiu baixats"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Suprimeix els fitxers d'arxiu antics baixats"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verifica que no hi hagi dependències trencades"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Baixa arxius font"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Baixa el paquet binari al directori actual"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Baixa i mostra el registre de canvis del paquet"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1369,13 +1448,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1403,11 +1491,9 @@ msgstr "%s ja estava retingut.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ja estava no retingut.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperava %s però no hi era"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "L'execució del dpkg ha fallat. Sou root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1420,8 +1506,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "S'ha cancel·lat la marca de retenció en %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "L'execució del dpkg ha fallat. Sou root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1429,16 +1526,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1450,6 +1541,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "S'ha marcat %s com instaŀlat manualment.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2510,7 +2633,21 @@ msgid "Retrieving file %li of %li"
 msgstr "S'està obtenint el fitxer %li de %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2582,19 +2719,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "El directori %s està desviat"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "El directori %s està desviat"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3002,6 +3141,11 @@ msgstr ""
 "S'està descartant «%s» al directori «%s» perquè té una extensió del nom de "
 "fitxer invàlida"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperava %s però no hi era"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3716,6 +3860,11 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
diff --git a/po/cs.po b/po/cs.po
index 1903cf46e..f7b112dae 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -410,6 +410,7 @@ msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n
 msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Pro jeho odstranění použijte „%s“."
@@ -679,7 +680,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
 
@@ -868,29 +869,24 @@ msgstr "  Tabulka verzí:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -901,29 +897,6 @@ msgid ""
 "  -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 ""
-"Použití: apt-cache [volby] příkaz\n"
-"         apt-cache [volby] showpkg balík1 [balík2 …]\n"
-"         apt-cache [volby] showsrc 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"
-"\n"
-"Příkazy:\n"
-"   gencaches - Vytvoří vyrovnávací paměť balíků i zdrojů\n"
-"   showpkg   - Zobrazí obecné informace o balíku\n"
-"   showsrc   - Zobrazí zdrojové záznamy\n"
-"   stats     - Zobrazí základní statistiky\n"
-"   dump      - Zobrazí celý soubor ve zhuštěné podobě\n"
-"   dumpavail - Vytiskne na výstup dostupné balíky\n"
-"   unmet     - Zobrazí nesplněné závislosti\n"
-"   search    - V seznamu balíků hledá regulární výraz\n"
-"   show      - Zobrazí informace o balíku\n"
-"   depends   - Zobrazí závislosti balíku\n"
-"   rdepends  - Zobrazí reverzní závislosti balíku\n"
-"   pkgnames  - Vypíše jména všech balíků v systému\n"
-"   dotty     - Vygeneruje grafy ve formátu pro GraphViz\n"
-"   xvcg      - Vygeneruje grafy ve formátu pro xvcg\n"
-"   policy    - Zobrazí nastavenou politiku\n"
-"\n"
 "Volby:\n"
 "  -h   Tato nápověda.\n"
 "  -p=? Vyrovnávací paměť balíků.\n"
@@ -934,46 +907,88 @@ msgstr ""
 "  -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"
+msgstr "Zobrazí zdrojové záznamy"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "V seznamu balíků hledá regulární výraz"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Zobrazí závislosti balíku"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Zobrazí reverzní závislosti balíku"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Zobrazí informace o balíku"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Vypíše jména všech balíků v systému"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Zobrazí nastavenou politiku"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Použití: apt [volby] příkaz\n"
 "\n"
 "Řádkové rozhraní pro apt.\n"
-"Základní příkazy:\n"
-" list - vypíše balíky podle jmen\n"
-" search - hledá v popisech balíků\n"
-" show - zobrazí podrobnosti balíku\n"
-"\n"
-" update - aktualizuje seznam dostupných balíků\n"
-"\n"
-" install - nainstaluje balíky\n"
-" remove  - odstraní balíky\n"
-" autoremove - automaticky odstraní nepoužívané balíky\n"
-"\n"
-" upgrade - aktualizuje systém instalací/aktualizací balíků\n"
-" full-upgrade - aktualizuje systém instalací/aktualizací/odstraněním balíků\n"
-"\n"
-" edit-sources - upraví soubor se zdroji balíků\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "vypíše balíky podle jmen"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "hledá v popisech balíků"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "zobrazí podrobnosti balíku"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "nainstaluje balíky"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "odstraní balíky"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "automaticky odstraní nepoužívané balíky"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "aktualizuje seznam dostupných balíků"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "aktualizuje systém instalací/aktualizací balíků"
+
+#: cmdline/apt.cc
+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"
+msgstr "upraví soubor se zdroji balíků"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1003,6 +1018,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Tento proces opakujte pro všechna zbývající média."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
 msgstr "Argumenty nejsou v párech"
@@ -1012,29 +1061,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"Použití: apt-config [volby] příkaz\n"
-"\n"
-"apt-config je jednoduchý nástroj pro čtení konfiguračního souboru APT\n"
-"\n"
-"Příkazy:\n"
-"   shell - Shellový režim\n"
-"   dump  - Zobrazí nastavení\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1265,24 +1316,16 @@ msgid ""
 "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 ""
+"Použití: apt-get [volby] příkaz\n"
+"         apt-get [volby] install|remove balík1 [balík2 …]\n"
+"         apt-get [volby] source balík1 [balík2 …]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get je jednoduché řádkové rozhraní pro stahování a instalování\n"
+"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"
@@ -1301,30 +1344,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Použití: apt-get [volby] příkaz\n"
-"         apt-get [volby] install|remove balík1 [balík2 …]\n"
-"         apt-get [volby] source balík1 [balík2 …]\n"
-"\n"
-"apt-get je jednoduché řádkové rozhraní pro stahování a instalování\n"
-"balíků. Nejpoužívanější příkazy jsou update a install.\n"
-"\n"
-"Příkazy:\n"
-"   update          - Získá seznam nových balíků\n"
-"   upgrade         - Provede aktualizaci\n"
-"   install         - Instaluje nové balíky (balík je libc6, ne libc6.deb)\n"
-"   remove          - Odstraní balíky\n"
-"   autoremove      - Automaticky odstraní nepoužívané balíky\n"
-"   purge           - Odstraní balíky včetně konfiguračních souborů\n"
-"   source          - Stáhne zdrojové archivy\n"
-"   build-dep       - Pro zdrojové balíky nastaví build-dependencies\n"
-"   dist-upgrade    - Aktualizace distribuce, viz apt-get(8)\n"
-"   dselect-upgrade - Řídí se podle výběru v dselectu\n"
-"   clean           - Smaže stažené archivy\n"
-"   autoclean       - Smaže staré stažené archivy\n"
-"   check           - Ověří, zda se nevyskytují porušené závislosti\n"
-"   changelog       - Stáhne a zobrazí seznam změn daného balíku\n"
-"   download        - Stáhne binární balík to aktuálního adresáře\n"
-"\n"
 "Volby:\n"
 "  -h   Tato nápověda\n"
 "  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
@@ -1343,6 +1362,62 @@ msgstr ""
 "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ů"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Provede aktualizaci"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instaluje nové balíky (balík je libc6, ne libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Odstraní balíky"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Odstraní balíky včetně konfiguračních souborů"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Aktualizace distribuce, viz apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Řídí se podle výběru v dselectu"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Pro zdrojové balíky nastaví build-dependencies"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Smaže stažené archivy"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Smaže staré stažené archivy"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Ověří, zda se nevyskytují porušené závislosti"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Stáhne zdrojové archivy"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Stáhne binární balík to aktuálního adresáře"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Stáhne a zobrazí seznam změn daného balíku"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Jako argument vyžaduje jedno URL"
@@ -1366,25 +1441,27 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Použití: apt-helper [volby] příkaz\n"
 "         apt-helper [volby] download-file uri cílová_cesta\n"
 "\n"
 "apt-helper je interní pomocník pro apt\n"
-"\n"
-"Příkazy:\n"
-"   download-file - stáhne zadané uri do cílové cesty\n"
-"   srv-lookup - vyhledá SRV záznam (např. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detekuje proxy pomocí apt.conf\n"
-"\n"
-"                       Tento APT pomocník má schopnosti svatého čehokoliv.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr "vyhledá SRV záznam (např. _http._tcp.ftp.debian.org)"
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "detekuje proxy pomocí apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1411,11 +1488,9 @@ msgstr "%s již byl podržen v aktuální verzi.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s již nebyl držen v aktuální verzi.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Čekali jsme na %s, ale nebyl tam"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Spuštění dpkg selhalo. Jste root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1428,8 +1503,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Podržení balíku %s v aktuální verzi bylo zrušeno.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Spuštění dpkg selhalo. Jste root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1437,16 +1523,14 @@ msgid ""
 "\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 ""
+"Použití: apt-mark [volby] {auto|manual} balík1 [balík2 …]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark je jednoduché řádkové rozhraní pro označování balíků jako\n"
+"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"
@@ -1457,20 +1541,6 @@ msgid ""
 "  -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 ""
-"Použití: apt-mark [volby] {auto|manual} balík1 [balík2 …]\n"
-"\n"
-"apt-mark je jednoduché řádkové rozhraní pro označování balíků jako\n"
-"instalovaných ručně nebo automaticky. Také umí tyto značky vypsat.\n"
-"\n"
-"Příkazy:\n"
-"   auto   - Označí dané balíky jako instalované automaticky\n"
-"   manual - Označí dané balíky jako instalované ručně\n"
-"   hold - Označí balík jako podržený v aktuální verzi\n"
-"   unhold - Zruší podržení balíku v aktuální verzi\n"
-"   showauto - Vypíše seznam balíků instalovaných automaticky\n"
-"   showmanual - Vypíše seznam balíků instalovaných ručně\n"
-"   showhold - Vypíše seznam podržených balíků\n"
-"\n"
 "Volby:\n"
 "  -h   Tato nápověda.\n"
 "  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
@@ -1481,6 +1551,34 @@ msgstr ""
 "  -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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Označí dané balíky jako instalované ručně"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Označí balík jako podržený v aktuální verzi"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Zruší podržení balíku v aktuální verzi"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Vypíše seznam balíků instalovaných automaticky"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Vypíše seznam balíků instalovaných ručně"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Vypíše seznam podržených balíků"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2531,8 +2629,22 @@ msgid "Retrieving file %li of %li"
 msgstr "Stahuje se soubor %li z %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
-msgstr "Pro vynucení aktualizace použijte --allow-insecure-repositories"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
+msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 #, c-format
@@ -2600,22 +2712,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-"Data z „%s“ nejsou podepsaná. Balíky z tohoto repositáře nemohou být ověřeny."
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Repositář „%s“ není podepsán."
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
-"Repositář „%s“ neobsahuje soubor Release. To již není podporováno, "
-"kontaktujte prosím správce repositáře."
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Repositář „%s“ není podepsán."
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -3010,6 +3121,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Čekali jsme na %s, ale nebyl tam"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3709,6 +3825,11 @@ msgstr "Zkomolená část %u v seznamu zdrojů %s (typ)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ „%s“ v části %u v seznamu zdrojů %s není známý"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
@@ -3735,6 +3856,23 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Propočítává se aktualizace"
 
+#~ msgid "Use --allow-insecure-repositories to force the update"
+#~ msgstr "Pro vynucení aktualizace použijte --allow-insecure-repositories"
+
+#~ msgid ""
+#~ "The data from '%s' is not signed. Packages from that repository can not "
+#~ "be authenticated."
+#~ msgstr ""
+#~ "Data z „%s“ nejsou podepsaná. Balíky z tohoto repositáře nemohou být "
+#~ "ověřeny."
+
+#~ msgid ""
+#~ "The repository '%s' does not have a Release file. This is deprecated, "
+#~ "please contact the owner of the repository."
+#~ msgstr ""
+#~ "Repositář „%s“ neobsahuje soubor Release. To již není podporováno, "
+#~ "kontaktujte prosím správce repositáře."
+
 #~ msgid "Child process failed"
 #~ msgstr "Synovský proces selhal"
 
diff --git a/po/cy.po b/po/cy.po
index bfa87eacc..dfc61434c 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -401,6 +401,7 @@ msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -674,7 +675,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
@@ -877,68 +878,27 @@ msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "Defnydd: apt-cache [opsiynnau] gorchymyn\n"
-"         apt-cache [opsiynnau] add ffeil1 [ffeil2 ...]\n"
-"         apt-cache [opsiynnau] showpkg pecyn1 [pecyn2 ...]\n"
-"         apt-cache [opsiynnau] showsrc pecyn1 [pecyn2 ...]\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"
-"\n"
-"Gorchmynion:\n"
-"   add - Ychwanegu ffeil pecyn i'r storfa ffynhonell\n"
-"   gencaches - Adeiladu'r storfeydd pecyn a ffynhonell\n"
-"   showpkg - Dangos gwybodaeth cyffredinol am becyn sengl\n"
-"   showsrc - Dangos cofnodion ffynhonell\n"
-"   stats - Dangos rhyw ystadegau sylfaenol\n"
-"   dump - Dangos y ffeil cyfan mewn ffurf syml\n"
-"   dumpavail - Dangos ffeil argaeledd\n"
-"   unmet - Dangos dibyniaethau heb eu darparu\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\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"
@@ -948,30 +908,94 @@ msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Dangos cofnodion ffynhonell"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
 
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pecynnau wedi eu Pinio:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pecynnau wedi torri"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Yn cyfuno manylion Ar Gael"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -1001,39 +1025,64 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
 #: cmdline/apt-config.cc
-#, fuzzy
 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Defnydd: apt-config [opsiynnau] gorchymyn\n"
-"\n"
-"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
-"\n"
-"Gorchmynion:\n"
-"   shell - Modd plisgyn\n"
-"   dump - Dangod y cyfluniad\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1252,7 +1301,6 @@ 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"
@@ -1261,24 +1309,17 @@ msgid ""
 "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 ""
+"Defnydd: apt-get [opsiynnau] gorchymyn\n"
+"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
+"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
+"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
+"ddefnyddir amlaf.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1297,27 +1338,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Defnydd: apt-get [opsiynnau] gorchymyn\n"
-"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
-"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
-"\n"
-"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
-"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
-"ddefnyddir amlaf.\n"
-"\n"
-"Gorchmynion:\n"
-"   update - Cyrchu rhestrau pecynnau newydd\n"
-"   update - Uwchraddio pecynnau wedi sefydlu\n"
-"   install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
-"   remove - Tynnu pecynnau\n"
-"   source - Lawrlwytho archifau ffynhonell\n"
-"   build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
-"   dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
-"   dselect-upgrade - Dilyn dewisiadau dselect\n"
-"   clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
-"   autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
-"   check - Gwirio fod dim dibyniaethau torredig\n"
-"\n"
 "Opsiynnau:\n"
 "  -h   Y testun cymorth hwn.\n"
 "  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
@@ -1338,6 +1358,62 @@ msgstr ""
 "\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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Uwchraddio pecynnau wedi sefydlu"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Tynnu pecynnau"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Uwchraddio dosraniad, gweler apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Dilyn dewisiadau dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Dileu ffeiliau archif wedi eu lawrlwytho"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Dileu hen ffeiliau archif wedi eu lawrlwytho"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Gwirio fod dim dibyniaethau torredig"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Lawrlwytho archifau ffynhonell"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1362,13 +1438,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1396,11 +1481,9 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 msgid "%s was already not hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1413,7 +1496,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Methwyd agor %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1422,16 +1516,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1443,6 +1531,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2522,7 +2642,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2588,19 +2722,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2994,6 +3130,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3696,6 +3837,11 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 # FIXME: ...file
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
diff --git a/po/da.po b/po/da.po
index 6f1f2b6de..2f51dda80 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -407,6 +407,7 @@ msgstr[1] ""
 "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Brug »%s« til at fjerne den."
@@ -680,7 +681,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regulært udtryk - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Du skal angive mindst ét søgemønster"
 
@@ -872,29 +873,25 @@ msgstr "  Versionstabel:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -905,30 +902,6 @@ msgid ""
 "  -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 ""
-"Brug: apt-cache [tilvalg] kommando\n"
-"      apt-cache [tilvalg] showpkg pakke1 [pakke2 ...]\n"
-"      apt-cache [tilvalg] showsrc 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"
-"\n"
-"Kommandoer:\n"
-"   gencaches - Opbyg både pakke- og kildemellemlageret\n"
-"   showpkg - Vis generelle oplysninger om en enkelt pakke\n"
-"   showsrc - Vis kildetekstposter\n"
-"   stats - Vis nogle grundlæggende statistikker\n"
-"   dump - Vis hele filen i kort form\n"
-"   dumpavail - Udlæs en »available«-fil til standard-ud\n"
-"   unmet - Vis uopfyldte afhængigheder\n"
-"   search - Gennemsøg pakkelisten med et regulært udtryk\n"
-"   show - Vis en læsbar post for pakken\n"
-"   depends - Vis de rå afhængighedsoplysninger for en pakke\n"
-"   rdepends - Vis omvendte afhængighedsoplysninger for en pakke\n"
-"   pkgnames - Vis navnene på alle pakker\n"
-"   dotty - Generér pakkegrafer til GraphViz\n"
-"   xvcg - Generér pakkegrafer til xvcg\n"
-"   policy - Vis policy-indstillinger\n"
-"\n"
 "Tilvalg:\n"
 "  -h   Denne hjælpetekst.\n"
 "  -p=? Pakkemellemlageret.\n"
@@ -939,47 +912,90 @@ msgstr ""
 "  -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"
+msgstr "Vis kildetekstposter"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Gennemsøg pakkelisten med et regulært udtryk"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Vis de rå afhængighedsoplysninger for en pakke"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Vis omvendte afhængighedsoplysninger for en pakke"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Vis en læsbar post for pakken"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Vis navnene på alle pakker"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Vis policy-indstillinger"
+
 #: cmdline/apt.cc
 #, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Brug: apt [tilvalg] kommando\n"
 "\n"
 "CLI for apt.\n"
-"Kommandoer: \n"
-" list - vis pakker baseret på pakkenavn\n"
-" search - søg i pakkebeskrivelser\n"
-" show - vis pakkedetaljer\n"
-"\n"
-" update - opdater listen over tilgængelige pakker\n"
-"\n"
-" install - installer pakker\n"
-" remove - fjern pakker\n"
-"\n"
-" upgrade - opgradere systemet ved at installere/opgradere pakker\n"
-" full-upgrade - opgradere systemet ved at fjerne/installere/opgradere "
-"pakker\n"
-"\n"
-" edit-sources - rediger source-informationsfilen (kildefilen)\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "vis pakker baseret på pakkenavn"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "søg i pakkebeskrivelser"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "vis pakkedetaljer"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "installer pakker"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "fjern pakker"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Afinstaller automatisk alle ubrugte pakker"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "opdater listen over tilgængelige pakker"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "opgradere systemet ved at installere/opgradere pakker"
+
+#: cmdline/apt.cc
+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"
+msgstr "rediger source-informationsfilen (kildefilen)"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1012,6 +1028,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gentag processen for resten af cd'erne i dit sæt."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1021,29 +1072,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Brug: apt-config [tilvalg] kommando\n"
-"\n"
-"apt-config er et simpelt værktøj til at læse APTs opsætningsfil\n"
-"\n"
-"Kommandoer:\n"
-"   shell - Skal-tilstand\n"
-"   dump - Vis opsætningen\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1273,24 +1326,17 @@ msgid ""
 "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 ""
+"Brug: apt-get [tilvalg] kommando\n"
+"      apt-get [tilvalg] install|remove pakke1 [pakke2 ...]\n"
+"      apt-get [tilvalg] source pakke1 [pakke2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get er en simpel kommandolinjegrænseflade til at hente og\n"
+"installere pakker. De hyppigst brugte kommandoer er update og\n"
+"install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1309,31 +1355,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Brug: apt-get [tilvalg] kommando\n"
-"      apt-get [tilvalg] install|remove pakke1 [pakke2 ...]\n"
-"      apt-get [tilvalg] source pakke1 [pakke2 ...]\n"
-"\n"
-"apt-get er en simpel kommandolinjegrænseflade til at hente og\n"
-"installere pakker. De hyppigst brugte kommandoer er update og\n"
-"install.\n"
-"\n"
-"Kommandoer:\n"
-"   update - Hent nye lister over pakker\n"
-"   upgrade - Udfør en opgradering\n"
-"   install - Installer nye pakker (pakke er libc6, ikke libc6.deb)\n"
-"   remove - Afinstaller pakker\n"
-"   autoremove - Afinstaller automatisk alle ubrugte pakker\n"
-"   purge - Fjern pakker og konfigurationsfiler\n"
-"   source - Hent kildetekstarkiver\n"
-"   build-dep - Sæt opbygningsafhængigheder op for kildetekstpakker\n"
-"   dist-upgrade - Distributionsopgradering, se apt-get(8)\n"
-"   dselect-upgrade - Følg valgene fra dselect\n"
-"   clean - Slet hentede arkivfiler\n"
-"   autoclean - Slet gamle hentede arkivfiler\n"
-"   check - Tjek at der ikke er uopfyldte afhængigheder\n"
-"   changelog - Hent og vis ændringsloggen for den angivne pakke\n"
-"   download - Hent den binære pakke til den aktuelle mappe\n"
-"\n"
 "Tilvalg:\n"
 "  -h  Denne hjælpetekst.\n"
 "  -q  Uddata, der kan logges - ingen fremgangsindikator\n"
@@ -1352,6 +1373,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Udfør en opgradering"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installer nye pakker (pakke er libc6, ikke libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Afinstaller pakker"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Fjern pakker og konfigurationsfiler"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Distributionsopgradering, se apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Følg valgene fra dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Sæt opbygningsafhængigheder op for kildetekstpakker"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Slet hentede arkivfiler"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Slet gamle hentede arkivfiler"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Tjek at der ikke er uopfyldte afhængigheder"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Hent kildetekstarkiver"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Hent den binære pakke til den aktuelle mappe"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Hent og vis ændringsloggen for den angivne pakke"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1370,29 +1447,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Brug: apt-helper [tilvalg] kommando\n"
 "      apt-helper [tilvalg] download-file uri target-path\n"
 "\n"
 "apt-helper er et internt hjælpeprogram for apt\n"
-"\n"
-"Kommandoer:\n"
-"   download-file - hent den angivne uri til mål-sti\n"
-"\n"
-"                       Dette APT-hjælpeprogram har Super Meep Powers.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1419,11 +1499,9 @@ msgstr "%s var allerede sat i bero.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s var allerede ikke i bero.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ventede på %s, men den var der ikke"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1436,8 +1514,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Afbrød i bero for %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1445,16 +1534,15 @@ msgid ""
 "\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 ""
+"Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n"
+"som manuelt eller automatisk installeret. Programmet kan også vise\n"
+"markeringerne.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1465,21 +1553,6 @@ msgid ""
 "  -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 ""
-"Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n"
-"\n"
-"apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n"
-"som manuelt eller automatisk installeret. Programmet kan også vise\n"
-"markeringerne.\n"
-"\n"
-"Kommandoer:\n"
-"   auto - Marker de givne pakker som automatisk installeret\n"
-"   manual - Marker de givne pakker som manuelt installeret\n"
-"   hold - Marker en pakke som tilbageholdt\n"
-"   unhold - Fjern tilbageholdelse på pakke\n"
-"   showauto - Vis listen over automatisk installerede pakker\n"
-"   showmanual - Vis listen over manuelt installerede pakker\n"
-"   showhold - Vis listen over tilbageholdte pakker\n"
-"\n"
 "Tilvalg:\n"
 "  -h  Denne hjælpetekst.\n"
 "  -q  Logbar uddata - ingen statusindikator\n"
@@ -1491,6 +1564,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Marker de givne pakker som manuelt installeret"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Marker en pakke som tilbageholdt"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Fjern tilbageholdelse på pakke"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Vis listen over automatisk installerede pakker"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Vis listen over manuelt installerede pakker"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Vis listen over tilbageholdte pakker"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2550,7 +2651,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Henter fil %li ud af %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2621,19 +2736,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Mappen %s er omrokeret"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Mappen %s er omrokeret"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3022,6 +3139,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ventede på %s, men den var der ikke"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3724,6 +3846,11 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen »%s« er ukendt på stanza %u i kildelisten %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du skal have nogle »source«-URI'er i din sources.list"
diff --git a/po/de.po b/po/de.po
index 48ab181a1..be19313aa 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -415,6 +415,7 @@ msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Verwenden Sie »%s«, um es zu entfernen."
@@ -694,7 +695,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Sie müssen mindestens ein Suchmuster angeben"
 
@@ -892,29 +893,25 @@ msgstr "  Versionstabelle:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -925,30 +922,6 @@ msgid ""
 "  -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 ""
-"Aufruf: apt-cache [Optionen] befehl\n"
-"        apt-cache [Optionen] showpkg paket1 [paket2 ...]\n"
-"        apt-cache [Optionen] showsrc paket1 [paket2 ...]\n"
-"\n"
-"apt-cache ist ein untergeordnetes Werkzeug, um Informationen aus den\n"
-"binären Zwischenspeicher-Dateien von APT abzufragen.\n"
-"\n"
-"Befehle:\n"
-"   gencaches – Paket- und Quell-Zwischenspeicher erzeugen\n"
-"   showpkg   – grundsätzliche Informationen eines einzelnen Pakets ausgeben\n"
-"   showsrc   – Aufzeichnungen zu Quellen ausgeben\n"
-"   stats     – einige grundlegenden Statistiken ausgeben\n"
-"   dump      – gesamte Datei in Kurzform ausgeben\n"
-"   dumpavail – Datei verfügbarer Pakete nach stdout ausgeben\n"
-"   unmet     – unerfüllte Abhängigkeiten ausgeben\n"
-"   search    – die Paketliste mittels regulärem Ausdruck durchsuchen\n"
-"   show      – einen lesbaren Datensatz für das Paket ausgeben\n"
-"   depends   – rohe Abhängigkeitsinformationen eines Pakets ausgeben\n"
-"   rdepends  – umgekehrte Abhängigkeitsinformationen eines Pakets ausgeben\n"
-"   pkgnames  – die Namen aller Pakete im System auflisten\n"
-"   dotty     – Paketgraph zur Verwendung mit GraphViz erzeugen\n"
-"   xvcg      – Paketgraph zur Verwendung mit xvcg erzeugen\n"
-"   policy    – Policy-Einstellungen ausgeben\n"
-"\n"
 "Optionen:\n"
 "  -h   dieser Hilfe-Text\n"
 "  -p=? der Paket-Zwischenspeicher\n"
@@ -960,49 +933,90 @@ msgstr ""
 "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"
+msgstr "Aufzeichnungen zu Quellen ausgeben"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "die Paketliste mittels regulärem Ausdruck durchsuchen"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "rohe Abhängigkeitsinformationen eines Pakets ausgeben"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "umgekehrte Abhängigkeitsinformationen eines Pakets ausgeben"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "einen lesbaren Datensatz für das Paket ausgeben"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "die Namen aller Pakete im System auflisten"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Policy-Einstellungen ausgeben"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Aufruf: apt [Optionen] Befehl\n"
 "\n"
 "Befehlszeilen-Schnittstelle (CLI) für apt.\n"
-"Basis-Befehle: \n"
-" list - Pakete basierend auf dem Paketnamen auflisten\n"
-" search - Paketbeschreibungen durchsuchen\n"
-" show - Paketdetails anzeigen\n"
-"\n"
-" update - Liste verfügbarer Pakete aktualisieren\n"
-"\n"
-" install - Pakete installieren\n"
-" remove  - Pakete entfernen\n"
-"\n"
-" upgrade - das System durch Installation/Aktualisierung der Pakete "
-"hochrüsten\n"
-" full-upgrade - das System durch Entfernung/Installation/Aktualisierung der "
-"Pakete\n"
-"                vollständig hochrüsten\n"
-"\n"
-" edit-sources - die Datei für die Paketquellen bearbeiten\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "Pakete basierend auf dem Paketnamen auflisten"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "Paketbeschreibungen durchsuchen"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "Paketdetails anzeigen"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "Pakete installieren"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "Pakete entfernen"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "alle nicht mehr verwendeten Pakete automatisch entfernen"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "Liste verfügbarer Pakete aktualisieren"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "das System durch Installation/Aktualisierung der Pakete hochrüsten"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+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"
+msgstr "die Datei für die Paketquellen bearbeiten"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1042,6 +1056,41 @@ msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1051,30 +1100,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Aufruf: apt-config [optionen] befehl\n"
-"\n"
-"apt-config ist ein einfaches Werkzeug, um die APT-Konfigurationsdatei zu "
-"lesen.\n"
-"\n"
-"Befehle:\n"
-"   shell – Shell-Modus\n"
-"   dump  – Die Konfiguration ausgeben\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1314,24 +1365,17 @@ msgid ""
 "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 ""
+"Aufruf: apt-get [Optionen] befehl\n"
+"        apt-get [Optionen] install|remove paket1 [paket2 ...]\n"
+"        apt-get [Optionen] source paket1 [paket2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get ist ein einfaches Befehlszeilenwerkzeug zum Herunterladen\n"
+"und Installieren von Paketen. Die am häufigsten benutzten Befehle\n"
+"sind update und install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1350,38 +1394,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Aufruf: apt-get [Optionen] befehl\n"
-"        apt-get [Optionen] install|remove paket1 [paket2 ...]\n"
-"        apt-get [Optionen] source paket1 [paket2 ...]\n"
-"\n"
-"apt-get ist ein einfaches Befehlszeilenwerkzeug zum Herunterladen\n"
-"und Installieren von Paketen. Die am häufigsten benutzten Befehle\n"
-"sind update und install.\n"
-"\n"
-"Befehle:\n"
-"  update          – neue Paketinformationen holen\n"
-"  upgrade         – Upgrade (Paketaktualisierung) durchführen\n"
-"  install         – neue Pakete installieren (paket ist libc6, nicht libc6."
-"deb)\n"
-"  remove          – Pakete entfernen\n"
-"  autoremove      – alle nicht mehr verwendeten Pakete automatisch "
-"entfernen\n"
-"  purge           – Pakete vollständig entfernen (inkl. "
-"Konfigurationsdateien)\n"
-"  source          – Quellarchive herunterladen\n"
-"  build-dep       – Bauabhängigkeiten für Quellpakete konfigurieren\n"
-"  dist-upgrade    – Upgrade (Paketaktualisierung) für die komplette\n"
-"                    Distribution durchführen, siehe apt-get(8)\n"
-"  dselect-upgrade – der Auswahl von »dselect« folgen\n"
-"  clean           – heruntergeladene Archive löschen\n"
-"  autoclean       – veraltete heruntergeladene Archive löschen\n"
-"  check           – überprüfen, ob es unerfüllte Abhängigkeiten gibt\n"
-"  changelog       – Änderungsprotokoll für das angegebene Paket "
-"herunterladen\n"
-"                    und anzeigen\n"
-"  download        – das Binärpaket in das aktuelle Verzeichnis "
-"herunterladen\n"
-"\n"
 "Optionen:\n"
 "  -h   dieser Hilfetext\n"
 "  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
@@ -1400,6 +1412,64 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Upgrade (Paketaktualisierung) durchführen"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "neue Pakete installieren (paket ist libc6, nicht libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Pakete entfernen"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Pakete vollständig entfernen (inkl. Konfigurationsdateien)"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr ""
+"Upgrade (Paketaktualisierung) für die komplette Distribution durchführen, "
+"siehe apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "der Auswahl von »dselect« folgen"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Bauabhängigkeiten für Quellpakete konfigurieren"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "heruntergeladene Archive löschen"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "veraltete heruntergeladene Archive löschen"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "überprüfen, ob es unerfüllte Abhängigkeiten gibt"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Quellarchive herunterladen"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "das Binärpaket in das aktuelle Verzeichnis herunterladen"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Änderungsprotokoll für das angegebene Paket herunterladen und anzeigen"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Eine URL als Argument wird benötigt"
@@ -1418,30 +1488,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Aufruf: apt-helper [Optionen] Befehl\n"
 "        apt-helper [Optionen] download-file URI Zielpfad\n"
 "\n"
 "apt-helper ist ein internes Hilfsprogramm für apt.\n"
-"\n"
-"Befehle:\n"
-"   download-file - den angegebenen URI in den Zielpfad herunterladen\n"
-"   auto-detect-proxy - erkennen eines Proxy-Servers mittels apt.conf\n"
-"\n"
-"             Dieses APT-Hilfsprogramm hat Super-Road-Runner-Kräfte.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "erkennen eines Proxy-Servers mittels apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1469,11 +1541,9 @@ msgstr "%s wurde bereits auf Halten gesetzt.\n"
 msgid "%s was already not hold.\n"
 msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1486,8 +1556,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Halten-Markierung für %s entfernt.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1495,16 +1576,15 @@ msgid ""
 "\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 ""
+"Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark ist ein einfaches Befehlszeilenprogramm, um Pakete als manuell\n"
+"oder automatisch installiert zu markieren. Diese Markierungen können auch\n"
+"aufgelistet werden.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1515,21 +1595,6 @@ msgid ""
 "  -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 ""
-"Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n"
-"\n"
-"apt-mark ist ein einfaches Befehlszeilenprogramm, um Pakete als manuell\n"
-"oder automatisch installiert zu markieren. Diese Markierungen können auch\n"
-"aufgelistet werden.\n"
-"\n"
-"Befehle:\n"
-"   auto   – das angegebene Paket als »Automatisch installiert« markieren\n"
-"   manual – das angegebene Paket als »Manuell installiert« markieren\n"
-"   hold - ein Paket als zurückgehalten markieren\n"
-"   unhold - ein Paket als nicht mehr zurückgehalten markieren\n"
-"   showauto - eine Liste aller automatisch installierten Pakete anzeigen\n"
-"   showmanual - eine Liste aller manuell installierten Pakete anzeigen\n"
-"   showhold - eine Liste aller zurückgehaltenen Pakete anzeigen\n"
-"\n"
 "Optionen:\n"
 "  -h   dieser Hilfetext\n"
 "  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
@@ -1541,6 +1606,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "das angegebene Paket als »Manuell installiert« markieren"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "ein Paket als zurückgehalten markieren"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "ein Paket als nicht mehr zurückgehalten markieren"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "eine Liste aller automatisch installierten Pakete anzeigen"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "eine Liste aller manuell installierten Pakete anzeigen"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "eine Liste aller zurückgehaltenen Pakete anzeigen"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2622,7 +2715,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Holen der Datei %li von %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2694,19 +2801,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Das Verzeichnis %s ist umgeleitet."
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Das Verzeichnis %s ist umgeleitet."
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3119,6 +3228,11 @@ msgstr ""
 "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige "
 "Dateinamen-Erweiterung hat."
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3844,6 +3958,11 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ »%s« ist in Absatz %u der Quellliste %s ist unbekannt."
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 6c96e2a8a..1f10b7c02 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -404,6 +404,7 @@ msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འ
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -673,7 +674,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
@@ -861,32 +862,27 @@ msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -897,33 +893,6 @@ msgid ""
 "  -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 ""
-"ལག་ལེན།: apt-cache [options] command\n"
-"       apt-cache [options] add file1 [file2 ...]\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"  apt-cacheའདི་གནས་རིམ་དམའ་དྲག་གི་ལག་ཆས་ APT's binary\n"
-"་ འདྲ་མཛོད་ཡིག་སྣོད་གཡོག་བཀོལ་དོན་ལུ་ལག་ལེན་འཐབ་ནི་དང་་དེ་ཚུ་ནང་ལས་བརྡ་དོན་འདྲི་དཔྱད་འབད་ནིའི་དོན་"
-"ལུ་ཨིན།\n"
-"cache files, and query information from them\n"
-"\n"
-"བརྡ་བཀོད:\n"
-"    add -འདི་གིས་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་འབྱུང་ཁུངས་འདྲ་མཛོད་ལུ་ཁ་སྐོང་རྐྱབས་ཨིན།\n"
-"    gencaches -འདི་གིས་ཐུམ་སྒྲིལ་དང་འབྱུང་ཁུངས་འདྲ་མཛོད་གཉིས་ཆ་རང་བཟོ་བརྩིགས་འབདཝ་ཨིན།\n"
-"    showpkg -འད་གིས་་ཐུམ་སྒྲིལ་རྐྱང་པ་ཅིག་གི་དོན་ལུ་སྤྱིར་བཏང་བརྡ་དོན་དུམ་གྲ་ཅིག་སྟོནམ་ཨིན།\n"
-"    showsrc - འདི་གིས་འབྱུང་ཁུངས་ཀྱི་དྲན་ཐོ་ཚུ་སྟོནམ་ཨིན།\n"
-"   stats -འདི་གིས་ གཞི་རིམ་ཚད་རྩིས་དུམ་གྲ་རེ་སྟོནམ་ཨིན།\n"
-"    dump -འདི་གི་ཡིག་སྣོད་ཧྲིལ་བུ་མདོར་བསྡུས་རྣམཔ་་ཅིག་ནང་སྟོནམ་ཨིན།\n"
-"   dumpavail -འདི་གིས་ཨེསི་ཊི་ཌི་ཕྱི་ཁར་ལུ་ འཐོབ་ཚུགས་པའི་ཡིག་སྣོད་ཚུ་དཔར་བསྐྲུན་འབདཝ་ཨིན།\n"
-"   unmet - འདི་གིས་མ་ཚང་བའི་ རྟེན་འབྲེལ་ཚུ་སྟོནམ་ཨིན།\n"
-"   search -འདི་གིས་ རི་ཇེགསི་དཔེ་གཞི་ཅིག་གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཐོ་ཡིག་དེ་འཚོལ་ཞིབ་འབདཝ་ཨིན།\n"
-"   show - འདི་གིས་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ ལྷག་བཏུབ་པའི་དྲན་ཐོ་ཅིག་སྟོནམ་ཨིན།\n"
-"   depends - འདི་གིས་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ རགས་པ་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་ཅིག་ སྟོནམ་ཨིན།\n"
-"   rdepends - འདི་གིས་ ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ རིམ་ལོག་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་དེ་སྟོནམ་ཨིན།\n"
-"   pkgnames - འདི་གིས་ཐུམ་སྒྲིལ་ཚུ་ཆ་མཉམ་གི་མིང་ཚུ་ཐོ་བཀོད་འབདཝ་ཨིན།\n"
-"   dotty - འདི་གིས་ཚད་ཁྲམ་ཝིསི་གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཚད་ཁྲམ་ཚུ་ བཟོ་བཏོན་འབདཝ་ཨིན།\n"
-"   xvcg - འདི་གིས་ ཨེགསི་ཝི་སི་ཇི་ གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཚད་ཁྲམ་ཚུ་བཟོ་བཏོད་འབདཝ་ཨིན།\n"
-"   policy - འདི་གིས་ སྲིད་བྱུས་སྒྲིག་སྟངས་ཚུ་སྟོནམ་ཨིན།\n"
-"\n"
 "གདམ་ཁ་ཚུ་:\n"
 "  -h   འདི་གིས་ཚིག་ཡིག་ལུ་ཆ་རོགས་འབདཝ་ཨིན།.\n"
 "  -p=? འདི་འབྱུང་ཁུངས་འའདྲ་མཛོད་ཨིན།.\n"
@@ -935,29 +904,92 @@ msgstr ""
 "cache=/tmp\n"
 " ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "འདི་གིས་འབྱུང་ཁུངས་ཀྱི་དྲན་ཐོ་ཚུ་སྟོནམ་ཨིན།"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "འདི་གིས་ རི་ཇེགསི་དཔེ་གཞི་ཅིག་གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཐོ་ཡིག་དེ་འཚོལ་ཞིབ་འབདཝ་ཨིན།"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "འདི་གིས་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ རགས་པ་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་ཅིག་ སྟོནམ་ཨིན།"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "འདི་གིས་ ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ རིམ་ལོག་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་དེ་སྟོནམ་ཨིན།"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "འདི་གིས་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ ལྷག་བཏུབ་པའི་དྲན་ཐོ་ཅིག་སྟོནམ་ཨིན།"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "འདི་གིས་ཐུམ་སྒྲིལ་ཚུ་ཆ་མཉམ་གི་མིང་ཚུ་ཐོ་བཀོད་འབདཝ་ཨིན།"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "འདི་གིས་ སྲིད་བྱུས་སྒྲིག་སྟངས་ཚུ་སྟོནམ་ཨིན།"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -985,6 +1017,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།"
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "སྒྲུབས་རྟགས་ཚུ་ཟུང་ནང་མིན་འདུག"
@@ -994,29 +1050,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"ལག་ལེན:apt-config [གདམ་ཁ་ཚུ་] བརྡ་བཀོད།\n"
-"\n"
-"apt-config་འདི་APT config་ཡིག་སྣོད་ལྷག་ནིའི་དོན་ལུ་འཇམ་སམ་ལག་ཆས་ཅིག་ཨིན།\n"
-"\n"
-"བརྡ་བཀོད་ཚུ:\n"
-"   shell - ཤལ་གྱི་ཐབས་ལམ།\n"
-"   dump - འདི་གིས་རིམ་སྒྲིག་གི་ཐབས་ལམ་འདི་སྟོནམ་ཨིན།\n"
-"\n"
 "གདམ་ཁ་ཚུ:\n"
 "  -h   འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
 "  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
 "  -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1225,7 +1283,6 @@ msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1234,24 +1291,18 @@ msgid ""
 "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 ""
+"ལག་ལེན་:apt-get [options] command\n"
+"apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get འདི་ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་དང་\n"
+"གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་  འཇམ་སམ་བརྡ་བཀོད་གྲལ་ཐིག་གི་ངོས་འདྲ་བ་ཅིག་ཨིན།  མང་ཤོས་རང་་སྦེ་རང་"
+"ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད་ཚུ་\n"
+" དུས་མཐུན་དང་གཞི་བཙུགས་འབད་ནི་དེ་ཨིན།\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1270,30 +1321,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"ལག་ལེན་:apt-get [options] command\n"
-"apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get འདི་ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་དང་\n"
-"གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་  འཇམ་སམ་བརྡ་བཀོད་གྲལ་ཐིག་གི་ངོས་འདྲ་བ་ཅིག་ཨིན།  མང་ཤོས་རང་་སྦེ་རང་"
-"ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད་ཚུ་\n"
-" དུས་མཐུན་དང་གཞི་བཙུགས་འབད་ནི་དེ་ཨིན།\n"
-"\n"
-"བརྡ་བཀོད་ཚུ་:\n"
-"   update - འདི་གིས་ཐུམ་སྒྲིལ་ཚུ་གི་ཐོ་ཡིག་གསརཔ་ཚུ་སླར་འདྲེན་འབདཝ་ཨིན།\n"
-"   upgrade - འདི་གིས་ ཡར་བསྐྱེད་ཀྱི་ལཱ་འགན་ཅིག་འགྲུབ་ཨིན།\n"
-"   install - འདི་གིས་ ཐུམ་སྒྲིལ་(pkg is libc6 not libc6.deb)གསརཔ་་ཚུ་གཞི་བཙུགས་འབདཝ་"
-"ཨིན།\n"
-"   remove -འདི་གིས་ ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏངམ་ཨིན།\n"
-"   source - འདི་གིས་འབྱུང་ཁུངས་ཀྱི་ཡིག་མཛོད་ཚུ་ཕབ་ལེན་འབདཝ་ཨིན།\n"
-"   build-dep - འདི་གིས་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་ཚུ་རིམ་སྒྲིག་འབདཝ་"
-"ཨིན།\n"
-"   dist-upgrade - འདི་གིས་ བགོ་བཀྲམ་འདི་ཡར་བསྐྱེད་འབདཝ་ཨིན། apt-get(8)ལུ་བལྟ།\n"
-"   dselect-upgrade - འདི་གིས་ སེལ་འཐུ་བཤོལ་གྱི་ སེལ་འཐུ་ཚུ་འབདཝ་ཨིན།\n"
-"   clean - འདི་གིས་ ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་མཛོད་ཀྱི་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏངམ་ཨིན།\n"
-"   autoclean -འདི་གིས་ ཕབ་ལེན་འབད་འབདཝ་རྙིངམ་གྱི་ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏངམ་ཨིན།\n"
-"   check - ཆད་པ་འགྱོ་འགྱོ་བའི་རྟེན་འབྲེལ་ཚུ་མེདཔ་སྦེ་བདེན་སྦྱོར་འབདཝ་ཨིན།\n"
-"\n"
 "གདམ་ཁ་ཚུ་:\n"
 "  -h  འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
 "  -q  དྲན་དེབ་འབད་བཏུབ་པའི་ཨའུཊི་པུཊི་ -ཡར་འཕེལ་གྱི་བརྡ་སྟོན་མིན་འདུག\n"
@@ -1301,11 +1328,11 @@ msgstr ""
 "  -d  ཕབ་ལེན་རྐྱངམ་ཅིག་ཨིན་-  གཞི་བཙུགས་ཡང་ན་ཡིག་མཛོད་ཚུ་སྦུང་ཚན་བཟོ་བཤོལ་མ་འབད།\n"
 "  -s  བྱ་བ་མིན་འདུག   གོ་རིམ་མཚུངས་བཟོ་གི་ལས་འགན་འགྲུབ།\n"
 "  -y  འདྲི་དཔྱད་གེ་རང་ལུ་ཨིནམ་སྦེ་ཚོད་དཔག་བཞིནམ་ལས་ནུས་སྤེལ་མ་འབད།\n"
-"  -f ཆིག་སྒྲིལ་ཞིབ་དཔྱད་འདི་འཐུས་ཤོར་བྱུང་པ་ཅིན་ འཕྲོ་མཐུད་འབད་ནི་ལུ་དཔའ་བཅམ།\n"
+"  -f  ཆིག་སྒྲིལ་ཞིབ་དཔྱད་འདི་འཐུས་ཤོར་བྱུང་པ་ཅིན་ འཕྲོ་མཐུད་འབད་ནི་ལུ་དཔའ་བཅམ།\n"
 "  -m  ཡིག་མཛོད་འདི་ཚུ་ག་ཡོད་འཚོལ་མ་ཐོབ་པ་ཅིན་འཕྲོ་མཐུད་ནི་ལུ་དཔའ་བཅམ།\n"
 "  -u  ཡར་བསྐྱེད་བཟོ་ཡོད་པའི་ཐུམ་སྒྲིལ་འདི་ཡང་་སྟོན།\n"
 "  -b  འདི་ལེན་ཚར་བའི་ཤུལ་ལས འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་འདི་བཟོ་བརྩིགས་འབད།\n"
-" -V  བརྡ་དོན་ལེ་ཤཱ་གི་འཐོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན།\n"
+"  -V  བརྡ་དོན་ལེ་ཤཱ་གི་འཐོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན།\n"
 "  -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n"
 "  -o=? མཐུན་སྒྲིག་གདམ་ཁ་གི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་  དཔེན་ན་-o dir::cache=/tmp\n"
 "བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་  sources.list(5) དང་apt."
@@ -1313,6 +1340,62 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "འདི་གིས་ཐུམ་སྒྲིལ་ཚུ་གི་ཐོ་ཡིག་གསརཔ་ཚུ་སླར་འདྲེན་འབདཝ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "འདི་གིས་ ཡར་བསྐྱེད་ཀྱི་ལཱ་འགན་ཅིག་འགྲུབ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "འདི་གིས་ ཐུམ་སྒྲིལ་(pkg is libc6 not libc6.deb)གསརཔ་་ཚུ་གཞི་བཙུགས་འབདཝ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "འདི་གིས་ ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏངམ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "འདི་གིས་ བགོ་བཀྲམ་འདི་ཡར་བསྐྱེད་འབདཝ་ཨིན། apt-get(8)ལུ་བལྟ།"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "འདི་གིས་ སེལ་འཐུ་བཤོལ་གྱི་ སེལ་འཐུ་ཚུ་འབདཝ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "འདི་གིས་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་ཚུ་རིམ་སྒྲིག་འབདཝ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "འདི་གིས་ ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་མཛོད་ཀྱི་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏངམ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "འདི་གིས་ ཕབ་ལེན་འབད་འབདཝ་རྙིངམ་གྱི་ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏངམ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "ཆད་པ་འགྱོ་འགྱོ་བའི་རྟེན་འབྲེལ་ཚུ་མེདཔ་སྦེ་བདེན་སྦྱོར་འབདཝ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "འདི་གིས་འབྱུང་ཁུངས་ཀྱི་ཡིག་མཛོད་ཚུ་ཕབ་ལེན་འབདཝ་ཨིན།"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1337,13 +1420,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1371,11 +1463,9 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི
 msgid "%s was already not hold.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1388,7 +1478,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1397,16 +1498,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1418,6 +1513,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2484,7 +2611,21 @@ msgid "Retrieving file %li of %li"
 msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2550,19 +2691,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2946,6 +3089,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3635,6 +3783,11 @@ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐི
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index f52dca6d5..d3b75ac14 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -418,6 +418,7 @@ msgstr[1] ""
 "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Χρησιμοποιήστε '%s' για να το διαγράψετε."
@@ -688,7 +689,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης"
 
@@ -872,32 +873,28 @@ msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"το 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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -908,34 +905,6 @@ msgid ""
 "  -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 ""
-"Χρήση: apt-cache [επιλογές] εντολή\n"
-"       apt-cache [επιλογές] add file1 [file2 ...]\n"
-"       apt-cache [επιλογές] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [επιλογές] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"το apt-cache είναι ένα χαμηλού επιπέδου εργαλείο που χρησιμοποιείται για \n"
-"το χειρισμό των δυαδικών αρχείων cache του APT, και να εξάγει πληροφορίες\n"
-"από αυτά\n"
-"\n"
-"Εντολές:\n"
-"   add - Προσθέτει ένα αρχείο πακέτου στη cache πηγών\n"
-"   gencaches - Κατασκευή της cache των πακέτων και των πηγών\n"
-"   showpkg - Εμφάνιση μερικών γενικών πληροφοριών για ένα πακέτο\n"
-"   showsrc - Εμφάνιση εγγραφών για πηγαίο πακέτο\n"
-"   stats - Εμφάνιση μερικών βασικών στατιστικών\n"
-"   dump - Εμφάνιση όλου του αρχείου σε περιληπτική μορφή.\n"
-"   dumpavail - Εκτύπωση της λίστας των διαθέσιμων πακέτων στην κανονική "
-"έξοδο\n"
-"   unmet - Εμφάνιση μη ικανοποιούμενων εξαρτήσεων\n"
-"   search - Αναζήτηση στη λίστα πακέτων για αυτή τη κανονική παράσταση\n"
-"   show - Εμφάνιση μιας αναγνώσιμης εγγραφής για το πακέτο\n"
-"   depends - Εμφάνιση των εξαρτήσεων ενός πακέτου\n"
-"   rdepends - Εμφάνιση αντίστροφων εξαρτήσεων ενός πακέτου\n"
-"   pkgnames - Εμφάνιση λίστας με τα ονόματα όλων των πακέτων\n"
-"   dotty - Παραγωγή γραφημάτων πακέτων για το GraphViz\n"
-"   xvcg - Παραγωγή γραφημάτων πακέτων για το xvcg\n"
-"   policy - Εμφάνιση προτεραιοτήτων πηγών\n"
-"\n"
 "Επιλογές:\n"
 "  -h   Αυτό το κείμενο βοήθειας.\n"
 "  -p=? Η cache πακέτων.\n"
@@ -946,29 +915,92 @@ msgstr ""
 "  -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n"
 "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Εμφάνιση εγγραφών για πηγαίο πακέτο"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Αναζήτηση στη λίστα πακέτων για αυτή τη κανονική παράσταση"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Εμφάνιση των εξαρτήσεων ενός πακέτου"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Εμφάνιση αντίστροφων εξαρτήσεων ενός πακέτου"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Εμφάνιση μιας αναγνώσιμης εγγραφής για το πακέτο"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Εμφάνιση λίστας με τα ονόματα όλων των πακέτων"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Εμφάνιση προτεραιοτήτων πηγών"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Ανάγνωση Λιστών Πακέτων"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Καθηλωμένα Πακέτα:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Χαλασμένα πακέτα"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "το %s έχει εγκατασταθεί αυτόματα\n"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -996,6 +1028,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Τα ορίσματα δεν είναι σε ζεύγη"
@@ -1005,29 +1061,27 @@ msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "Χρήση: apt-config [επιλογές] εντολή\n"
 "\n"
 "το apt-config είναι ένα απλό εργαλείο για την ανάγνωση του αρχείου ρυθμίσεων "
 "APT\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\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 ""
+
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
 
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
@@ -1247,7 +1301,6 @@ msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1256,24 +1309,17 @@ msgid ""
 "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 ""
+"Χρήση: apt-get [παράμετροι] εντολή\n"
+"       apt-get [παράμετροι] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [παράμετροι] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"η apt-get είναι μια απλή διασύνδεση για τη μεταφόρτωση και την\n"
+"εγκατάσταση πακέτων. Οι πιο συχνές εντολές είναι η update\n"
+"και η install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1292,27 +1338,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Χρήση: apt-get [παράμετροι] εντολή\n"
-"       apt-get [παράμετροι] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [παράμετροι] source pkg1 [pkg2 ...]\n"
-"\n"
-"η apt-get είναι μια απλή διασύνδεση για τη μεταφόρτωση και την\n"
-"εγκατάσταση πακέτων. Οι πιο συχνές εντολές είναι η update\n"
-"και η install.\n"
-"\n"
-"Εντολές:\n"
-"   update - Ανάκτηση νέων καταλόγων πακέτων\n"
-"   upgrade - Διενέργεια αναβάθμισης\n"
-"   install - Εγκατάσταση νέων πακέτων (χωρίς την επέκταση .deb)\n"
-"   remove - Αφαίρεση πακέτων\n"
-"   source - Μεταφόρτωση πακέτων πηγαίου κώδικα\n"
-"   build-dep - Ρύθμιση εξαρτήσεων χτισίματος για πακέτα πηγαίου κώδικα\n"
-"   dist-upgrade - Αναβάθμιση διανομής, δες το apt-get(8)\n"
-"   dselect-upgrade - Τήρηση των επιλογών του dselect\n"
-"   clean - Καθαρισμός των μεταφορτωμένων αρχείων\n"
-"   autoclean - Καθαρισμός παλαιότερα μεταφορτωμένων αρχείων\n"
-"   check - Εξακρίβωση για τυχόν σπασμένες εξαρτήσεις\n"
-"\n"
 "Παράμετροι:\n"
 "  -h  Αυτό το βοηθητικό κείμενο.\n"
 "  -q  Χωρίς αναλυτική ένδειξη προόδου (κατάλληλο για αποθήκευση της εξόδου)\n"
@@ -1331,6 +1356,62 @@ msgstr ""
 "για περισσότερες πληροφορίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "Ανάκτηση νέων καταλόγων πακέτων"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Διενέργεια αναβάθμισης"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Εγκατάσταση νέων πακέτων (χωρίς την επέκταση .deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Αφαίρεση πακέτων"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Αναβάθμιση διανομής, δες το apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Τήρηση των επιλογών του dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Ρύθμιση εξαρτήσεων χτισίματος για πακέτα πηγαίου κώδικα"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Καθαρισμός των μεταφορτωμένων αρχείων"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Καθαρισμός παλαιότερα μεταφορτωμένων αρχείων"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Εξακρίβωση για τυχόν σπασμένες εξαρτήσεις"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Μεταφόρτωση πακέτων πηγαίου κώδικα"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1357,13 +1438,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1391,11 +1481,9 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 msgid "%s was already not hold.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1408,7 +1496,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Αποτυχία ανοίγματος του %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1417,16 +1516,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1438,6 +1531,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "το %s έχει εγκατασταθεί αυτόματα\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "το %s έχει εγκατασταθεί αυτόματα\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2504,7 +2629,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Λήψη αρχείου %li του %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2569,19 +2708,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Ο φάκελος %s έχει εκτραπεί"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Ο φάκελος %s έχει εκτραπεί"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2976,6 +3117,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3666,6 +3812,11 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
diff --git a/po/es.po b/po/es.po
index 2ccf77317..40a6e5a38 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\n"
 "PO-Revision-Date: 2014-11-20 02:25+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -466,6 +466,7 @@ msgstr[1] ""
 "Se instalaron %lu paquetes de forma automática y ya no son necesarios.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Utilice «%s» para eliminarlo."
@@ -735,7 +736,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación de expresiones regulares - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Debe proporcionar al menos un patrón de búsqueda"
 
@@ -925,29 +926,25 @@ msgstr "  Tabla de versión:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -958,32 +955,6 @@ msgid ""
 "  -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 ""
-"Modo de uso: apt-cache [opciones] orden\n"
-"             apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
-"             apt-cache [opciones] showsrc 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"
-"\n"
-"Órdenes:\n"
-"   gencaches - Crea ambas cachés, la de paquetes y la de fuentes\n"
-"   showpkg - Muestra información general para un único paquete\n"
-"   showsrc - Muestra la información de fuentes\n"
-"   stats - Muestra algunas estadísticas básicas\n"
-"   dump - Muestra el archivo entero en un formato terso\n"
-"   dumpavail - Imprime un fichero disponible a la salida estándar\n"
-"   unmet - Muestra dependencias incumplidas\n"
-"   search - Busca en la lista de paquetes según un patrón de expresión "
-"regular\n"
-"   show - Muestra un registro legible para el paquete\n"
-"   depends - Muestra la información de dependencias en bruto para el "
-"paquete\n"
-"   rdepends - Muestra la información de dependencias inversas del paquete\n"
-"   pkgnames - Lista los nombres de todos los paquetes en el sistema\n"
-"   dotty - Genera gráficas del paquete para GraphViz\n"
-"   xvcg - Genera gráficas del paquete para xvcg\n"
-"   policy - Muestra parámetros de las normas\n"
-"\n"
 "Opciones:\n"
 "  -h   Este texto de ayuda.\n"
 "  -p=? La caché de paquetes.\n"
@@ -995,47 +966,88 @@ msgstr ""
 "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"
+msgstr "Muestra la información de fuentes"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Busca en la lista de paquetes según un patrón de expresión regular"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Muestra la información de dependencias en bruto para el paquete"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Muestra la información de dependencias inversas del paquete"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Muestra un registro legible para el paquete"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Lista los nombres de todos los paquetes en el sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Muestra parámetros de las normas"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Uso: apt [opciones] orden\n"
 "\n"
 "Interfaz de línea de órdenes (CLI) para apt.\n"
-"Órdenes básicas: \n"
-" list - lista los paquetes según los nombres\n"
-" search - busca en las descripciones de los paquetes\n"
-" show - muestra detalles del paquete\n"
-"\n"
-" update - actualiza la lista de paquetes disponibles\n"
-"\n"
-" install - instala paquetes\n"
-" remove  - elimina paquetes\n"
-"\n"
-" upgrade - actualiza el sistema instalando/actualizando paquetes\n"
-" full-upgrade - actualiza el sistema eliminando/instalando/actualizando "
-"paquetes\n"
-"\n"
-" edit-sources - edita el fichero de información de fuentes\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "lista los paquetes según los nombres"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "busca en las descripciones de los paquetes"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "muestra detalles del paquete"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "instala paquetes"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "elimina paquetes"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Elimina automáticamente todos los paquetes sin utilizar"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "actualiza la lista de paquetes disponibles"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "actualiza el sistema instalando/actualizando paquetes"
+
+#: cmdline/apt.cc
+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"
+msgstr "edita el fichero de información de fuentes"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1070,6 +1082,52 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este proceso para el resto de los CDs del conjunto."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1079,31 +1137,33 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Uso: apt-config [opciones] orden\n"
-"\n"
-"apt-config es una herramienta sencilla para leer el archivo de configuración "
-"de APT.\n"
-"\n"
-"Comandos:\n"
-"   shell - Modo shell\n"
-"   dump - Muestra la configuración\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1341,24 +1401,16 @@ msgid ""
 "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 ""
+"Uso: apt-get [opciones] orden\n"
+"     apt-get [opciones] install|remove paq1 [paq2 ...]\n"
+"     apt-get [opciones] source paq1 [paq2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get es una sencilla interfaz de línea de órdenes para descargar e\n"
+"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"
@@ -1377,32 +1429,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Uso: apt-get [opciones] orden\n"
-"     apt-get [opciones] install|remove paq1 [paq2 ...]\n"
-"     apt-get [opciones] source paq1 [paq2 ...]\n"
-"\n"
-"apt-get es una sencilla interfaz de línea de órdenes para descargar e\n"
-"instalar paquetes. Las órdenes más utilizadas son update e install.\n"
-"\n"
-"Órdenes:\n"
-"   update - Descarga nuevas listas de paquetes\n"
-"   upgrade - Realiza una actualización\n"
-"   install - Instala nuevos paquetes (paquete es libc6 y no libc6.deb)\n"
-"   remove - Elimina paquetes\n"
-"   purge  - Elimina y purga paquetes\n"
-"   autoremove - Elimina automáticamente todos los paquetes sin utilizar\n"
-"   source - Descarga archivos fuente\n"
-"   build-dep - Configura las dependencias de construcción para paquetes "
-"fuente\n"
-"   dist-upgrade - Actualiza la distribución, vea apt-get(8)\n"
-"   dselect-upgrade - Sigue las selecciones de dselect\n"
-"   clean - Elimina los archivos descargados\n"
-"   autoclean - Elimina los archivos descargados antiguos\n"
-"   check - Verifica que no haya dependencias incumplidas\n"
-"   changelog - Descarga y muestra el informe de cambios para el paquete "
-"proporcionado\n"
-"   download - Descarga el paquete binario al directorio actual\n"
-"\n"
 "Opciones:\n"
 "  -h  Este texto de ayuda.\n"
 "  -q  Salida registrable - sin indicador de progreso\n"
@@ -1424,6 +1450,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Realiza una actualización"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instala nuevos paquetes (paquete es libc6 y no libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Elimina paquetes"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Elimina y purga paquetes"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Actualiza la distribución, vea apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Sigue las selecciones de dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configura las dependencias de construcción para paquetes fuente"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Elimina los archivos descargados"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Elimina los archivos descargados antiguos"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verifica que no haya dependencias incumplidas"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Descarga archivos fuente"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Descarga el paquete binario al directorio actual"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Descarga y muestra el informe de cambios para el paquete proporcionado"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Se necesita una URL como argumento"
@@ -1442,30 +1524,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Uso: apt-helper [opciones] orden\n"
 "     apt-helper [opciones] fichero-descarga uri ruta-destino\n"
 "\n"
 "apt-helper es un ayudante interno de apt\n"
-"\n"
-"Órdenes:\n"
-"   download-file - descarga la uri proporcionada a la ruta de destino\n"
-"   auto-detect-proxy - detecta el proxy usando apt.conf\n"
-"\n"
-"                       Este Ayudante de APT tiene poderes de Super Llanto.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "detecta el proxy usando apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1492,11 +1576,9 @@ msgstr "%s ya estaba fijado como retenido.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ya no estaba retenido.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Se esperaba %s pero no estaba presente"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Fallo al ejecutar dpkg. ¿Está como superusuario?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1509,8 +1591,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Se ha cancelado la retención de %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Fallo al ejecutar dpkg. ¿Está como superusuario?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1518,16 +1611,15 @@ msgid ""
 "\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 ""
+"Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark es una sencilla interfaz de línea de órdenes para marcar paquetes\n"
+"como instalados manualmente o automáticamente. También puede listar las "
+"marcas.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1538,21 +1630,6 @@ msgid ""
 "  -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 ""
-"Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
-"\n"
-"apt-mark es una sencilla interfaz de línea de órdenes para marcar paquetes\n"
-"como instalados manualmente o automáticamente. También puede listar las "
-"marcas.\n"
-"\n"
-"Órdenes:\n"
-"   auto - Marca los paquetes proporcionados como instalados automáticamente\n"
-"   manual - Marca los paquetes proporcionados como instalados manualmente\n"
-"   hold - Marca el paquete como retenido\n"
-"   unhold - Desmarca un paquete marcado como retenido\n"
-"   showauto - Muestra la lista de paquetes instalados automáticamente\n"
-"   showmanual - Muestra la lista de paquetes instalados manualmente\n"
-"   showhold - Muestra la lista de paquetes retenidos\n"
-"\n"
 "Opciones:\n"
 "  -h  Este texto de ayuda.\n"
 "  -q  Salida registrable - sin indicador de progreso\n"
@@ -1564,6 +1641,34 @@ msgstr ""
 "       -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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Marca los paquetes proporcionados como instalados manualmente"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Marca el paquete como retenido"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Desmarca un paquete marcado como retenido"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Muestra la lista de paquetes instalados automáticamente"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Muestra la lista de paquetes instalados manualmente"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Muestra la lista de paquetes retenidos"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2631,7 +2736,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Descargando fichero %li de %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2704,19 +2823,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "El directorio %s está desviado"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "El directorio %s está desviado"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3129,6 +3250,11 @@ msgstr ""
 "Omitiendo el fichero «%s» del directorio «%s», ya que tiene una extensión de "
 "nombre de fichero no válida"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Se esperaba %s pero no estaba presente"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3842,6 +3968,11 @@ msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tipo «%s» desconocido en el bloque %u de la lista de fuentes %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
@@ -4455,50 +4586,6 @@ msgstr "Calculando la actualización"
 #~ msgid " '"
 #~ 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"
-#~ "and /etc/fstab.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   add - Add a CDROM\n"
-#~ "   ident - Report the identity of a CDROM\n"
-#~ "\n"
-#~ "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"
-#~ "  -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 "Internal error, non-zero counts"
 #~ msgstr "Error interno, cuenta diferentes de cero"
 
diff --git a/po/eu.po b/po/eu.po
index e48e36d01..2b9c5e000 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -408,7 +408,7 @@ msgstr[1] ""
 "behar."
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "'%s' erabili ezabatzeko."
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
@@ -862,32 +862,27 @@ msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -898,31 +893,6 @@ msgid ""
 "  -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 ""
-"Erabilera: apt-cache [aukerak] komandoa\n"
-"           apt-cache [aukerak] add fitxategia1 [fitxategia2 ...]\n"
-"           apt-cache [aukerak] showpkg pak1 [pak2 ...]\n"
-"           apt-cache [aukerak] showsrc pak1 [pak2 ...]\n"
-"\n"
-"APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n"
-"den behe-mailako tresna bat da, apt-cache.\n"
-"\n"
-"Komandoak:\n"
-"   add - Pakete fitxategi bat gehitzen du iturburuko katxean\n"
-"   gencaches - Bi katxeak sortzen ditu: paketeena eta iturburuena\n"
-"   showpkg - Pakete baten informazio orokorra erakusten du\n"
-"   showsrc - Iturburu erregistroak erakusten ditu\n"
-"   stats - Oinarrizko estatistika batzuk erakusten ditu\n"
-"   dump - Fitxategi osoa erakusten du formatu laburrean\n"
-"   dumpavail - Fitxategi erabilgarri bat irteera estandarrean inprimatu\n"
-"   unmet - Bete gabeko mendekotasunak erakusten ditu\n"
-"   search - Adierazpen erregularrak bilatzen ditu pakete zerrendan \n"
-"   show - Paketearen erregistro irakurgarri bat erakusten du\n"
-"   depends - Pakete baten mendekotasunak erakusten ditu\n"
-"   pkgnames - Pakete guztien izenak zerrendatzen ditu\n"
-"   dotty - GraphViz-ekin erabiltzeko pakete grafikoak sortzen ditu\n"
-"   xvcg - xvcg-ekin erabiltzeko pakete grafikoak sortzen ditu\n"
-"   policy - Gidalerroen ezarpenak erakusten ditu\n"
-"\n"
 "Aukerak:\n"
 "  -h   Laguntza testu hau.\n"
 "  -p=? Paketearen katxea.\n"
@@ -933,29 +903,91 @@ msgstr ""
 "  -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"
+msgstr "Iturburu erregistroak erakusten ditu"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Adierazpen erregularrak bilatzen ditu pakete zerrendan"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Pakete baten mendekotasunak erakusten ditu"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Paketearen erregistro irakurgarri bat erakusten du"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Pakete guztien izenak zerrendatzen ditu"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Gidalerroen ezarpenak erakusten ditu"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pin duten Paketeak:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Hautsitako paketeak"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Automatikoki kendu erabiltzen ez diren paketeak"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Egoera argibideak irakurtzen"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -984,6 +1016,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Parekatu gabeko argumentuak"
@@ -993,29 +1049,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Erabilera: apt-config [aukerak] komandoa\n"
-"\n"
-"apt-config APT konfigurazio fitxategia irakurtzeko tresna soil bat da\n"
-"\n"
-"Komandoak:\n"
-"   shell - Shell modua\n"
-"   dump - Konfigurazioa erakusten du\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1229,7 +1287,6 @@ 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"
@@ -1238,24 +1295,17 @@ msgid ""
 "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 ""
+"Erabilera: apt-get [aukerak] komandoa\n"
+"           apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n"
+"           apt-get [aukerak] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get paketeak deskargatu eta instalatzeko komando lerroko interfaze soil\n"
+"bat da. Gehien erabiltzen diren komandoak eguneratzekoa eta instalatzekoa \n"
+"dira: update eta install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1274,29 +1324,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Erabilera: apt-get [aukerak] komandoa\n"
-"           apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n"
-"           apt-get [aukerak] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get paketeak deskargatu eta instalatzeko komando lerroko interfaze soil\n"
-"bat da. Gehien erabiltzen diren komandoak eguneratzekoa eta instalatzekoa \n"
-"dira: update eta install.\n"
-"\n"
-"Komandoak:\n"
-"   update - Eskuratu pakete zerrenda berriak\n"
-"   upgrade - Egin bertsio berritzea\n"
-"   install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n"
-"   remove - Kendu paketeak\n"
-"   autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n"
-"   purge - Paketeak kendu eta garbitu\n"
-"   source - Deskargatu iturburu artxiboak\n"
-"   build-dep - Konfiguratu iturburu paketeen eraikitze dependentziak\n"
-"   dist-upgrade - Banaketaren bertsio berritzea: ikus apt-get(8)\n"
-"   dselect-upgrade - Jarraitu dselect hautapenak\n"
-"   clean - Ezabatu deskargatutako artxibo fitxategiak\n"
-"   autoclean - Ezabatu deskargatutako artxibo fitxategi zaharrak\n"
-"   check - Egiaztatu ez dagoela hautsitako mendekotasunik\n"
-"\n"
 "Aukerak:\n"
 "  -h  Laguntza testu hau.\n"
 "  -q  Egunkarian erregistratzeko irteera - progresio adierazlerik gabe\n"
@@ -1315,6 +1342,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Egin bertsio berritzea"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Kendu paketeak"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Paketeak kendu eta garbitu"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Banaketaren bertsio berritzea: ikus apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Jarraitu dselect hautapenak"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Konfiguratu iturburu paketeen eraikitze dependentziak"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Ezabatu deskargatutako artxibo fitxategiak"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Ezabatu deskargatutako artxibo fitxategi zaharrak"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Egiaztatu ez dagoela hautsitako mendekotasunik"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Deskargatu iturburu artxiboak"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1339,13 +1422,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1373,11 +1465,9 @@ msgstr "%s bertsiorik berriena da jada.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s espero zen baina ez zegoen han"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1390,7 +1480,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Huts egin du %s irekitzean"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1399,16 +1500,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1420,6 +1515,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2479,7 +2606,21 @@ msgid "Retrieving file %li of %li"
 msgstr "%li fitxategia jasotzen %li-tik"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2544,19 +2685,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "%s direktorioa desbideratuta dago"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "%s direktorioa desbideratuta dago"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2944,6 +3087,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s espero zen baina ez zegoen han"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3631,6 +3779,11 @@ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
diff --git a/po/fi.po b/po/fi.po
index 1a7d00881..0991ecdfa 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -409,7 +409,7 @@ msgstr[1] ""
 "vaadittuja:"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Poista ne komennolla \"%s\"."
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "On annettava täsmälleen yksi lauseke"
@@ -860,32 +860,27 @@ msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -896,31 +891,6 @@ msgid ""
 "  -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 ""
-"Käyttö : apt-cache [valitsimet] komento\n"
-"       apt-cache [valitsimet] add tdsto1 [tdsto2 ...]\n"
-"       apt-cache [valitsimet] showpkg pkt1 [pkt2 ...]\n"
-"       apt-cache [valitsimet] showsrc pkt1 [pkt2 ...]\n"
-"\n"
-"apt-cache on alemman tason työkalu APT:n konekielisten\n"
-"välimuistitiedostojen käsittelyyn ja tutkimiseen\n"
-"Komennot:\n"
-"   add - Lisää paketti lähdevälimuistiin\n"
-"   gencaches - Tee sekä pakettivarasto että lähdevälimuisti\n"
-"   showpkg - Näytä joitain perustietoja yhdestä paketista\n"
-"   showsrc - Näytä lähdetietueet\n"
-"   stats - Näytä joitain perustilastoja\n"
-"   dump - Näytä koko tiedosto suppeassa muodossa\n"
-"   dumpavail - Tulosta saatavissa olevien luettelo oletustulosteeseen\n"
-"   unmet - Näytä tyydyttymättömät riippuvuudet\n"
-"   search - Etsi pakettiluettelosta säännöllisellä lausekkeella\n"
-"   show - Näytä paketin tietue luettavassa muodossa\n"
-"   depends - Näytä paketin riippuvuustiedot käsittelemättömässä muodossa\n"
-"   rdepends - Näytä paketin käänteiset riippuvuudet\n"
-"   pkgnames - Luettele järjestelmän kaikkien pakettien nimet\n"
-"   dotty - Tee paketeista graafit GraphViz-muodossa\n"
-"   xvcg - Tee paketeista graafit xvcg-muodossa\n"
-"   policy - Näytä mistä asennuspaketteja haetaan\n"
-"\n"
 "Valitsimet:\n"
 "  -h   Tämä ohje\n"
 "  -p=? Pakettivarasto\n"
@@ -931,29 +901,91 @@ msgstr ""
 "  -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"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Etsi pakettiluettelosta säännöllisellä lausekkeella"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Näytä paketin riippuvuustiedot käsittelemättömässä muodossa"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Näytä paketin käänteiset riippuvuudet"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Näytä paketin tietue luettavassa muodossa"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Luettele järjestelmän kaikkien pakettien nimet"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Näytä mistä asennuspaketteja haetaan"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Luetaan pakettiluetteloita"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Paketit joissa tunniste:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Rikkinäiset paketit"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Poista kaikki käyttämättömät paketit"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Luetaan tilatiedot"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -981,6 +1013,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Toista tämä lopuille rompuille kasassasi."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Parametrit eivät ole pareittain"
@@ -990,29 +1046,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Käyttö: apt-config [valitsimet] komento\n"
-"\n"
-"apt-config on yksinkertainen työkalu APT:n asetustiedoston lukemiseen\n"
-"\n"
-"Komennot:\n"
-"   shell - Muista ohjelmista käytettäväksi\n"
-"   dump - Näytä asetukset\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1225,7 +1283,6 @@ 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"
@@ -1234,24 +1291,17 @@ msgid ""
 "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 ""
+"Käyttö: apt-get [valitsimet] komento\n"
+"       apt-get [valitsimet] install|remove pkt1 [pkt2 ...]\n"
+"       apt-get [valitsimet] source pkt1 [pkt2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get on yksinkertainen komentorivityökalu pakettien noutamiseen\n"
+"ja asentamiseen. Useimmiten käytetyt komennot ovat update ja \n"
+"install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1270,28 +1320,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Käyttö: apt-get [valitsimet] komento\n"
-"       apt-get [valitsimet] install|remove pkt1 [pkt2 ...]\n"
-"       apt-get [valitsimet] source pkt1 [pkt2 ...]\n"
-"\n"
-"apt-get on yksinkertainen komentorivityökalu pakettien noutamiseen\n"
-"ja asentamiseen. Useimmiten käytetyt komennot ovat update ja \n"
-"install.\n"
-"Komennot:\n"
-"   update - Nouda uusi pakettiluettelo\n"
-"   upgrade - Tee päivitys\n"
-"   install - Asenna uusia paketteja (esim. libc6 eikä libc6.deb)\n"
-"   remove - Poista paketteja\n"
-"   autoremove - Poista kaikki käyttämättömät paketit\n"
-"   purge - Poista paketit asennustiedostoineen\n"
-"   source - Nouda lähdekoodiarkistoja\n"
-"   build-dep - Määritä paketointiriippuvuudet lähdekoodipaketeille\n"
-"   dist-upgrade - Koko jakelun päivitys, katso apt-get(8)\n"
-"   dselect-upgrade - Noudata dselect:n valintoja\n"
-"   clean - Poista noudetut pakettitiedostot\n"
-"   autoclean - Poista vanhat noudetut tiedostot\n"
-"   check - Tarkasta ettei ole tyydyttämättömiä riippuvuuksia\n"
-"\n"
 "Valitsimet:\n"
 "  -h  Tämä ohje\n"
 "  -q  Lokiin sopiva tulostus - edistymisen ilmaisin jätetään pois\n"
@@ -1310,6 +1338,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Tee päivitys"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Asenna uusia paketteja (esim. libc6 eikä libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Poista paketteja"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Poista paketit asennustiedostoineen"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Koko jakelun päivitys, katso apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Noudata dselect:n valintoja"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Määritä paketointiriippuvuudet lähdekoodipaketeille"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Poista noudetut pakettitiedostot"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Poista vanhat noudetut tiedostot"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Tarkasta ettei ole tyydyttämättömiä riippuvuuksia"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Nouda lähdekoodiarkistoja"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1334,13 +1418,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1368,11 +1461,9 @@ msgstr "%s on jo uusin versio.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Odotettiin %s, mutta sitä ei ollut"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1385,7 +1476,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1394,16 +1496,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1415,6 +1511,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2475,7 +2603,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Noudetaan tiedosto %li / %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2540,19 +2682,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Kansio %s on korvautunut"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Kansio %s on korvautunut"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2936,6 +3080,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Odotettiin %s, mutta sitä ei ollut"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3622,6 +3771,11 @@ msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
diff --git a/po/fr.po b/po/fr.po
index b931542d6..79d103809 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -425,6 +425,7 @@ msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Veuillez utiliser « %s » pour le supprimer."
@@ -699,7 +700,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir au moins un motif de recherche"
 
@@ -884,29 +885,25 @@ msgstr " Table de version :"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -917,31 +914,6 @@ msgid ""
 "  -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 ""
-"Usage : apt-cache [options] commande\n"
-"        apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"        apt-cache [options] showsrc 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"
-"\n"
-"Commandes :\n"
-"   gencaches - Construit le cache des sources et celui des binaires\n"
-"   showpkg - Affiche quelques informations générales pour un unique paquet\n"
-"   showsrc - Affiche les enregistrements des sources\n"
-"   stats - Affiche quelques statistiques de base\n"
-"   dump - Affiche la totalité des fichiers dans une forme succincte\n"
-"   dumpavail - Affiche une liste de fichiers disponibles sur la sortie "
-"standard\n"
-"   unmet - Affiche les dépendances manquantes\n"
-"   search - Cherche une expression rationnelle dans la liste des paquets\n"
-"   show - Affiche la description du paquet\n"
-"   depends - Affiche toutes les dépendances d'un paquet\n"
-"   rdepends - Affiche les dépendances inverses d'un paquet\n"
-"   pkgnames - Liste le nom de tous les paquets du système\n"
-"   dotty - Génère un graphe des paquets pour GraphViz\n"
-"   xvcg - Génère un graphe des paquets pour xvcg\n"
-"   policy - Affiche l'épinglage (Pin) en vigueur\n"
-"\n"
 "Options :\n"
 "  -h    Ce texte d'aide\n"
 "  -p=?  Le cache des paquets\n"
@@ -955,42 +927,88 @@ msgstr ""
 "plus\n"
 "d'informations.\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Affiche les enregistrements des sources"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Cherche une expression rationnelle dans la liste des paquets"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Affiche toutes les dépendances d'un paquet"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Affiche les dépendances inverses d'un paquet"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Affiche la description du paquet"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Liste le nom de tous les paquets du système"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Affiche l'épinglage (Pin) en vigueur"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Utilisation : apt [options] commande\n"
 "\n"
 "Interface Ligne de Commande (CLI) pour apt.\n"
-"Commandes : \n"
-"list - liste les paquets selon leur nom\n"
-"search - cherche dans les descriptions de paquet\n"
-"show - affiche les détails du paquet\n"
-"\n"
-"update - met à jour la liste des paquets disponibles\n"
-"install - installes les paquets\n"
-"upgrade - met à jour les paquets du système\n"
-"\n"
-"edit-sources - édite le fichier d'information source\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "liste les paquets selon leur nom"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "cherche dans les descriptions de paquet"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "affiche les détails du paquet"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "installes les paquets"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr ""
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Supprime automatiquement les dépendances inutilisés"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "met à jour la liste des paquets disponibles"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr "édite le fichier d'information source"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1027,6 +1045,43 @@ msgstr ""
 "Veuillez répéter cette opération pour tous les disques de votre jeu de "
 "cédéroms."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1036,29 +1091,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Usage : apt-config [options] commande\n"
-"\n"
-"apt-config est un outil simple pour lire le fichier de configuration d'APT\n"
-"\n"
-"Commandes :\n"
-"   shell - Mode console\n"
-"   dump - Affiche la configuration\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1300,24 +1357,17 @@ msgid ""
 "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 ""
+"Usage : apt-get [options] commandes\n"
+"        apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"        apt-get [options] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get est une interface simple en ligne de commande servant à\n"
+"télécharger et à installer des paquets. Les commandes les plus\n"
+"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"
@@ -1336,32 +1386,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Usage : apt-get [options] commandes\n"
-"        apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"        apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get est une interface simple en ligne de commande servant à\n"
-"télécharger et à installer des paquets. Les commandes les plus\n"
-"fréquemment employées sont update et install.\n"
-"\n"
-"Commandes :\n"
-"  update - Récupère les nouvelles listes de paquets\n"
-"  upgrade - Réalise une mise à jour\n"
-"  install - Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)\n"
-"  remove - Supprime des paquets\n"
-"  autoremove - Supprime automatiquement les dépendances inutilisés\n"
-"  purge - Supprime des paquets et leurs fichiers de configuration\n"
-"  source - Télécharge les archives de sources\n"
-"  build-dep - Configure build-dependencies pour les paquets sources\n"
-"  dist-upgrade - Met à jour la distribution, reportez-vous à apt-get(8)\n"
-"  dselect-upgrade - Suit les sélections de dselect\n"
-"  clean - Supprime dans le cache local tous les fichiers téléchargés\n"
-"  autoclean - Supprime dans le cache local les fichiers inutiles\n"
-"  check - Vérifie qu'il n'y a pas de rupture de dépendances\n"
-"  changelog - Télécharge et affiche le journal des modifications\n"
-"              («  changelog ») du paquet indiqué\n"
-"  download - Télécharge le paquet binaire dans le répertoire courant\n"
-"\n"
 "Options :\n"
 "  -h Ce texte d'aide\n"
 "  -q Message de sortie enregistrable - aucun indicateur de progression\n"
@@ -1381,6 +1405,64 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Réalise une mise à jour"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Supprime des paquets"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Supprime des paquets et leurs fichiers de configuration"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Met à jour la distribution, reportez-vous à apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Suit les sélections de dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configure build-dependencies pour les paquets sources"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Supprime dans le cache local tous les fichiers téléchargés"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Supprime dans le cache local les fichiers inutiles"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Vérifie qu'il n'y a pas de rupture de dépendances"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Télécharge les archives de sources"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Télécharge le paquet binaire dans le répertoire courant"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+"Télécharge et affiche le journal des modifications («  changelog ») du "
+"paquet indiqué"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1405,13 +1487,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1439,11 +1530,11 @@ msgstr "%s était déjà marqué comme figé (« hold »).\n"
 msgid "%s was already not hold.\n"
 msgstr "%s était déjà marqué comme non figé.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "A attendu %s mais il n'était pas présent"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+"Échec de l'exécution de dpkg. Possédez-vous les privilèges du "
+"superutilisateur ?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1456,28 +1547,35 @@ msgid "Canceled hold on %s.\n"
 msgstr "Annulation de l'état figé pour %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
-"Échec de l'exécution de dpkg. Possédez-vous les privilèges du "
-"superutilisateur ?"
 
 #: 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"
+msgstr ""
+"Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark est une interface simple, en ligne de commande, qui permet\n"
+"de marquer des paquets comme installés manuellement ou automatiquement.\n"
+"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"
@@ -1488,16 +1586,6 @@ msgid ""
 "  -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 ""
-"Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n"
-"\n"
-"apt-mark est une interface simple, en ligne de commande, qui permet\n"
-"de marquer des paquets comme installés manuellement ou automatiquement.\n"
-"Cette commande permet également d'afficher cet état.\n"
-"\n"
-"Commandes :\n"
-"   auto - marquer les paquets indiqués comme installés automatiquement\n"
-"   manual - marquer les paquets indiqués comme installés manuellement\n"
-"\n"
 "Options:\n"
 "  -h  Affiche la présente aide.\n"
 "  -q  Affichage journalisable - pas de barre de progression\n"
@@ -1511,6 +1599,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "marquer les paquets indiqués comme installés manuellement"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2585,7 +2701,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Téléchargement du fichier %li sur %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2657,19 +2787,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Le répertoire %s est détourné"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Le répertoire %s est détourné"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3091,6 +3223,11 @@ msgstr ""
 "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
 "non valable"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "A attendu %s mais il n'était pas présent"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3814,6 +3951,11 @@ msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 02ebe5ba6..d88702558 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -415,7 +415,7 @@ msgstr[1] ""
 "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Empregue «%s» para eliminalos."
@@ -688,7 +688,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Produciuse un erro na compilación da expresión regular - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Debe fornecer cando menos un patrón de busca"
 
@@ -873,32 +873,27 @@ msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -909,31 +904,6 @@ msgid ""
 "  -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 ""
-"Uso: apt-cache [opcións] orde\n"
-"       apt-cache [opcións] showpkg paquete1 [paquete2 ...]\n"
-"       apt-cache [opcións] showsrc 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"
-"\n"
-"Ordes:\n"
-"   gencaches - Constrúe as caches de paquete e fonte\n"
-"   showpkg - Mostra algunhas informacións xerais dun único paquete\n"
-"   showsrc - Mostra rexistros da fonte\n"
-"   stats - Mostra algunhas estatísticas básicas\n"
-"   dump - Mostra o ficheiro enteiro nun formato concreto\n"
-"   dumpavail - Imprime un ficheiro dispoñíbel para stdout\n"
-"   unmet - Mostra dependencias non atopadas\n"
-"   search - Busca na lista de paquetes por unha expresión regular\n"
-"   show - Mostra un rexistro lexíbel para o paquete\n"
-"   showauto - Mostra unha lista dos paquetes instalados automaticamente\n"
-"   depends - Mostra informacións brutas de dependencia para un paquete\n"
-"   rdepends - Mostra informacións de dependencia inversa para un paquete\n"
-"   pkgnames - Lista os nomes de todos os paquetes no sistema\n"
-"   dotty - Xera gráficos de paquete para o GraphViz\n"
-"   xvcg - Xera gráficos de paquete para o xvcg\n"
-"   policy - Mostra configuracións da política\n"
-"\n"
 "Options:\n"
 "  -h   Este texto de axuda.\n"
 "  -p=? A cache do paquete.\n"
@@ -946,29 +916,91 @@ msgstr ""
 "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"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Busca na lista de paquetes por unha expresión regular"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Mostra informacións brutas de dependencia para un paquete"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Mostra informacións de dependencia inversa para un paquete"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Mostra un rexistro lexíbel para o paquete"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Lista os nomes de todos os paquetes no sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Mostra configuracións da política"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Lendo as listas de paquetes"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Paquetes inmobilizados:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Paquetes estragados"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Retira automaticamente todos os paquetes sen uso"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s cambiado a instalado manualmente.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Lendo a información do estado"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»"
@@ -995,6 +1027,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este proceso para o resto de CD do seu conxunto."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Os argumentos non van en parellas"
@@ -1004,30 +1060,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Uso: apt-config [opcións] orde\n"
-"\n"
-"apt-config é unha ferramenta simple para ler a configuración de APT\n"
-"\n"
-"Ordes:\n"
-"   shell - Modo de intérprete de ordes\n"
-"   dump - Amosa a configuración\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1250,7 +1308,6 @@ 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"
@@ -1259,24 +1316,17 @@ msgid ""
 "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 ""
+"Uso: apt-get [opcións] orde\n"
+"     apt-get [opcións] install|remove paquete1 [paquete2 ...]\n"
+"     apt-get [opcións] source paquete1 [paquete2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get é unha sinxela interface de liña de ordes para a descarga e\n"
+"instalación de paquetes. As ordes empregadas con máis frecuencia\n"
+"son actualizadas e instaladas. \n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1295,34 +1345,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Uso: apt-get [opcións] orde\n"
-"       apt-get [opcións] install|remove paquete1 [paquete2 ...]\n"
-"       apt-get [opcións] source paquete1 [paquete2 ...]\n"
-"\n"
-"apt-get é unha sinxela interface de liña de ordes para a descarga e\n"
-"instalación de paquetes. As ordes empregadas con máis frecuencia\n"
-"son actualizadas e instaladas. \n"
-"\n"
-"Ordes:\n"
-"   update - Recupera unha nova lista de paquetes\n"
-"   upgrade - Executa unha actualización\n"
-"   install - Instala novos paquetes (o paquete é libc6 non libc6.deb)\n"
-"   remove - Retira paquetes\n"
-"   autoremove - Retira automaticamente todos os paquetes sen uso\n"
-"   purge - Retira paquetes e ficheiros de configuración\n"
-"   source - Descarga os arquivos de fontes\n"
-"   build-dep - Configura as dependencias para paquetes de fontes\n"
-"   dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n"
-"   dselect-upgrade - Segue as seleccións de dselect\n"
-"   clean - Borra os arquivos de ficheiros\n"
-"   autoclean - Borra os arquivos de ficheiros antigos\n"
-"   check - Comproba que non haxa dependencias sen cumprir\n"
-"   markauto - Marca os paquetes como instalados automaticamente\n"
-"   unmarkauto - Marca os paquetes como instalados manualmente\n"
-"   changelog - Descarga e mostra o rexistro de cambios para o paquete "
-"proposto\n"
-"   download - Descarga o paquete binario no directorio actual\n"
-"\n"
 "Opçións:\n"
 "  -h  Este texto de axuda\n"
 "  -q  Saída rexistrábel - sen indicador de progreso\n"
@@ -1342,6 +1364,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Executa unha actualización"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instala novos paquetes (o paquete é libc6 non libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Retira paquetes"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Retira paquetes e ficheiros de configuración"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Actualiza a distribución, vexa apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Segue as seleccións de dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configura as dependencias para paquetes de fontes"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Borra os arquivos de ficheiros"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Borra os arquivos de ficheiros antigos"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Comproba que non haxa dependencias sen cumprir"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Descarga os arquivos de fontes"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Descarga o paquete binario no directorio actual"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Descarga e mostra o rexistro de cambios para o paquete proposto"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1366,13 +1444,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1400,11 +1487,9 @@ msgstr "%s xa é a versión máis recente.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Agardouse por %s pero non estaba alí"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1417,7 +1502,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Non foi posíbel abrir %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1426,16 +1522,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1447,6 +1537,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s está estabelecido para a súa instalación automática.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s está estabelecido para a súa instalación automática.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s cambiado a instalado manualmente.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2511,7 +2633,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Obtendo o ficheiro %li de %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2581,19 +2717,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "O directorio %s está desviado"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "O directorio %s está desviado"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3000,6 +3138,11 @@ msgstr ""
 "Ignorando o ficheiro «%s» no directorio «%s» xa que ten  unha extensión de "
 "nome incorrecta"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Agardouse por %s pero non estaba alí"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3712,6 +3855,11 @@ msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
diff --git a/po/hu.po b/po/hu.po
index 12052d815..ceeaa1bbf 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -407,6 +407,7 @@ msgstr[1] ""
 "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Ezt az „%s” paranccsal törölheti."
@@ -678,7 +679,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Legalább egy keresési mintát meg kell adnia"
 
@@ -864,29 +865,25 @@ msgstr "  Verziótáblázat:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -897,30 +894,6 @@ msgid ""
 "  -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 ""
-"Használat: apt-cache [kapcsolók] parancs\n"
-"           apt-cache [kapcsolók] showpkg pkg1 [pkg2 ...]\n"
-"           apt-cache [kapcsolók] showsrc 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"
-"\n"
-"Parancsok: \n"
-"   gencaches - Felépíti a csomag- és a forrás-gyorsítótárat \n"
-"   showpkg - Megjeleníti az általános információkat egy csomagról \n"
-"   showsrc - Megjeleníti a forrásrekordokat\n"
-"   stats - Alapvető statisztikákat jelenít meg\n"
-"   dump - A teljes fájlt megjeleníti tömör formában\n"
-"   dumpavail - Kiír egy elérhető fájlt az stdoutra\n"
-"   unmet - Megjeleníti a teljesítetlen függőségeket\n"
-"   search - A csomaglistában keres reguláris kifejezéseket\n"
-"   show - Megjeleníti a csomag leírását\n"
-"   depends - Nyers függőségi információt mutat a csomagról\n"
-"   rdepends - Fordított függőségi információkat jelenít meg a csomagról\n"
-"   pkgnames - Kilistázza az összes csomag nevét\n"
-"   dotty - GraphVizhez való csomaggrafikonokat generál\n"
-"   xvcg - xvcg-hez való csomaggrafikonokat generál\n"
-"   policy - Megjeleníti a policy beállításokat\n"
-"\n"
 "Kapcsolók:\n"
 "  -h   Ez a súgó szöveg. \n"
 "  -p=? A csomag-gyorsítótár.\n"
@@ -932,29 +905,91 @@ msgstr ""
 "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"
+msgstr "Megjeleníti a forrásrekordokat"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "A csomaglistában keres reguláris kifejezéseket"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Nyers függőségi információt mutat a csomagról"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Fordított függőségi információkat jelenít meg a csomagról"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Megjeleníti a csomag leírását"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Kilistázza az összes csomag nevét"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Megjeleníti a policy beállításokat"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Csomaglisták olvasása"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Rögzített csomagok:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Törött csomagok"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Automatikusan eltávolítja a nem használt csomagokat"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "de az egy virtuális csomag"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Állapotinformációk olvasása"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”"
@@ -981,6 +1016,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ismételje meg a folyamatot készlete többi CD-jével is."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -990,28 +1060,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 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"
-"\n"
-"Parancsok:\n"
-"   shell - Shell mód\n"
-"   dump - Megmutatja a konfigurációt\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1248,24 +1321,16 @@ msgid ""
 "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 ""
+"Használat: apt-get [kapcsolók] parancs\n"
+"           apt-get [kapcsolók] install|remove pkg1 [pkg2 ...]\n"
+"           apt-get [kapcsolók] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"Az apt-get egy egyszerű parancssori felület csomagok letöltéséhez és\n"
+"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"
@@ -1284,30 +1349,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Használat: apt-get [kapcsolók] parancs\n"
-"           apt-get [kapcsolók] install|remove pkg1 [pkg2 ...]\n"
-"           apt-get [kapcsolók] source pkg1 [pkg2 ...]\n"
-"\n"
-"Az apt-get egy egyszerű parancssori felület csomagok letöltéséhez és\n"
-"telepítéséhez. A leggyakrabban használt parancsok az update és az install. \n"
-"\n"
-"Parancsok:\n"
-"   update - Frissíti a csomaglistákat\n"
-"   upgrade - Frissítés végrehajtása\n"
-"   install - Új csomagok telepítése (csomag a libc6 és nem a libc6.deb)\n"
-"   remove - Csomagok eltávolítása\n"
-"   autoremove - Automatikusan eltávolítja a nem használt csomagokat \n"
-"   purge - Eltávolítja és teljesen törli a csomagokat\n"
-"   source - Forrásarchívumok letöltése\n"
-"   build-dep - Forráscsomagok építési függőségét konfigurálja\n"
-"   dist-upgrade - Disztribúciófrissítés, lásd apt-get(8)\n"
-"   dselect-upgrade - Követi a dselect kijelöléseit\n"
-"   clean - Törli a letöltött archívumfájlokat\n"
-"   autoclean - Törli a régi letöltött archívumfájlokat\n"
-"   check - Ellenőrzi, hogy nincsenek-e törött függőségek\n"
-"   changelog - Adott csomag változási naplójának letöltése és megjelenítése\n"
-"   download - Bináris csomag letöltése a jelenlegi mappába\n"
-"\n"
 "Opciók:\n"
 "   -h Ez a súgó szöveg.\n"
 "   -q Naplózható kimenet - nincs folyamatjelző\n"
@@ -1328,6 +1369,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Frissítés végrehajtása"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Új csomagok telepítése (csomag a libc6 és nem a libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Csomagok eltávolítása"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Eltávolítja és teljesen törli a csomagokat"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Disztribúciófrissítés, lásd apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Követi a dselect kijelöléseit"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Forráscsomagok építési függőségét konfigurálja"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Törli a letöltött archívumfájlokat"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Törli a régi letöltött archívumfájlokat"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Ellenőrzi, hogy nincsenek-e törött függőségek"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Forrásarchívumok letöltése"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Bináris csomag letöltése a jelenlegi mappába"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Adott csomag változási naplójának letöltése és megjelenítése"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1353,13 +1450,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1387,11 +1493,9 @@ msgstr "%s már be van állítva visszafogásra.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s eddig sem volt visszafogva.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Nem található a(z) %s, a várakozás után sem"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1404,26 +1508,35 @@ msgid "Canceled hold on %s.\n"
 msgstr "Visszafogás törölve ezen: %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+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"
+msgstr ""
+"Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n"
+"kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket "
+"is.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1434,16 +1547,6 @@ msgid ""
 "  -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 ""
-"Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n"
-"\n"
-"Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n"
-"kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket "
-"is.\n"
-"\n"
-"Parancsok:\n"
-"   auto -Az adott csomagok megjelölése automatikusan telepítettként\n"
-"   manual - Az adott csomagok megjelölése kézzel telepítettként\n"
-"\n"
 "Kapcsolók:\n"
 "  -h  Ez a súgó szöveg.\n"
 "  -q  Naplózható kimenet - nincs folyamatjelző\n"
@@ -1455,6 +1558,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Az adott csomagok megjelölése kézzel telepítettként"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2515,7 +2646,21 @@ msgid "Retrieving file %li of %li"
 msgstr "%li/%li fájl letöltése"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2586,19 +2731,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "A(z) %s könyvtár eltérítve"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "A(z) %s könyvtár eltérítve"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3000,6 +3147,11 @@ msgstr ""
 "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen "
 "fájlkiterjesztése van"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Nem található a(z) %s, a várakozás után sem"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3704,6 +3856,11 @@ msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
diff --git a/po/it.po b/po/it.po
index 9540ddd14..e7cf51435 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -417,6 +417,7 @@ msgstr[1] ""
 "richiesti.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Usare \"%s\" per rimuoverlo."
@@ -689,7 +690,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Errore di compilazione dell'espressione regolare - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "È necessario specificare almeno un modello per la ricerca"
 
@@ -881,29 +882,25 @@ msgstr "  Tabella versione:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -914,32 +911,6 @@ msgid ""
 "  -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 ""
-"Uso: apt-cache [OPZIONI] COMANDO\n"
-"     apt-cache [OPZIONI] showpkg PKG1 [PKG2 ...]\n"
-"     apt-cache [OPZIONI] showsrc 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"
-"\n"
-"Comandi:\n"
-"   gencaches - Costruisce sia la cache dei pacchetti sia quella dei "
-"sorgenti\n"
-"   showpkg - Mostra informazioni generali per un singolo pacchetto\n"
-"   showsrc - Mostra i campi dei sorgenti\n"
-"   stats - Mostra alcune statistiche di base\n"
-"   dump - Mostra il file in forma compatta\n"
-"   dumpavail - Stampa un file \"available\" sullo stdout\n"
-"   unmet - Mostra le dipendenze non soddisfatte\n"
-"   search - Cerca nell'elenco dei pacchetti un'espressione regolare\n"
-"   show - Mostra un campo leggibile per il pacchetto specificato\n"
-"   depends - Mostra informazioni di dipendenza per un pacchetto\n"
-"   rdepends - Mostra informazioni di dipendenza all'incontrario per un "
-"pacchetto\n"
-"   pkgnames - Elenca i nomi di tutti i pacchetti nel sistema\n"
-"   dotty - Genera un grafo dei pacchetti per GraphViz\n"
-"   xvcg - Genera un grafo dei pacchetti per xvcg\n"
-"   policy - Mostra le preferenze adottate\n"
-"\n"
 "Opzioni:\n"
 "  -h   Mostra questo aiuto\n"
 "  -p=? La cache dei pacchetti\n"
@@ -951,48 +922,92 @@ msgstr ""
 "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"
+msgstr "Mostra i campi dei sorgenti"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Cerca nell'elenco dei pacchetti un'espressione regolare"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Mostra informazioni di dipendenza per un pacchetto"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Mostra informazioni di dipendenza all'incontrario per un pacchetto"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Mostra un campo leggibile per il pacchetto specificato"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Elenca i nomi di tutti i pacchetti nel sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Mostra le preferenze adottate"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Uso: apt [OPZIONI] COMANDO\n"
 "\n"
 "Interfaccia a riga di comando per apt.\n"
-"Comandi di base:\n"
-" list         Elenca i pacchetti in base al nome\n"
-" search       Cerca tra le descrizioni dei pacchetti\n"
-" show         Mostra dettagli di un pacchetto\n"
-"\n"
-" update       Aggiorna l'elenco dei pacchetti disponibili\n"
-"\n"
-" install      Installa pacchetti\n"
-" remove       Rimuove pacchetti\n"
-"\n"
-" upgrade      Esegue l'avanzamento di versione del sistema installando e\n"
-"              aggiornando i pacchetti\n"
-" full-upgrade Esegue l'avanzamento di versione del sistema rimuovendo,\n"
-"              installando e aggiornando i pacchetti\n"
-"\n"
-" edit-sources Modifica il file sulle informazioni delle sorgenti\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "Elenca i pacchetti in base al nome"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "Cerca tra le descrizioni dei pacchetti"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "Mostra dettagli di un pacchetto"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "Installa pacchetti"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "Rimuove pacchetti"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Rimuove automaticamente i pacchetti inutilizzati"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "Aggiorna l'elenco dei pacchetti disponibili"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+"Esegue l'avanzamento di versione del sistema installando e aggiornando i "
+"pacchetti"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+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"
+msgstr "Modifica il file sulle informazioni delle sorgenti"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1026,6 +1041,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ripetere questo processo per il resto dei CD."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1035,29 +1085,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Uso: apt-config [OPZIONI] COMANDO\n"
-"\n"
-"apt-config è uno strumento per leggere il file di configurazione di APT\n"
-"\n"
-"Comandi:\n"
-"   shell - Modalità shell\n"
-"   dump - Mostra la configurazione\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1294,24 +1346,16 @@ msgid ""
 "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 ""
+"Uso: apt-get [OPZIONI] COMANDO\n"
+"     apt-get [OPZIONI] install|remove PKG1 [PKG2 ...]\n"
+"     apt-get [OPZIONI] source PKG1 [PKG2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get è una semplice interfaccia a riga di comando per scaricare \n"
+"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"
@@ -1330,32 +1374,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Uso: apt-get [OPZIONI] COMANDO\n"
-"     apt-get [OPZIONI] install|remove PKG1 [PKG2 ...]\n"
-"     apt-get [OPZIONI] source PKG1 [PKG2 ...]\n"
-"\n"
-"apt-get è una semplice interfaccia a riga di comando per scaricare \n"
-"e installare pacchetti. I comandi più usati sono update e install.\n"
-"\n"
-"Comandi:\n"
-"   update - Scarica l'elenco aggiornato dei pacchetti\n"
-"   upgrade - Esegue un aggiornamento dei pacchetti installati\n"
-"   install - Installa nuovi pacchetti (PKG è libc6 non libc6.deb)\n"
-"   remove - Rimuove i pacchetti\n"
-"   autoremove - Rimuove automaticamente i pacchetti inutilizzati\n"
-"   purge - Rimuove i pacchetti e la loro configurazione\n"
-"   source - Scarica i pacchetti sorgente\n"
-"   build-dep - Configura le dipendenze di generazione per i pacchetti "
-"sorgente\n"
-"   dist-upgrade - Esegue un avanzamento della distribuzione, consultare apt-"
-"get(8)\n"
-"   dselect-upgrade - Segue le selezioni di dselect\n"
-"   clean - Elimina i file dei pacchetti scaricati\n"
-"   autoclean - Elimina i vecchi pacchetti scaricati\n"
-"   check - Verifica che non ci siano dipendenze insoddisfatte\n"
-"   changelog - Scarica e visualizza il changelog per il pacchetto indicato\n"
-"   download - Scarica il pacchetto binario nella directory attuale\n"
-"\n"
 "Opzioni:\n"
 "  -h  Mostra questo aiuto\n"
 "  -q  Output registrabile, nessun indicatore di avanzamento\n"
@@ -1375,6 +1393,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Esegue un aggiornamento dei pacchetti installati"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installa nuovi pacchetti (PKG è libc6 non libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Rimuove i pacchetti"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Rimuove i pacchetti e la loro configurazione"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Esegue un avanzamento della distribuzione, consultare apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Segue le selezioni di dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configura le dipendenze di generazione per i pacchetti sorgente"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Elimina i file dei pacchetti scaricati"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Elimina i vecchi pacchetti scaricati"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verifica che non ci siano dipendenze insoddisfatte"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Scarica i pacchetti sorgente"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Scarica il pacchetto binario nella directory attuale"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Scarica e visualizza il changelog per il pacchetto indicato"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Necessario un URL come argomento"
@@ -1393,30 +1467,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Uso: apt-helper [OPZIONI] COMANDO\n"
 "     apt-helper [OPZIONI] download-file uri percorso\n"
 "\n"
 "apt-helper è un programma d'aiuto interno per apt\n"
-"\n"
-"Comandi:\n"
-"   download-file     Scarica l'URI fornito in percorso\n"
-"   auto-detect-proxy Rileva proxy utilizzando apt.conf\n"
-"\n"
-"                           Questo APT ha super poteri.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "Rileva proxy utilizzando apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1443,11 +1519,9 @@ msgstr "%s è già stato impostato come bloccato.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s era già non bloccato.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "In attesa di %s ma non era presente"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1460,8 +1534,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Blocco su %s annullato.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1469,16 +1554,16 @@ msgid ""
 "\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 ""
+"Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark è una semplice interfaccia a riga di comando per segnalare i "
+"pacchetti\n"
+"come installati manualmente o automaticamente. Può anche elencare le "
+"segnalazioni.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1489,22 +1574,6 @@ msgid ""
 "  -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 ""
-"Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n"
-"\n"
-"apt-mark è una semplice interfaccia a riga di comando per segnalare i "
-"pacchetti\n"
-"come installati manualmente o automaticamente. Può anche elencare le "
-"segnalazioni.\n"
-"\n"
-"Comandi:\n"
-"   auto       Segna i pacchetti forniti come installati automaticamente\n"
-"   manual     Segna i pacchetti forniti come installati manualmente\n"
-"   hold       Segna un pacchetto come bloccato a una vecchia versione\n"
-"   unhold     Sblocca un pacchetto bloccato a una vecchia versione\n"
-"   showauto   Stampa l'elenco dei pacchetti installati automaticamente\n"
-"   showmanual Stampa l'elenco dei pacchetti installati manualmente\n"
-"   showhold   Stampa l'elenco dei pacchetti bloccati\n"
-"\n"
 "Opzioni:\n"
 "  -h   Mostra questo aiuto\n"
 "  -q   Output registrabile, nessun indicatore di avanzamento\n"
@@ -1516,6 +1585,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Segna i pacchetti forniti come installati manualmente"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Segna un pacchetto come bloccato a una vecchia versione"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Sblocca un pacchetto bloccato a una vecchia versione"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Stampa l'elenco dei pacchetti installati automaticamente"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Stampa l'elenco dei pacchetti installati manualmente"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Stampa l'elenco dei pacchetti bloccati"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2584,7 +2681,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Scaricamento file %li di %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2655,19 +2766,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "La directory %s è deviata"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "La directory %s è deviata"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3084,6 +3197,11 @@ msgstr ""
 "Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione "
 "non valida"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "In attesa di %s ma non era presente"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3801,6 +3919,11 @@ msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 "Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 35884b454..4729e7c81 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -403,6 +403,7 @@ msgstr[0] ""
 "ん:\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "これを削除するには '%s' を利用してください。"
@@ -675,7 +676,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "検索パターンはちょうど 1 つだけ指定してください"
 
@@ -863,29 +864,25 @@ msgstr "  バージョンテーブル:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -896,30 +893,6 @@ msgid ""
 "  -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 ""
-"使用方法: apt-cache [オプション] コマンド\n"
-"          apt-cache [オプション] showpkg pkg1 [pkg2 ...]\n"
-"          apt-cache [オプション] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache は APT のバイナリキャッシュファイルを操作したり、そこから情\n"
-"報を検索したりするための低レベルのツールです\n"
-"\n"
-"コマンド:\n"
-"   gencaches - パッケージおよびソースキャッシュを生成する\n"
-"   showpkg - 単一パッケージの一般情報を表示する\n"
-"   showsrc - ソースレコードを表示する\n"
-"   stats - 基本ステータス情報を表示する\n"
-"   dump - すべてのファイルを簡単な形式で表示する\n"
-"   dumpavail - available ファイルを標準出力に出力する\n"
-"   unmet - 未解決の依存関係を表示する\n"
-"   search - 正規表現パターンによってパッケージ一覧を検索する\n"
-"   show - パッケージの情報を表示する\n"
-"   depends - パッケージの生の依存情報を表示する\n"
-"   rdepends - パッケージの生の逆依存情報を表示する\n"
-"   pkgnames - システム内のすべてのパッケージ名一覧を表示する\n"
-"   dotty - GraphViz 用のパッケージグラフを生成する\n"
-"   xvcg - xvcg 用のパッケージグラフを生成する\n"
-"   policy - ポリシー設定情報を表示する\n"
-"\n"
 "オプション:\n"
 "  -h   このヘルプを表示する\n"
 "  -p=? パッケージキャッシュ\n"
@@ -930,47 +903,88 @@ msgstr ""
 "  -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n"
 "詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "ソースレコードを表示する"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "正規表現パターンによってパッケージ一覧を検索する"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "パッケージの生の依存情報を表示する"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "パッケージの生の逆依存情報を表示する"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "パッケージの情報を表示する"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "システム内のすべてのパッケージ名一覧を表示する"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "ポリシー設定情報を表示する"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "使用法: apt [オプション] コマンド\n"
 "\n"
 "apt 用コマンドラインインターフェイス\n"
-"基本コマンド: \n"
-" list   - パッケージ名を基にパッケージの一覧を表示\n"
-" search - パッケージの説明を検索\n"
-" show   - パッケージの詳細を表示\n"
-"\n"
-" update - 利用可能パッケージの一覧を更新\n"
-"\n"
-" install - パッケージをインストール\n"
-" remove  - パッケージを削除\n"
-"\n"
-" upgrade - パッケージをインストール/更新してシステムをアップグレード\n"
-" full-upgrade - パッケージを削除/インストール/更新してシステムをアップグレー"
-"ド\n"
-"\n"
-" edit-sources - ソース情報ファイルを編集\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "パッケージ名を基にパッケージの一覧を表示"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "パッケージの説明を検索"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "パッケージの詳細を表示"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "パッケージをインストール"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "パッケージを削除"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "自動インストールされ使われていないすべてのパッケージを削除する"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "利用可能パッケージの一覧を更新"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "パッケージをインストール/更新してシステムをアップグレード"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr "パッケージを削除/インストール/更新してシステムをアップグレード"
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr "ソース情報ファイルを編集"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1005,6 +1019,41 @@ msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。"
 
+#: cmdline/apt-cdrom.cc
+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"
+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 "引数がペアではありません"
@@ -1014,29 +1063,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"使用方法: apt-config [オプション] コマンド\n"
-"\n"
-"apt-config は APT の設定ファイルを読み込むための簡単なツールです\n"
-"\n"
-"コマンド:\n"
-"   shell - シェルモード\n"
-"   dump - 設定情報を表示する\n"
-"\n"
 "オプション:\n"
 "  -h   このヘルプを表示する\n"
 "  -c=? 指定した設定ファイルを読み込む\n"
 "  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1273,24 +1324,18 @@ msgid ""
 "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 ""
+"使用法: apt-get [オプション] コマンド\n"
+"        apt-get [オプション] install|remove パッケージ名1 [パッケージ名"
+"2 ...]\n"
+"        apt-get [オプション] source パッケージ名1 [パッケージ名2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get は、パッケージをダウンロード/インストールするための簡単なコマ\n"
+"ンドラインインタフェースです。もっともよく使われるコマンドは、update \n"
+"と install です。\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1309,35 +1354,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"使用法: apt-get [オプション] コマンド\n"
-"        apt-get [オプション] install|remove パッケージ名1 [パッケージ名"
-"2 ...]\n"
-"        apt-get [オプション] source パッケージ名1 [パッケージ名2 ...]\n"
-"\n"
-"apt-get は、パッケージをダウンロード/インストールするための簡単なコマ\n"
-"ンドラインインタフェースです。もっともよく使われるコマンドは、update \n"
-"と install です。\n"
-"\n"
-"コマンド:\n"
-"   update - 新しいパッケージリストを取得する\n"
-"   upgrade - アップグレードを行う\n"
-"   install - 新規パッケージをインストールする (pkg は libc6.deb ではなく "
-"libc6 のように指定する)\n"
-"   remove - パッケージを削除する\n"
-"   autoremove - 自動インストールされ使われていないすべてのパッケージを削除す"
-"る\n"
-"   purge - 設定ファイルまで含めてパッケージを削除する\n"
-"   source - ソースアーカイブをダウンロードする\n"
-"   build-dep - ソースパッケージの構築依存関係を設定する\n"
-"   dist-upgrade - ディストリビューションをアップグレードする (apt-get(8) を参"
-"照)\n"
-"   dselect-upgrade - dselect の選択に従う\n"
-"   clean - ダウンロードしたアーカイブファイルを削除する\n"
-"   autoclean - ダウンロードした古いアーカイブファイルを削除する\n"
-"   check -  壊れた依存関係がないかチェックする\n"
-"   changelog - 指定のパッケージの変更履歴をダウンロードして表示する\n"
-"   download - バイナリパッケージをカレントディレクトリにダウンロードする\n"
-"\n"
 "オプション:\n"
 "  -h  このヘルプを表示する\n"
 "  -q  ログファイルに出力可能な形式にする - プログレス表示をしない\n"
@@ -1356,6 +1372,64 @@ msgstr ""
 "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 "新しいパッケージリストを取得する"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "アップグレードを行う"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+"新規パッケージをインストールする (pkg は libc6.deb ではなく libc6 のように指"
+"定する)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "パッケージを削除する"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "設定ファイルまで含めてパッケージを削除する"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "ディストリビューションをアップグレードする (apt-get(8) を参照)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "dselect の選択に従う"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "ソースパッケージの構築依存関係を設定する"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "ダウンロードしたアーカイブファイルを削除する"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "ダウンロードした古いアーカイブファイルを削除する"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "壊れた依存関係がないかチェックする"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "ソースアーカイブをダウンロードする"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "バイナリパッケージをカレントディレクトリにダウンロードする"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "指定のパッケージの変更履歴をダウンロードして表示する"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "引数として URL が 1 つ必要です"
@@ -1374,30 +1448,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "使用法: apt-helper [オプション] コマンド\n"
 "        apt-helper [オプション] download-file uri 目標パス\n"
 "\n"
 "apt-helper は apt の内部ヘルパーです\n"
-"\n"
-"コマンド:\n"
-"   download-file - 指定した uri を目標パスにダウンロードする\n"
-"  auto-detect-proxy - apt.conf を使ってプロキシを検出する\n"
-"\n"
-"                この APT helper は Super Meep Powers 化されています。\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 を目標パスにダウンロードする"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "apt.conf を使ってプロキシを検出する"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1424,11 +1500,9 @@ msgstr "%s はすでに保留に設定されています。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s はすでに保留されていません。\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s を待ちましたが、そこにはありませんでした"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1441,8 +1515,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s の保留を解除しました。\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1450,16 +1535,14 @@ msgid ""
 "\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 ""
+"Usage: apt-mark [オプション] {auto|manual} パッケージ1 [パッケージ2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark は、パッケージを手動または自動でインストールされたものとしてマーク\n"
+"する簡単なコマンドラインインターフェイスです。マークの一覧表示もできます。\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1470,22 +1553,6 @@ msgid ""
 "  -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 ""
-"Usage: apt-mark [オプション] {auto|manual} パッケージ1 [パッケージ2 ...]\n"
-"\n"
-"apt-mark は、パッケージを手動または自動でインストールされたものとしてマーク\n"
-"する簡単なコマンドラインインターフェイスです。マークの一覧表示もできます。\n"
-"\n"
-"コマンド:\n"
-"   auto       - 指定のパッケージを自動でインストールされたものとしてマークす"
-"る\n"
-"   manual     - 指定のパッケージを手動でインストールしたものとしてマークす"
-"る\n"
-"   hold       - パッケージを保留としてマークする\n"
-"   unhold     - パッケージの保留を解除する\n"
-"   showauto   - 自動的にインストールされたパッケージの一覧を表示する\n"
-"   showmanual - 手作業でインストールしたパッケージの一覧を表示する\n"
-"   showhold   - 保留されているパッケージの一覧を表示する\n"
-"\n"
 "オプション:\n"
 "  -h  このヘルプを表示する\n"
 "  -q  ログファイルに出力可能な形式にする - プログレス表示をしない\n"
@@ -1497,6 +1564,34 @@ msgstr ""
 "さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参"
 "照してください。"
 
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as automatically installed"
+msgstr "指定のパッケージを自動でインストールされたものとしてマークする"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "指定のパッケージを手動でインストールしたものとしてマークする"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "パッケージを保留としてマークする"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "パッケージの保留を解除する"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "自動的にインストールされたパッケージの一覧を表示する"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "手作業でインストールしたパッケージの一覧を表示する"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "保留されているパッケージの一覧を表示する"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2548,7 +2643,21 @@ msgid "Retrieving file %li of %li"
 msgstr "ファイルを取得しています %li/%li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2620,19 +2729,21 @@ msgstr ""
 "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
 "ました)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "ディレクトリ %s は divert されています"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "ディレクトリ %s は divert されています"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3035,6 +3146,11 @@ msgstr ""
 "ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視"
 "します"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s を待ちましたが、そこにはありませんでした"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3741,6 +3857,11 @@ msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
diff --git a/po/km.po b/po/km.po
index b15cadcdc..8ee41f67b 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -402,6 +402,7 @@ msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹ
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -667,7 +668,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
@@ -854,32 +855,27 @@ msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -890,32 +886,6 @@ msgid ""
 "  -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 ""
-"ការ​ប្រើប្រាស់ ៖ apt-cache [options] ពាក្យ​បញ្ជា\n"
-"       apt-cache [options] add file1 [file2 ...]\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache គឺ​ជា​ឧបករណ៍​កម្រិតទាប​​ដែល​ប្រើ​សម្រាប់​រៀបចំ​ប្រព័ន្ធ​គោល​ពីរ​របស់  APT\n"
-"ឯកសារ​ឃ្លាំង​សម្ងាត់ និង ​ព័ត៌មាន​សំណួរ​ពី​ពួក​វា\n"
-"\n"
-"ពាក្យ​បញ្ជា\n"
-"   add - បន្ថែម​ឯកសារ​កញ្ចប់​ទៅ​ឃ្លាំង​សម្ងាត់​ប្រភព\n"
-"   gencaches - បង្កើត​ទាំង​​កញ្ចប់​និង​ឃ្លាំង​សម្ងាត់​ប្រភព\n"
-"   showpkg - បង្ហាញ​ព័ត៌មាន​ទូទៅ​ខ្លះ​សម្រាប់​កញ្ចប់​តែ​មួយ\n"
-"   showsrc - បង្ហាញ​កំណត់​ត្រា​ប្រភព\n"
-"   stats - បង្ហាញ​ស្ថិតិ​មូលដ្ឋាន​ខ្លះ\n"
-"   dump - បង្ហាញ​ឯកសារ​ទាំងមូល​ក្នុង​ទ្រង់ទ្រាយ​សង្ខេប\n"
-"   dumpavail - បោះពុម្ព​ឯកសារ​ដែល​មាន​ទៅ stdout\n"
-"   unmet - បង្ហាញ​ភាពអាស្រ័យ​ unmet \n"
-"   search - ស្វែងរក​កញ្ចប់​​លំនាំ regex \n"
-"   show - បង្ហាញ​កំណត់​ត្រា​កញ្ចប់​ដែល​អាច​អាន​បាន\n"
-"   depends - បង្ហាញព័ត៌មាន​​ភាពអាស្រ័យ​កញ្ចប់​មិន​ទាន់​ច្នៃ\n"
-"   rdepends - បង្ហាញ​ព័ត៌មាន​ភាពអាស្រ័យ​កញ្ចប់​បញ្ច្រាស់​\n"
-"   pkgnames - រាយ​ឈ្មោះ​កញ្ចប់​ទាំងអស់​\n"
-"   dotty - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ GraphViz\n"
-"   xvcg - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ xvcg\n"
-"   policy - បង្ហាញ ការរៀបចំ​គោលការណ៍​\n"
-"\n"
 "ជម្រើស​ ៖\n"
 "  -h   នេះ​ជា​អត្ថជំនួយ​\n"
 "  -p=? ឃ្លាំងសម្ងាត់​កញ្ចប់​ ។\n"
@@ -926,29 +896,92 @@ msgstr ""
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 "មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "បង្ហាញ​កំណត់​ត្រា​ប្រភព"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "ស្វែងរក​កញ្ចប់​​លំនាំ regex "
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "បង្ហាញព័ត៌មាន​​ភាពអាស្រ័យ​កញ្ចប់​មិន​ទាន់​ច្នៃ"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "បង្ហាញ​ព័ត៌មាន​ភាពអាស្រ័យ​កញ្ចប់​បញ្ច្រាស់​"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "បង្ហាញ​កំណត់​ត្រា​កញ្ចប់​ដែល​អាច​អាន​បាន"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "រាយ​ឈ្មោះ​កញ្ចប់​ទាំងអស់​"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "បង្ហាញ ការរៀបចំ​គោលការណ៍​"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -976,6 +1009,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "​អាគុយម៉ង់​មិន​មាន​គូ​ទេ"
@@ -985,29 +1042,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"ការ​ប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-config [ជម្រើស] \n"
-"\n"
-"apt-config ជា​ឧបករណ៍​សាមញ្ញ​សម្រាប់​អាន​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ APT \n"
-"\n"
-"ពាក្យ​បញ្ជា​ ៖\n"
-"   shell - របៀប​សែល​\n"
-"   dump - បង្ហាញ​ការកំណត់​រចនាសម្ព័ន្ធ​\n"
-"\n"
 "ជម្រើស​\n"
 "  -h   អត្ថនទ​ជំនួយ​នេះ​\n"
 "  -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n"
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1214,7 +1273,6 @@ msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1223,24 +1281,17 @@ msgid ""
 "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 ""
+"របៀបប្រើ ៖ ពាក្យបញ្ជា apt-get [options]\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] ប្រភព pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get គឺជា​ចំណុចប្រទាក់​បន្ទាត់​ពាក្យបញ្ជា​សាមញ្ញ​មួយ សម្រាប់​ធ្វើការទាញយក និង\n"
+"ដំឡើង​កញ្ចប់ ។ ជាញឹកញាប់​បំផុត គឺប្រើ​ពាក្យបញ្ជា​ដើម្បី​ធ្វើឲ្យទាន់សម័យ​\n"
+"និង ដំឡើង ។\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1259,27 +1310,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"របៀបប្រើ ៖ ពាក្យបញ្ជា apt-get [options]\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] ប្រភព pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get គឺជា​ចំណុចប្រទាក់​បន្ទាត់​ពាក្យបញ្ជា​សាមញ្ញ​មួយ សម្រាប់​ធ្វើការទាញយក និង\n"
-"ដំឡើង​កញ្ចប់ ។ ជាញឹកញាប់​បំផុត គឺប្រើ​ពាក្យបញ្ជា​ដើម្បី​ធ្វើឲ្យទាន់សម័យ​\n"
-"និង ដំឡើង ។\n"
-"\n"
-"ពាក្យ​បញ្ជា ៖\n"
-"   update - ទៅយក​បញ្ជី​កញ្ចប់​ថ្មី\n"
-"   upgrade - ធ្វើឲ្យប្រសើរ\n"
-"   install - ដំឡើង​កញ្ចប់​ថ្មី (pkg គឺ libc6 មិនមែន libc6.deb)\n"
-"   remove - យក​កញ្ចប់​ចេញ\n"
-"   source - ទាញយក​ប័ណ្ណសារ​ប្រភព\n"
-"   build-dep - កំណត់​រចនា​សម្ព័ន្ធ​ភាពអាស្រ័យ​ក្នុងការស្ថាបនា​សម្រាប់​កញ្ចប់​ប្រភព\n"
-"   dist-upgrade - ការចែកចាយ​ភាពល្អប្រសើរ សូមមើល apt-get(8)\n"
-"   dselect-upgrade - ដាក់ពីក្រោយ​ជម្រើស dselect\n"
-"   clean - លុប​ឯកសារប័ណ្ណសារ​ដែលបានទាញ​យក\n"
-"   autoclean - លុប​ឯកសារប័ណ្ណសារ​ដែលបានទាញយក​ចាស់\n"
-"   check - ផ្ទៀងផ្ទាត់​ថា​មិនមានភាព​អាស្រ័យ​ដែល​ខូចទេ\n"
-"\n"
 "ជម្រើស ៖\n"
 "  -h  អត្ថបទ​ជំនួយ​នេះ ៖\n"
 "  -q  ទិន្នផល​ដែល​អាច​ចុះកំណត់ហេតុបាន - មិនមាន​ទ្រនិចបង្ហាញ​ដំណើរការឡើយ\n"
@@ -1298,6 +1328,62 @@ msgstr ""
 "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 "ទៅយក​បញ្ជី​កញ្ចប់​ថ្មី"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "ធ្វើឲ្យប្រសើរ"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "ដំឡើង​កញ្ចប់​ថ្មី (pkg គឺ libc6 មិនមែន libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "យក​កញ្ចប់​ចេញ"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "ការចែកចាយ​ភាពល្អប្រសើរ សូមមើល apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "ដាក់ពីក្រោយ​ជម្រើស dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "កំណត់​រចនា​សម្ព័ន្ធ​ភាពអាស្រ័យ​ក្នុងការស្ថាបនា​សម្រាប់​កញ្ចប់​ប្រភព"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "លុប​ឯកសារប័ណ្ណសារ​ដែលបានទាញ​យក"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "លុប​ឯកសារប័ណ្ណសារ​ដែលបានទាញយក​ចាស់"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "ផ្ទៀងផ្ទាត់​ថា​មិនមានភាព​អាស្រ័យ​ដែល​ខូចទេ"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "ទាញយក​ប័ណ្ណសារ​ប្រភព"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1322,13 +1408,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1356,11 +1451,9 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ
 msgid "%s was already not hold.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1373,7 +1466,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1382,16 +1486,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1403,6 +1501,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2453,7 +2583,21 @@ msgid "Retrieving file %li of %li"
 msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2519,19 +2663,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2911,6 +3057,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3597,6 +3748,11 @@ msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
diff --git a/po/ko.po b/po/ko.po
index 8e6cb3508..0a8f308cb 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -398,7 +398,7 @@ msgid_plural ""
 msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "이들을 지우려면 '%s'를 사용하십시오."
@@ -668,7 +668,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "최소 한 개의 검색어를 지정해야 합니다"
 
@@ -849,32 +849,27 @@ msgid "  Version table:"
 msgstr "  버전 테이블:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -885,33 +880,6 @@ msgid ""
 "  -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 ""
-"사용법: apt-cache [옵션] 명령\n"
-"        apt-cache [옵션] add 파일1 [파일2 ...]\n"
-"        apt-cache [옵션] showpkg 패키지1 [패키지2 ...]\n"
-"        apt-cache [옵션] showsrc 패키지1 [패키지2 ...]\n"
-"\n"
-"apt-cache는 APT의 바이너리 캐시 파일을 처리하고, 캐시 파일에\n"
-"정보를 질의하는 저수준 도구입니다.\n"
-"\n"
-"명령:\n"
-"   add - 소스 캐시에 패키지 파일을 추가합니다\n"
-"   gencaches - 패키지 캐시 및 소스 캐시를 만듭니다\n"
-"   showpkg - 한 개의 패키지에 대한 일반적인 정보를 봅니다\n"
-"   showsrc - 소스 기록을 봅니다\n"
-"   stats - 기본적인 통계를 봅니다\n"
-"   dump - 전체 파일을 간략한 형태로 봅니다\n"
-"   dumpavail - 사용 가능한 파일을 표준출력에 표시합니다\n"
-"   unmet - 맞지 않는 의존성을 봅니다\n"
-"   search - 정규식 패턴에 맞는 패키지 목록을 찾습니다\n"
-"   show - 패키지에 대해 읽을 수 있는 기록을 봅니다\n"
-"   showauto - 자동으로 설치한 패키지 목록을 표시합니다\n"
-"   depends - 패키지에 대해 의존성 정보를 그대로 봅니다\n"
-"   rdepends - 패키지의 역 의존성 정보를 봅니다\n"
-"   pkgnames - 시스템에 들어 있는 패키지의 이름을 모두 봅니다\n"
-"   dotty - GraphViz용 패키지 그래프를 만듭니다\n"
-"   xvcg - xvcg용 패키지 그래프를 만듭니다\n"
-"   policy - 정책 설정을 봅니다\n"
-"\n"
 "옵션:\n"
 "  -h   이 도움말.\n"
 "  -p=? 패키지 캐시.\n"
@@ -922,29 +890,91 @@ msgstr ""
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "소스 기록을 봅니다"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "정규식 패턴에 맞는 패키지 목록을 찾습니다"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "패키지에 대해 의존성 정보를 그대로 봅니다"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "패키지의 역 의존성 정보를 봅니다"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "패키지에 대해 읽을 수 있는 기록을 봅니다"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "시스템에 들어 있는 패키지의 이름을 모두 봅니다"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "정책 설정을 봅니다"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "패키지 목록을 읽는 중입니다"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "핀 패키지:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "망가진 패키지"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "사용하지 않는 패키지를 자동으로 전부 지웁니다"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s 패키지 수동설치로 지정합니다.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "상태 정보를 읽는 중입니다"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')"
@@ -971,6 +1001,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "인수가 두 개가 아닙니다"
@@ -980,29 +1034,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"사용법: apt-config [옵션] 명령\n"
-"\n"
-"apt-config는 APT 설정 파일을 읽는 간단한 프로그램입니다\n"
-"\n"
-"명령:\n"
-"   shell - 쉘 모드\n"
-"   dump - 설정을 봅니다\n"
-"\n"
 "옵션:\n"
 "  -h   이 도움말.\n"
 "  -c=? 해당 설정 파일을 읽습니다\n"
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1222,7 +1278,6 @@ msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1231,24 +1286,16 @@ msgid ""
 "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 ""
+"사용법: apt-get [옵션] 명령어\n"
+"        apt-get [옵션] install|remove 패키지1 [패키지2 ...]\n"
+"        apt-get [옵션] source 패키지1 [패키지2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get은 패키지를 내려받고 설치하는 간단한 명령행 인터페이스입니다.\n"
+"가장 자주 사용하는 명령은 update와 install입니다.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1267,30 +1314,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"사용법: apt-get [옵션] 명령어\n"
-"        apt-get [옵션] install|remove 패키지1 [패키지2 ...]\n"
-"        apt-get [옵션] source 패키지1 [패키지2 ...]\n"
-"\n"
-"apt-get은 패키지를 내려받고 설치하는 간단한 명령행 인터페이스입니다.\n"
-"가장 자주 사용하는 명령은 update와 install입니다.\n"
-"\n"
-"명령어:\n"
-"   update - 패키지 목록을 새로 가져옵니다\n"
-"   upgrade - 업그레이드를 합니다\n"
-"   install - 새 패키지를 설치합니다 (패키지는 libc6 식으로. libc6.deb 아님)\n"
-"   remove - 패키지를 지웁니다\n"
-"   autoremove - 사용하지 않는 패키지를 자동으로 전부 지웁니다\n"
-"   purge - 패키지를 완전히 지웁니다\n"
-"   source - 소스 아카이브를 다운로드합니다\n"
-"   build-dep - 소스 패키지의 빌드 의존성을 설정합니다\n"
-"   dist-upgrade - 배포판 업그레이드, apt-get(8) 참고\n"
-"   dselect-upgrade - dselect에서 선택한 걸 따릅니다\n"
-"   clean - 내려받은 아카이브 파일들을 지웁니다\n"
-"   autoclean - 과거에 내려받은 아카이브 파일들을 지웁니다\n"
-"   check - 의존성이 망가지지 않았는지 확인합니다\n"
-"   markauto - 패키지를 자동 설치로 표시합니다\n"
-"   unmarkauto - 패키지를 수동 설치로 표시합니다\n"
-"\n"
 "옵션:\n"
 "  -h  이 도움말.\n"
 "  -q  기록 가능한 출력 - 진행 상황 표시를 하지 않습니다\n"
@@ -1309,6 +1332,62 @@ msgstr ""
 "apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 "                       이 APT는 Super Cow Powers로 무장했습니다.\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "패키지 목록을 새로 가져옵니다"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "업그레이드를 합니다"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "새 패키지를 설치합니다 (패키지는 libc6 식으로. libc6.deb 아님)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "패키지를 지웁니다"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "패키지를 완전히 지웁니다"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "배포판 업그레이드, apt-get(8) 참고"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "dselect에서 선택한 걸 따릅니다"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "소스 패키지의 빌드 의존성을 설정합니다"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "내려받은 아카이브 파일들을 지웁니다"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "과거에 내려받은 아카이브 파일들을 지웁니다"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "의존성이 망가지지 않았는지 확인합니다"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "소스 아카이브를 다운로드합니다"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1333,13 +1412,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1367,11 +1455,9 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1384,7 +1470,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s 파일을 여는데 실패했습니다"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1393,16 +1490,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1414,6 +1505,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s 패키지는 수동설치로 지정합니다.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s 패키지는 수동설치로 지정합니다.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s 패키지 수동설치로 지정합니다.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2467,7 +2590,21 @@ msgid "Retrieving file %li of %li"
 msgstr "파일 받아오는 중: %2$li 중 %1$li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2534,19 +2671,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "%s 디렉터리가 전환되었습니다"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "%s 디렉터리가 전환되었습니다"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2932,6 +3071,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3627,6 +3771,11 @@ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
diff --git a/po/ku.po b/po/ku.po
index 234e9605f..25b4b4ba7 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -384,6 +384,7 @@ msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -643,7 +644,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Pêwist e tu mînakekê bidî"
@@ -831,29 +832,20 @@ msgstr "  Tabloya guhertoyan:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+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"
@@ -865,27 +857,89 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
+msgstr ""
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Lîsteya pakêtan tê xwendin"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "  Pakêta tenê ya farazî:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Paketên şikestî"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "lê %s dê were sazkirin"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "lê %s dê were sazkirin"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc
@@ -915,6 +969,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr ""
@@ -924,29 +1002,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Bikaranîn: apt-config [vebijark] ferman\n"
-"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
-"\n"
-"Ferman\n"
-"  shell - moda shell\n"
-"  dump - Mîhengan nîşan dide\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1159,24 +1240,10 @@ msgid ""
 "apt-get is a simple command line interface for downloading and\n"
 "installing packages. The most frequently used commands are update\n"
 "and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1196,6 +1263,62 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1219,13 +1342,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1253,10 +1385,8 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1270,7 +1400,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s venebû"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1279,16 +1420,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1300,6 +1435,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "lê %s dê were sazkirin"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "lê %s dê were sazkirin"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "lê %s dê were sazkirin"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, fuzzy, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2290,7 +2457,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Pel tê anîn %li ji %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2354,19 +2535,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Rêça %s zêde dirêj e"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Rêça %s zêde dirêj e"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2741,6 +2924,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3421,6 +3609,11 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 765035301..f81726576 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -399,7 +399,7 @@ msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikaling
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Norėdami juos pašalinti, paleiskite „%s“"
@@ -668,7 +668,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr ""
 
@@ -856,29 +856,20 @@ msgstr "  Versijų lentelė:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"\n"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+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"
@@ -890,29 +881,94 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Show raw dependency information for a package"
+msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Show reverse dependency information for a package"
+msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Skaitomi paketų sąrašai"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Surišti paketai:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Sugadinti paketai"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Skaitoma būsenos informacija"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -939,6 +995,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Parametrai nurodyti ne poromis"
@@ -948,29 +1028,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"Panaudojimas: apt-config [parametrai] komanda\n"
-"\n"
-"apt-config yra paprastas įrankis nuskaityti APT konfigūracijos failui\n"
-"\n"
-"Komandos:\n"
-"   shell - Shell rėžimas\n"
-"   dump - Parodyti konfigūraciją\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1190,24 +1272,10 @@ msgid ""
 "apt-get is a simple command line interface for downloading and\n"
 "installing packages. The most frequently used commands are update\n"
 "and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1227,6 +1295,65 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Retrieve new lists of packages"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove packages"
+msgstr "Sugadinti paketai"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Download source archives"
+msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1251,13 +1378,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1285,10 +1421,8 @@ msgstr "%s ir taip jau yra naujausias.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1302,7 +1436,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Nepavyko atverti %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1311,16 +1456,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1332,6 +1471,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2390,7 +2561,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Parsiunčiamas %li failas iš %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2455,19 +2640,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Kelias %s per ilgas"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Kelias %s per ilgas"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2844,6 +3031,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3524,6 +3716,11 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index ff99d6876..1b9ef85f1 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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 "
@@ -400,7 +400,7 @@ msgstr[0] "खालील नवीन पॅकेजेस स्वयंच
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "ती काढून टाकण्यासाठी '%s' वापरा."
@@ -669,7 +669,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
@@ -857,29 +857,25 @@ msgstr "आवृत्ती कोष्टक:"
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"ऍप्टच्या द्वयंक कॅश संचिका कौशल्याने हाताळण्यासाठी, व त्यांमधील माहितीची विचारणा "
+"करण्यासाठी ऍप्ट -कॅश हे निम्नस्तरीय साधन आहे।\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"
@@ -890,32 +886,6 @@ msgid ""
 "  -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 ""
-"वापर:  apt-cache [options] command\n"
-"       apt-cache [options] add file1 [file2 ...]\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"ऍप्टच्या द्वयंक कॅश संचिका कौशल्याने हाताळण्यासाठी, व त्यांमधील माहितीची विचारणा "
-"करण्यासाठी ऍप्ट -कॅश हे निम्नस्तरीय साधन आहे।\n"
-"\n"
-"आज्ञावली\n"
-"  add - उगमस्थान कॅशमध्ये एक पॅकेज संचिका मिळवा \n"
-"  gencaches - पॅकेज व उगमस्थान कॅश या दोघांची बांधणी करा\n"
-"  showpkg - एकमेव पॅकेजसाठी काही सामान्य माहिती दाखवा\n"
-"  showsrc -उगमस्थानाचा माहितीसंच दाखवा\n"
-"  stats - काही पायाभूत आकडेवारी दाखवा\n"
-"  dump - संपूर्ण संचिका थोडक्यात दाखवा\n"
-"  dumpavail - उपलब्ध संचिका stdout मधे छापा\n"
-"  unmet - पुरी न झालेली परावलंबने दाखवा\n"
-"  search - regex नमुन्यासाठी पॅकेजची यादी शोधा\n"
-"  show - पॅकेजसाठी वाचनीय माहितीसंच दाखवा\n"
-"  depends -पॅकेजसाठी संस्करणपूर्व परावलंबन माहिती दाखवा\n"
-"  rdepends -पॅकेजसाठी अतिपरावलंबन माहिती दाखवा\n"
-"  pkgnames - सर्व पॅकेजेससाठी यादी तयार करा\n"
-"  dotty - GraphViz साठी पॅकेज आलेख निर्माण करा\n"
-"  xvcg-xvcg साठी पॅकेज आलेख निर्माण करा\n"
-"  policy - धोरण निर्धारणे दाखवा\n"
-"\n"
 "पर्याय : \n"
 "-h -हा साह्याकारी मजकूर\n"
 "-p=? पॅकेज कॅश \n"
@@ -926,29 +896,91 @@ msgstr ""
 "-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n"
 "अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "उगमस्थानाचा माहितीसंच दाखवा"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "regex नमुन्यासाठी पॅकेजची यादी शोधा"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "पॅकेजसाठी संस्करणपूर्व परावलंबन माहिती दाखवा"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "पॅकेजसाठी अतिपरावलंबन माहिती दाखवा"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "पॅकेजसाठी वाचनीय माहितीसंच दाखवा"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "सर्व पॅकेजेससाठी यादी तयार करा"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "धोरण निर्धारणे दाखवा"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "पॅकेज याद्या वाचत आहोत"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "एकत्रित पॅकेजेस:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "तुटलेली पॅकेजेस"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "वापरात नसलेली सर्व पॅकेजेस स्वयंचलितपणे कायमची काढा"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "स्थिती माहिती वाचत आहे"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -976,6 +1008,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)"
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "चलितमूल्य जोडीने नाहीत"
@@ -985,28 +1041,23 @@ msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
+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"
 msgstr ""
-"उपयोग : ऍप्ट-कॉन्फिग(पर्याय) आज्ञा \n"
-"\n"
-"ऍप्ट कन्फिग संचिता वाचण्यासाठी ऍप्ट-कन्फिग हे एक साधन आहे\n"
-"\n"
-"आज्ञावली : \n"
-"शेल - शेल मोड \n"
-"डंप - संरचना दाखवा \n"
-"\n"
-"पर्याय : \n"
-" -h    हा साह्याकारी मजकूर \n"
-" -c= ?  ही संरचना संचिका वाचा \n"
-" -o=?  एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n"
+
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
 
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
@@ -1214,7 +1265,6 @@ msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1223,24 +1273,17 @@ msgid ""
 "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 ""
+"वापर: apt-get [options] command\n"
+"      apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"      apt-get [options] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get हा पॅकेज डाऊनलोड आणि संस्थापित करण्यासाठी साधा आदेश रेखित\n"
+" संवादमंच आहे. नेहमी वापरले जाणारे आदेश म्हणजे अपडेट\n"
+"आणि संस्थापित करा\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1259,29 +1302,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"वापर: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get हा पॅकेज डाऊनलोड आणि संस्थापित करण्यासाठी साधा आदेश रेखित\n"
-" संवादमंच आहे. नेहमी वापरले जाणारे आदेश म्हणजे अपडेट\n"
-"आणि संस्थापित करा\n"
-"\n"
-"आदेश:\n"
-"   update -पॅकेजच्या नव्या याद्यां प्राप्त करा\n"
-"   upgrade -आवृत्त्यांचे श्रेणिवर्धन करा\n"
-"   install -नवीन पॅकेजेस संस्थापित करा(pkg हे libc6 आहे आणि libc6.deb नव्हे)\n"
-"   remove -पॅकेजेस कायमची काढा\n"
-"   autoremove - वापरात नसलेली सर्व पॅकेजेस स्वयंचलितपणे कायमची काढा\n"
-"   purge - पॅकेजेस कायमची काढा व साफ करा\n"
-"   source -उगमस्थान अर्काईव्हज डाऊनलोड करा\n"
-"   build-dep - उगमस्थान पॅकेजेससाठी बांधणी-डिपेंडन्सी संरचित करा।\n"
-"   dist-upgrade - वितरण श्रेणिवर्धन, पहा apt-get(8)\n"
-"   dselect-upgrade -निवडी रहित करा\n"
-"   clean - डाऊनलोड केलेल्या अर्काईव्हज फाईल्स खोडून टाका\n"
-"   autoclean - डाऊनलोड केलेल्या जुन्या अर्काईव्हज फाईल्स खोडून टाका\n"
-"   check  -  डिपेन्डन्सीज तुटलेल्या नाहीत याची खात्री करा\n"
-"\n"
 "पर्याय:\n"
 "   -h     हा मदत मजकूर.\n"
 "   -q     नोंद करण्यासारखे आऊटपुट-प्रगती निदर्शक नाही\n"
@@ -1300,6 +1320,62 @@ msgstr ""
 " apt.conf(5)  पुस्तिका पाने पहा.\n"
 "         ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "पॅकेजच्या नव्या याद्यां प्राप्त करा"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "आवृत्त्यांचे श्रेणिवर्धन करा"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "नवीन पॅकेजेस संस्थापित करा(pkg हे libc6 आहे आणि libc6.deb नव्हे)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "पॅकेजेस कायमची काढा"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "पॅकेजेस कायमची काढा व साफ करा"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "वितरण श्रेणिवर्धन, पहा apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "निवडी रहित करा"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "उगमस्थान पॅकेजेससाठी बांधणी-डिपेंडन्सी संरचित करा।"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "डाऊनलोड केलेल्या अर्काईव्हज फाईल्स खोडून टाका"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "डाऊनलोड केलेल्या जुन्या अर्काईव्हज फाईल्स खोडून टाका"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "डिपेन्डन्सीज तुटलेल्या नाहीत याची खात्री करा"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "उगमस्थान अर्काईव्हज डाऊनलोड करा"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1324,13 +1400,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1358,11 +1443,9 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1375,7 +1458,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s उघडण्यास असमर्थ"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1384,16 +1478,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1405,6 +1493,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2459,7 +2579,21 @@ msgid "Retrieving file %li of %li"
 msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2524,19 +2658,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2920,6 +3056,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3608,6 +3749,11 @@ msgstr "स्त्रोत सुची %2$s (प्रकार) मध्�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
diff --git a/po/nb.po b/po/nb.po
index 91291c3d5..7da5afffe 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -409,7 +409,7 @@ msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
 msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Bruk «%s» for å fjerne dem."
@@ -683,7 +683,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi minst ett søkemønster"
 
@@ -867,32 +867,27 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -903,34 +898,6 @@ msgid ""
 "  -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 ""
-"Bruk: apt-cache [valg] kommando\n"
-"      apt-cache [valg] add fil1 [fil2 ...]\n"
-"      apt-cache [valg] showpkg pakke1 [pakke2 ...]\n"
-"      apt-cache [valg] showsrc 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"
-"\n"
-"Kommandoer:\n"
-"   add - Legg en fil til kildelageret\n"
-"   gencaches - Bygg lagrene for både pakke og kildekode\n"
-"   showpkg - Vis overordnet informasjon om en enkelt pakke\n"
-"   showsrc - Vis data om kildekoden\n"
-"   stats - Vis en enkel statistikk\n"
-"   dump - Vis fila med liste over tilgjengelige pakker i kompakt form\n"
-"   dumpavail - Send hele lista over tilgjengelige pakker til standard ut\n"
-"   unmet - Vis uinnfridde avhengighetsforhold\n"
-"   search - Søk i pakkelista etter et regulært uttrykkr\n"
-"   show - Vis et lesbart oppslag for pakken\n"
-"   showauto - Vis en liste med automatisk installerte pakker\n"
-"   depends - Vis rå informasjon om avhengighetsforholdene for pakken\n"
-"   rdepends - Vis informasjon om de reverserte avhengighetsforholdene for "
-"pakken\n"
-"   pkgnames - List alle pakkenavn på systemet\n"
-"   dotty - Lag pakke-grafer for GraphViz\n"
-"   xvcg - Lag pakke-grafer for xvcg\n"
-"   policy - Vis regelinnstillingerr\n"
-"\n"
 "Valg:\n"
 "  -h   Denne hjelpeteksten\n"
 "  -p=? Pakkelageret.\n"
@@ -941,29 +908,91 @@ msgstr ""
 "  -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"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Søk i pakkelista etter et regulært uttrykkr"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Vis rå informasjon om avhengighetsforholdene for pakken"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Vis informasjon om de reverserte avhengighetsforholdene for pakken"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Vis et lesbart oppslag for pakken"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "List alle pakkenavn på systemet"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Vis regelinnstillingerr"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Leser pakkelister"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Låste pakker:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Ødelagte pakker"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Fjern alle automatisk ubrukte pakker"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s satt til manuell installasjon.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Leser tilstandsinformasjon"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»"
@@ -990,6 +1019,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Ikke parvise argumenter"
@@ -999,29 +1052,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"Bruk: apt-config [innstillinger] kommando\n"
-"\n"
-"apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
-"\n"
-"Kommandoer:\n"
-"   shell - Skallmodus\n"
-"   dump - Vis innstillingene\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1235,7 +1290,6 @@ 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"
@@ -1244,24 +1298,17 @@ msgid ""
 "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 ""
+"Bruk: apt-get [valg] kommando\n"
+"      apt-get [valg] install|remove pakke1 [pakke2 ...]\n"
+"      apt-get [valg] source pakke1 [pakke2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja\n"
+"for å laste ned og installere pakker. De mest brukte kommandoene \n"
+"er «update» og «install».\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1280,31 +1327,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Bruk: apt-get [valg] kommando\n"
-"      apt-get [valg] install|remove pakke1 [pakke2 ...]\n"
-"      apt-get [valg] source pakke1 [pakke2 ...]\n"
-"\n"
-"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja\n"
-"for å laste ned og installere pakker. De mest brukte kommandoene \n"
-"er «update» og «install».\n"
-"\n"
-"Kommandoer:\n"
-"   update - Hent nye pakkelister\n"
-"   upgrade - Utfør en oppgradering\n"
-"   install - Installér nye pakker (Pakke er «foo», ikke «foo.deb»)\n"
-"   remove - Fjern pakker\n"
-"   autoremove - Fjern alle automatisk ubrukte pakker\n"
-"   purge - Fjern og rydd opp etter pakker\n"
-"   source - Last ned kildekode fra arkivene\n"
-"   build-dep - Sett opp bygge-forutsetninger for kildekodepakker\n"
-"   dist-upgrade - Oppgradér utgave, les apt-get(8)\n"
-"   dselect-upgrade - Følg «dselect» sine anbefalinger\n"
-"   clean - Slett nedlastede arkivfiler\n"
-"   autoclean - Slett gamle nedlastede arkivfiler\n"
-"   check - Se etter om det finnes brutte avhengigheter\n"
-"   markauto - Merk de oppgitte pakkene som automatisk installert\n"
-"   unmarkauto - Merk de oppgitte pakkene som manuelt installert\n"
-"\n"
 "Valg:\n"
 "  -h  Denne hjelpteksten.\n"
 "  -q  Loggbar tilbakemelding - ikke vis framdrift\n"
@@ -1323,6 +1345,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Utfør en oppgradering"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installér nye pakker (Pakke er «foo», ikke «foo.deb»)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Fjern pakker"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Fjern og rydd opp etter pakker"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Oppgradér utgave, les apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Følg «dselect» sine anbefalinger"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Sett opp bygge-forutsetninger for kildekodepakker"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Slett nedlastede arkivfiler"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Slett gamle nedlastede arkivfiler"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Se etter om det finnes brutte avhengigheter"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Last ned kildekode fra arkivene"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1347,13 +1425,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1381,11 +1468,9 @@ msgstr "%s er allerede nyeste versjon.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ventet på %s, men den ble ikke funnet"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1398,7 +1483,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikke å åpne %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1407,16 +1503,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1428,6 +1518,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s satt til automatisk installasjon.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s satt til automatisk installasjon.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s satt til manuell installasjon.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2487,7 +2609,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Henter fil %li av %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2555,19 +2691,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Katalogen %s er avledet"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Katalogen %s er avledet"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2959,6 +3097,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ventet på %s, men den ble ikke funnet"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3659,6 +3802,11 @@ msgstr "Feil på %u i kildelista %s (type)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index e7c3a7240..72a7d8c2f 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -398,6 +398,7 @@ msgstr[0] "निम्न नयाँ प्याकेजहरू स्थ
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -665,7 +666,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
@@ -855,29 +856,27 @@ msgstr "  संस्करण तालिका:"
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"तिनीहरुबाट 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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -888,33 +887,6 @@ msgid ""
 "  -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 ""
-"उपयोग: apt-cache [विकल्पहरू] आदेश\n"
-"       apt-cache [विकल्पहरू] फाइल १ थप्नुहोस् [फाइल २ ...]\n"
-"       apt-cache [विकल्पहरू] pkg pkg1 देखाउनुहोस् [pkg2 ...]\n"
-"       apt-cache [विकल्पहरू] src pkg1 देखाउनुहोस् [pkg2 ...]\n"
-"\n"
-"तिनीहरुबाट APT's बिनारी क्यास फाइलहरू, र क्वेरी सूचना मिलाउन प्रयोग गरिने apt-cache "
-"कम-स्तरको उपकरण हो\n"
-"\n"
-"\n"
-"आदेशहरू:\n"
-"   थप्नुहोस् - स्रोत क्यासमा प्याकेज फाइल थप्नुहोस्\n"
-"   gencaches - प्याकेज र स्रोत क्यास दुवै निर्माण गर्नुहोस्\n"
-"   showpkg - एकल प्याकेजको लागि केही सामान्य सूचनाहरू देखाउनुहोस्\n"
-"   showsrc - स्रोत रेकर्डहरू देखाउनुहोस्\n"
-"   stats - केही आधारभूत तथ्यांकशास्त्र हरू देखाउनुहोस्\n"
-"   dump - पुरै फाइल स्पष्ट रुपमा देखाउनुहोस्\n"
-"   dumpavail - stdout मा एउटा उपलब्ध फाइल मुद्रण गर्नुहोस्\n"
-"   unmet - नभेटिएका निर्भरताहरू देखाउनुहोस्\n"
-"   खोजी गर्नुहोस् - regex बान्कीको लागि प्याकेज सूचि खोजी गर्नुहोस्\n"
-"   देखाउनुहोस् - प्याकेजको लागि पढ्नयोग्य रेकर्ड देखाउनुहोस्\n"
-"   आधारित - प्याकेजको लागि कच्चा निर्भरता सूचना देखाउनुहोस्\n"
-"   rdepends - प्याकेजको लागि उल्टो निर्भरता सूचना देखाउनुहोस्\n"
-"   pkgnames - सबै प्याकेजहरुको नामहरू सूचिबद्ध गर्नुहोस्\n"
-"   dotty - GraphViz को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n"
-"   xvcg - xvcg को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n"
-"   नीति - नीति सेटिङ्गहरू देखाउनुहोस्\n"
-"\n"
 "विकल्पहरू:\n"
 "  -h   यो मद्दत पाठ ।\n"
 "  -p=? प्याकेज क्यास ।\n"
@@ -925,29 +897,92 @@ msgstr ""
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 "धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस्  ।\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "स्रोत रेकर्डहरू देखाउनुहोस्"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "regex बान्कीको लागि प्याकेज सूचि खोजी गर्नुहोस्"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "प्याकेजको लागि कच्चा निर्भरता सूचना देखाउनुहोस्"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "प्याकेजको लागि उल्टो निर्भरता सूचना देखाउनुहोस्"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "प्याकेजको लागि पढ्नयोग्य रेकर्ड देखाउनुहोस्"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "सबै प्याकेजहरुको नामहरू सूचिबद्ध गर्नुहोस्"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "नीति सेटिङ्गहरू देखाउनुहोस्"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "प्याकेज सूचिहरू पढिदैछ"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "पिन गरिएका प्याकेजहरू:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "भाँचिएका प्याकेजहरू"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -975,6 +1010,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । "
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "तर्कहरू जोडामा छैन"
@@ -984,29 +1043,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"उपयग: apt-config [विकल्पहरू] आदेश\n"
-"\n"
-" APT कनफिग फाइल पढ्नको लागि apt-config साधारण उपकरण हो\n"
-"\n"
-"आदेशहरू:\n"
-"   शेल - शेल मोड\n"
-"   dump - कनफिगरेसन देखाउनुहोस्\n"
-"\n"
 "विकल्पहरू:\n"
 "  -h   यो मद्दत पाठ ।\n"
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1213,7 +1274,6 @@ msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1222,24 +1282,16 @@ msgid ""
 "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 ""
+"उपयोग: apt-get [विकल्पहरू] आदेश\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get डाउनलोड गर्न र प्याकेजहरू स्थापना गर्नको लागि साधारण आदेश लाइन इन्टरफेस हो ।\n"
+"बारम्बार प्रयोग भइरहने आदेशहरू अद्यावधिक र स्थापना हुन् ।\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1258,27 +1310,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"उपयोग: apt-get [विकल्पहरू] आदेश\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get डाउनलोड गर्न र प्याकेजहरू स्थापना गर्नको लागि साधारण आदेश लाइन इन्टरफेस हो ।\n"
-"बारम्बार प्रयोग भइरहने आदेशहरू अद्यावधिक र स्थापना हुन् ।\n"
-"\n"
-"\n"
-"आदेशहरू:\n"
-"   अद्यावधिक गर्नुहोस् - प्याकेजहरुको नयाँ सूचिहरू पुन:प्राप्त गर्नुहोस्\n"
-"   स्तर वृद्धि गर्नुहोस् - एउटा स्तरवृद्धि सम्पादन गर्नुहोस्\n"
-"   स्थापना गर्नुहोस् - नयाँ प्याकेजहरू स्थापना गर्नुहोस् (pkg libc6 हो libc6.deb होइन)\n"
-"   हटाउनुहोस् - प्याकेजहरू हटाउनुहोस्\n"
-"   स्रोत - स्रोत संग्रहहरू डाउनलोड गर्नुहोस्\n"
-"   build-dep - स्रोत प्याकेजहरुको लागि निर्माण-निर्भरताहरू कनफिगर गर्नुहोस्\n"
-"   dist-upgrade - स्तरवृद्धि वितरण गर्नुहोस्, apt-get(8) हेर्नुहोस्\n"
-"   dselect-upgrade - dselect चयनहरू पछ्याउनुहोस्\n"
-"   सफा गर्नुहोस् - डाउनलोड गरिएको संग्रह फाइलहरू मेट्नुहोस्\n"
-"   स्वचालित सफा - पुरानो डाउनलोड भएको संग्रह पाइलहरू मेट्नुहोस्\n"
-"   जाँच्नुहोस् - त्यहाँ कुनै भाँचिएका निर्भरताहरू छैन भन्ने रूजू गर्नुहोस्\n"
-"\n"
 "विकल्पहरू:\n"
 "  -h  यो मद्दत पाठ.\n"
 "  -q  लगयोग्य निर्गात - कुनै प्रगति सूचि छैन\n"
@@ -1297,6 +1328,62 @@ msgstr ""
 "pages हेर्नुहोस् ।\n"
 "                       APT संग सुपर काउ शक्तिहरू छ ।\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "जहरुको नयाँ सूचिहरू पुन:प्राप्त गर्नुहोस्"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "टा स्तरवृद्धि सम्पादन गर्नुहोस्"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "प्याकेजहरू स्थापना गर्नुहोस् (pkg libc6 हो libc6.deb होइन)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "स्तरवृद्धि वितरण गर्नुहोस्, apt-get(8) हेर्नुहोस्"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "dselect चयनहरू पछ्याउनुहोस्"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "स्रोत प्याकेजहरुको लागि निर्माण-निर्भरताहरू कनफिगर गर्नुहोस्"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1321,13 +1408,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1355,11 +1451,9 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
 msgid "%s was already not hold.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1372,7 +1466,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s खोल्न असफल"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1381,16 +1486,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1402,6 +1501,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2454,7 +2585,21 @@ msgid "Retrieving file %li of %li"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2520,19 +2665,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "डाइरेक्ट्री %s फेरियो "
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "डाइरेक्ट्री %s फेरियो "
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2912,6 +3059,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3598,6 +3750,11 @@ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
diff --git a/po/nl.po b/po/nl.po
index e5dccdaf3..95e6f5612 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -413,6 +413,7 @@ msgstr[1] ""
 "%lu pakketten waren automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Gebruik '%s' om het te verwijderen."
@@ -688,7 +689,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "U dient minstens één zoekpatroon op te geven"
 
@@ -882,29 +883,25 @@ msgstr "  Versietabel:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -915,30 +912,6 @@ msgid ""
 "  -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 ""
-"Gebruik: apt-cache [opties] opdracht\n"
-"         apt-cache [opties] showpkg pakket1 [pakket2 ...]\n"
-"         apt-cache [opties] showsrc pakket1 [pakket2 ...]\n"
-"\n"
-"apt-cache is een basaal hulpmiddel waarmee u informatie kunt\n"
-"opvragen uit de binaire cachebestanden van APT\n"
-"\n"
-"Opdrachten:\n"
-"   gencaches - Bouw zowel de pakket- als de broncache\n"
-"   showpkg - Toon algemene informatie over een enkel pakket\n"
-"   showsrc - Toon een rapport over de broncode\n"
-"   stats - Toon enkele basisstatistieken\n"
-"   dump - Toon het gehele bestand in een compacte vorm\n"
-"   dumpavail - Print lijst met beschikbare pakketten op de standaarduitvoer\n"
-"   unmet - Toon niet-voldane vereisten\n"
-"   search - Doorzoek pakkettenlijst a.d.h.v. een regex-patroon\n"
-"   show - Toon een leesbaar rapport over het pakket\n"
-"   depends - Toon de afhankelijkheden van een pakket\n"
-"   rdepends - Toon de pakketten die afhankelijk zijn van een pakket\n"
-"   pkgnames - Toon de namen van alle pakketten op het systeem\n"
-"   dotty - Genereer pakketschema's voor GraphViz\n"
-"   xvcg - Genereer pakketschema's voor xvcg\n"
-"   policy - Toon beleidsinstellingen\n"
-"\n"
 "Opties:\n"
 "  -h   Deze hulptekst.\n"
 "  -p=? De pakketcache.\n"
@@ -950,48 +923,90 @@ msgstr ""
 "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"
+msgstr "Toon een rapport over de broncode"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Doorzoek pakkettenlijst a.d.h.v. een regex-patroon"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Toon de afhankelijkheden van een pakket"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Toon de pakketten die afhankelijk zijn van een pakket"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Toon een leesbaar rapport over het pakket"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Toon de namen van alle pakketten op het systeem"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Toon beleidsinstellingen"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Gebruik: apt [opties] opdracht\n"
 "\n"
 "CLI voor apt.\n"
-"Basisopdrachten: \n"
-" list - geef een lijst van pakketten op basis van hun naam\n"
-" search - zoek in de pakketbeschrijvingen\n"
-" show - toon gedetailleerde informatie over het pakket\n"
-"\n"
-" update - werk de lijst van beschikbare pakketten bij\n"
-"\n"
-" install - installeer pakketten\n"
-" remove  - verwijder pakketten\n"
-"\n"
-" upgrade - waardeer het systeem op door pakketten te installeren/op te "
-"waarderen\n"
-" full-upgrade - waardeer het systeem op door pakketten te verwijderen/te "
-"installeren/op te waarderen\n"
-"\n"
-" edit-sources - bewerk het bestand met informatie over de bron\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "geef een lijst van pakketten op basis van hun naam"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "zoek in de pakketbeschrijvingen"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "toon gedetailleerde informatie over het pakket"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "installeer pakketten"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "verwijder pakketten"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Verwijder automatisch alle ongebruikte pakketten"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "werk de lijst van beschikbare pakketten bij"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "waardeer het systeem op door pakketten te installeren/op te waarderen"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+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"
+msgstr "bewerk het bestand met informatie over de bron"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1027,6 +1042,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Dit proces dient herhaald te worden voor alle cd's in uw set."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1036,30 +1085,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Gebruik: apt-config [opties] opdracht\n"
-"\n"
-"apt-config is een eenvoudig hulpmiddel om het APT-configuratiebestand te "
-"lezen\n"
-"\n"
-"Opdrachten:\n"
-"   shell - Shell modus\n"
-"   dump - Toon de configuratie\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1296,24 +1347,17 @@ msgid ""
 "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 ""
+"Gebruik: apt-get [opties] opdracht\n"
+"         apt-get [opties] install|remove pakket1 [pakket2 ...]\n"
+"         apt-get [opties] source pakket1 [pakket2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get is een eenvoudige commandoregel-interface voor het ophalen en\n"
+"installeren van pakketten. De meest gebruikte opdrachten zijn\n"
+"'update' en 'install'.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1332,34 +1376,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Gebruik: apt-get [opties] opdracht\n"
-"         apt-get [opties] install|remove pakket1 [pakket2 ...]\n"
-"         apt-get [opties] source pakket1 [pakket2 ...]\n"
-"\n"
-"apt-get is een eenvoudige commandoregel-interface voor het ophalen en\n"
-"installeren van pakketten. De meest gebruikte opdrachten zijn\n"
-"'update' en 'install'.\n"
-"\n"
-"Opdrachten:\n"
-"   update - Haal een nieuwe lijst van pakketten op\n"
-"   upgrade - Voer een opwaardering uit\n"
-"   install - Installeer nieuwe pakketten (pakket is b.v. libc6, niet libc6."
-"deb)\n"
-"   remove - Verwijder pakketten\n"
-"   autoremove - Verwijder automatisch alle ongebruikte pakketten\n"
-"   purge - Verwijder pakketten en hun configuratiebestanden\n"
-"   source - Haal bronarchieven op\n"
-"   build-dep - Installeer de pakketten vereist voor het bouwen van een "
-"bronpakket\n"
-"   dist-upgrade - Opwaardering van de distributie, zie apt-get(8)\n"
-"   dselect-upgrade - Opwaardering volgens dselect-selecties\n"
-"   clean - Verwijder opgehaalde archiefbestanden\n"
-"   autoclean - Verwijder verouderde opgehaalde archiefbestanden\n"
-"   check - Controleer onvoldane vereisten\n"
-"   changelog - Haal log op van wijzigingen aan een bepaald pakket en toon "
-"die\n"
-"   download - Haal het binaire pakket op en plaats het in de werkmap\n"
-"\n"
 "Opties:\n"
 "  -h   Deze hulptekst\n"
 "  -q   Logbare uitvoer - geen voortgangsindicator\n"
@@ -1378,6 +1394,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Voer een opwaardering uit"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installeer nieuwe pakketten (pakket is b.v. libc6, niet libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Verwijder pakketten"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Verwijder pakketten en hun configuratiebestanden"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Opwaardering van de distributie, zie apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Opwaardering volgens dselect-selecties"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Installeer de pakketten vereist voor het bouwen van een bronpakket"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Verwijder opgehaalde archiefbestanden"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Verwijder verouderde opgehaalde archiefbestanden"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Controleer onvoldane vereisten"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Haal bronarchieven op"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Haal het binaire pakket op en plaats het in de werkmap"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Haal log op van wijzigingen aan een bepaald pakket en toon die"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Heb een URL als argument nodig"
@@ -1396,30 +1468,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Gebruik: apt-helper [opties] opdracht\n"
 "         apt-helper [opties] download-file uri doelpad\n"
 "\n"
 "apt-helper is een intern hulpmiddel voor apt\n"
-"\n"
-"Opdrachten:\n"
-"   download-file - haal opgegeven uri op en plaats in doelpad\n"
-"   auto-detect-proxy - proxy opzoeken met behulp van apt.conf\n"
-"\n"
-"                       Deze APT-helper heeft Super Koekracht.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "proxy opzoeken met behulp van apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1446,11 +1520,9 @@ msgstr "%s was reeds ingesteld op tegenhouden.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s was reeds ingesteld op niet tegenhouden.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Er is gewacht op %s, maar die kwam niet"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Het uitvoeren van dpkg mislukte. Bent u systeembeheerder?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1463,8 +1535,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Tegenhouden van %s werd geannuleerd.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Het uitvoeren van dpkg mislukte. Bent u systeembeheerder?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1472,16 +1555,15 @@ msgid ""
 "\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 ""
+"Gebruik: apt-mark [opties] {auto|manual} pakket1 [pakket2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark is een eenvoudige commandolijn-interface voor het markeren\n"
+"van pakketten als zijnde handmatig of automatisch geïnstalleerd.\n"
+"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"
@@ -1492,21 +1574,6 @@ msgid ""
 "  -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 ""
-"Gebruik: apt-mark [opties] {auto|manual} pakket1 [pakket2 ...]\n"
-"\n"
-"apt-mark is een eenvoudige commandolijn-interface voor het markeren\n"
-"van pakketten als zijnde handmatig of automatisch geïnstalleerd.\n"
-"Het kan ook een lijst met markeringen weergeven.\n"
-"\n"
-"Opdrachten:\n"
-"   auto - Markeer het vermelde pakket als automatisch geïnstalleerd\n"
-"   manual - Markeer het vermelde pakket als manueel geïnstalleerd\n"
-"   hold - Markeer een pakket als tegengehouden\n"
-"   unhold - Markeer een pakket niet langer als tegengehouden\n"
-"   showauto - Toon de lijst van automatisch geïnstalleerde pakketten\n"
-"   showmanual - Toon de lijst van manueel geïnstalleerde pakketten\n"
-"   showhold - Toon de lijst van tegengehouden pakketten\n"
-"\n"
 "Opties:\n"
 "  -h  Deze hulptekst\n"
 "  -q  Logbare uitvoer - geen voortgangsindicator\n"
@@ -1517,6 +1584,34 @@ msgstr ""
 "  -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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Markeer het vermelde pakket als manueel geïnstalleerd"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Markeer een pakket als tegengehouden"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Markeer een pakket niet langer als tegengehouden"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Toon de lijst van automatisch geïnstalleerde pakketten"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Toon de lijst van manueel geïnstalleerde pakketten"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Toon de lijst van tegengehouden pakketten"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2584,7 +2679,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Bestand %li van %li wordt opgehaald"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2656,19 +2765,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "De map %s is al omgeleid"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "De map %s is al omgeleid"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3081,6 +3192,11 @@ msgstr ""
 "Negeren van bestand '%s' in map '%s' omdat het een ongeldige "
 "bestandsextensie heeft"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Er is gewacht op %s, maar die kwam niet"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3797,6 +3913,11 @@ msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Type '%s' van element %u in bronlijst %s is onbekend"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index b90eca0bc..f58bcf7e8 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -402,6 +402,7 @@ msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -674,7 +675,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du m� oppgi n�yaktig eitt mnster"
@@ -861,32 +862,27 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -897,32 +893,6 @@ msgid ""
 "  -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 ""
-"Bruk: apt-cache [val] kommando\n"
-"      apt-cache [val] add fil1 [fil2 ...]\n"
-"      apt-cache [val] showpkg pakke1 [pakke2 ...]\n"
-"      apt-cache [val] showsrc 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"
-"\n"
-"Kommandoar:\n"
-"   add - Legg ei fil til i kjeldelageret.\n"
-"   gencaches - Bygg opp lagera for b�de pakkane og kjeldekoden.\n"
-"   showpkg - Vis overordna informasjon om ein enkelt pakke.\n"
-"   showsrc - Vis data om kjeldekoden.\n"
-"   stats - Vis ein enkel statistikk.\n"
-"   dump - Vis fila med lista over tilgjengelege pakkar i tett form.\n"
-"   dumpavail - Send heile lista over tilgjengelege pakkar til stdout.\n"
-"   unmet - Vis krav som ikkje er oppfylte.\n"
-"   search - S�k gjennom pakkelista etter eit regul�rt uttrykk.\n"
-"   show - Vis ei oversikt over pakken.\n"
-"   depends - Vis r� informasjon om krava til ein pakke.\n"
-"   rdepends - Vis baklengs kravinformasjon for ein pakke\n"
-"   pkgnames - Vis ei liste over alle pakkenamn.\n"
-"   dotty - Lag pakkegrafar for GraphViz.\n"
-"   xvcg - Lag pakkegrafar for xvcg\n"
-"   policy - Vis regelinnstillingar.\n"
-"\n"
 "Val:\n"
 "  -h   Vis denne hjelpeteksten.\n"
 "  -p=? Pakkelageret.\n"
@@ -933,29 +903,92 @@ msgstr ""
 "  -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"
+msgstr "Vis data om kjeldekoden."
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "S�k gjennom pakkelista etter eit regul�rt uttrykk."
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Vis r� informasjon om krava til ein pakke."
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Vis baklengs kravinformasjon for ein pakke"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Vis ei oversikt over pakken."
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Vis ei liste over alle pakkenamn."
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Vis regelinnstillingar."
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Les pakkelister"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Spikra pakkar:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "�ydelagde pakkar"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "men %s skal installerast"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "men %s skal installerast"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -985,6 +1018,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Ikkje parvise argument"
@@ -994,29 +1051,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"Bruk: apt-config [val] kommando\n"
-"\n"
-"apt-config er eit enkelt verkt�y for � lesa oppsettsfila til APT.\n"
-"\n"
-"Kommandoar:\n"
-"   shell - Skalmodus\n"
-"   dump - Vis oppsettet\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1225,7 +1284,6 @@ 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"
@@ -1234,24 +1292,17 @@ msgid ""
 "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 ""
+"Bruk: apt-get [val] kommando\n"
+"      apt-get [val] install|remove pakke1 [pakke2 ...]\n"
+"      apt-get [val] source pakke1 [pakke2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get er eit enkelt grensesnitt til bruk fr� kommandolinja for � lasta\n"
+"ned og installera pakkar. Dei vanlegaste kommandoane er �update� og\n"
+"�install�.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1270,28 +1321,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Bruk: apt-get [val] kommando\n"
-"      apt-get [val] install|remove pakke1 [pakke2 ...]\n"
-"      apt-get [val] source pakke1 [pakke2 ...]\n"
-"\n"
-"apt-get er eit enkelt grensesnitt til bruk fr� kommandolinja for � lasta\n"
-"ned og installera pakkar. Dei vanlegaste kommandoane er �update� og\n"
-"�install�.\n"
-"\n"
-"Kommandoar:\n"
-"   update - Hent nye pakkelister.\n"
-"   upgrade - Utf�r ei oppgradering.\n"
-"   install - Installer nye pakkar (bruk pakkenamn, ikkje filnamn (foo."
-"deb)).\n"
-"   remove - Fjern pakkar.\n"
-"   source - Last ned kjeldekode fr� arkiva.\n"
-"   build-dep - Oppfyll byggjekrava for kjeldepakkar.\n"
-"   dist-upgrade - Oppgrader distribusjonen, les apt-get(8).\n"
-"   dselect-upgrade - F�lg r�da fr� �dselect�.\n"
-"   clean - Slett nedlasta arkivfiler.\n"
-"   autoclean - Slett gamle, nedlasta arkivfiler.\n"
-"   check - Stadfest at det ikkje finst krav som ikkje er oppfylte.\n"
-"\n"
 "Val:\n"
 "  -h  Vis denne hjelpeteksten.\n"
 "  -q  Ikkje vis framdriftsm�tar, for bruk i loggar.\n"
@@ -1310,6 +1339,62 @@ msgstr ""
 "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."
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Utf�r ei oppgradering."
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installer nye pakkar (bruk pakkenamn, ikkje filnamn (foo.deb))."
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Fjern pakkar."
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Oppgrader distribusjonen, les apt-get(8)."
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "F�lg r�da fr� �dselect�."
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Oppfyll byggjekrava for kjeldepakkar."
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Slett nedlasta arkivfiler."
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Slett gamle, nedlasta arkivfiler."
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Stadfest at det ikkje finst krav som ikkje er oppfylte."
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Last ned kjeldekode fr� arkiva."
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1334,13 +1419,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1368,11 +1462,9 @@ msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Venta p� %s, men den fanst ikkje"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1385,7 +1477,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikkje opna %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1394,16 +1497,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1415,6 +1512,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "men %s skal installerast"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "men %s skal installerast"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "men %s skal installerast"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2464,7 +2593,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Les filliste"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2530,19 +2673,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Katalogen %s er avleidd"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Katalogen %s er avleidd"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2927,6 +3072,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Venta p� %s, men den fanst ikkje"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3614,6 +3764,11 @@ msgstr "Misforma linje %u i kjeldelista %s (type)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du m� leggja nokre kjelde-URI-ar i fila sources.list."
diff --git a/po/pl.po b/po/pl.po
index 134873e6f..2a580a069 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -430,6 +430,7 @@ msgstr[2] ""
 "wymagane.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Aby go usunąć należy użyć \"%s\"."
@@ -706,7 +707,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Błąd kompilacji wyrażenia regularnego - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Należy podać przynajmniej jeden wzorzec"
 
@@ -895,29 +896,25 @@ msgstr "  Tabela wersji:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -928,30 +925,6 @@ msgid ""
 "  -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 ""
-"Użycie: apt-cache [opcje] polecenie\n"
-"        apt-cache [opcje] showpkg pakiet1 [pakiet2 ...]\n"
-"        apt-cache [opcje] showsrc 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"
-"\n"
-"Polecenia:\n"
-"   gencaches - Buduje magazyn podręczny pakietów i źródeł\n"
-"   showpkg - Pokazuje ogólne informacje na temat pojedynczego pakietu\n"
-"   showsrc - Pokazuje informacje dla źródeł\n"
-"   stats - Pokazuje podstawowe statystyki\n"
-"   dump - Pokazuje cały plik w skrótowej formie\n"
-"   dumpavail - Wypisuje plik dostępnych pakietów na standardowe wyjście\n"
-"   unmet - Pokazuje niespełnione zależności\n"
-"   search - Przeszukuje listę pakietów według wyrażenia regularnego\n"
-"   show - Pokazuje informacje dla danego pakietu\n"
-"   depends - Pokazuje surowe informacje o zależnościach danego pakietu\n"
-"   rdepends - Pokazuje informacje o zależnościach OD danego pakietu\n"
-"   pkgnames - Pokazuje listę nazw wszystkich pakietów w systemie\n"
-"   dotty - Generuje grafy pakietów dla programu GraphViz\n"
-"   xvcg - Generuje grafy pakietów dla programu xvcg\n"
-"   policy - Pokazuje ustawienia polityki\n"
-"\n"
 "Opcje:\n"
 "  -h   Ten tekst pomocy.\n"
 "  -p=? Podręczny magazyn pakietów.\n"
@@ -963,29 +936,91 @@ msgstr ""
 "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ł"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Przeszukuje listę pakietów według wyrażenia regularnego"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Pokazuje surowe informacje o zależnościach danego pakietu"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Pokazuje informacje o zależnościach OD danego pakietu"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Pokazuje informacje dla danego pakietu"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Pokazuje listę nazw wszystkich pakietów w systemie"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Pokazuje ustawienia polityki"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Czytanie list pakietów"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Przypięte pakiety:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pakiety są uszkodzone"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Usuwa automatycznie wszystkie nieużywane pakiety"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ale jest pakietem wirtualnym"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Odczyt informacji o stanie"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\""
@@ -1012,6 +1047,42 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Należy powtórzyć ten proces dla reszty płyt."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1021,29 +1092,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Użycie: apt-config [opcje] polecenie\n"
-"\n"
-"apt-config to proste narzędzie do czytania pliku konfiguracyjnego APT\n"
-"\n"
-"Polecenia:\n"
-"   shell - Tryb powłoki\n"
-"   dump - Pokazuje konfigurację\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1284,24 +1357,16 @@ msgid ""
 "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 ""
+"Użycie: apt-get [opcje] polecenie\n"
+"        apt-get [opcje] install|remove pakiet1 [pakiet2 ...]\n"
+"        apt-get [opcje] source pakiet1 [pakiet2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get to prosty interfejs wiersza poleceń do pobierania i instalacji\n"
+"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"
@@ -1320,30 +1385,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Użycie: apt-get [opcje] polecenie\n"
-"        apt-get [opcje] install|remove pakiet1 [pakiet2 ...]\n"
-"        apt-get [opcje] source pakiet1 [pakiet2 ...]\n"
-"\n"
-"apt-get to prosty interfejs wiersza poleceń do pobierania i instalacji\n"
-"pakietów. Najczęściej używane polecenia to update i install.\n"
-"\n"
-"Polecenia:\n"
-"  update - Pobiera nowe listy pakietów\n"
-"  upgrade - Wykonuje aktualizację\n"
-"  install - Instaluje nowe pakiety (pakiet to np. libc6, nie libc6.deb)\n"
-"  remove - Usuwa pakiety\n"
-"  autoremove - Usuwa automatycznie wszystkie nieużywane pakiety\n"
-"  purge - Usuwa pakiety łącznie z plikami konfiguracyjnymi\n"
-"  source - Pobiera archiwa źródłowe\n"
-"  build-dep - Konfiguruje zależności dla budowania pakietów źródłowych\n"
-"  dist-upgrade - Aktualizacja dystrybucji, patrz apt-get(8)\n"
-"  dselect-upgrade - Instaluje według wyborów dselect\n"
-"  clean - Usuwa pobrane pliki archiwów\n"
-"  autoclean - Usuwa stare pobrane pliki archiwów\n"
-"  check - Sprawdza, czy wszystkie zależności są spełnione\n"
-"  changelog - Pobiera i wyświetla dziennika zmian wybranych pakietów\n"
-"  download - Pobiera pakiet binarny do bieżącego katalogu\n"
-"\n"
 "Opcje:\n"
 "  -h   Ten tekst pomocy\n"
 "  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
@@ -1363,6 +1404,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Wykonuje aktualizację"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instaluje nowe pakiety (pakiet to np. libc6, nie libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Usuwa pakiety"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Usuwa pakiety łącznie z plikami konfiguracyjnymi"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Aktualizacja dystrybucji, patrz apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Instaluje według wyborów dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Konfiguruje zależności dla budowania pakietów źródłowych"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Usuwa pobrane pliki archiwów"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Usuwa stare pobrane pliki archiwów"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Sprawdza, czy wszystkie zależności są spełnione"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Pobiera archiwa źródłowe"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Pobiera pakiet binarny do bieżącego katalogu"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Pobiera i wyświetla dziennika zmian wybranych pakietów"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1389,13 +1486,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1423,11 +1529,11 @@ msgstr "%s został już zatrzymany.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s został już odznaczony jako zatrzymany.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Oczekiwano na proces %s, ale nie było go"
+# Musi pasować do su i sudo.
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1439,11 +1545,20 @@ msgstr "%s został zatrzymany.\n"
 msgid "Canceled hold on %s.\n"
 msgstr "Odznaczono zatrzymanie %s\n"
 
-# Musi pasować do su i sudo.
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
-"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
 
 #: cmdline/apt-mark.cc
 #, fuzzy
@@ -1452,16 +1567,15 @@ msgid ""
 "\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 ""
+"Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n"
+"jako zainstalowane automatycznie lub ręcznie. Może także służyć\n"
+"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"
@@ -1472,16 +1586,6 @@ msgid ""
 "  -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 ""
-"Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n"
-"\n"
-"apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n"
-"jako zainstalowane automatycznie lub ręcznie. Może także służyć\n"
-"do wyświetlania stanu oznaczeń.\n"
-"\n"
-"Polecenia:\n"
-"  auto - Oznacza dany pakiet jako zainstalowany automatycznie\n"
-"  manual - Oznacza dany pakiet jako zainstalowany ręcznie\n"
-"\n"
 "Opcje:\n"
 "  -h  Ten tekst pomocy\n"
 "  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
@@ -1494,6 +1598,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Oznacza dany pakiet jako zainstalowany ręcznie"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2555,7 +2687,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Pobieranie pliku %li z %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2626,19 +2772,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Ominięcie katalogu %s"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Ominięcie katalogu %s"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3043,6 +3191,11 @@ msgstr ""
 "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe "
 "rozszerzenie pliku"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Oczekiwano na proces %s, ale nie było go"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3754,6 +3907,11 @@ msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
diff --git a/po/pt.po b/po/pt.po
index ce61b2b8d..42079058e 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -408,6 +408,7 @@ msgstr[1] ""
 "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Utilize '%s' para o remover."
@@ -680,7 +681,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Tem de fornecer pelo menos um padrão de busca"
 
@@ -868,29 +869,25 @@ msgstr "  Tabela de Versão:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -901,30 +898,6 @@ msgid ""
 "  -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 ""
-"Utilização: apt-cache [opções] comando\n"
-"            apt-cache [opções] showpkg pacote1 [pacote2 ...]\n"
-"            apt-cache [opções] showsrc 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"
-"\n"
-"Comandos:\n"
-"   gencaches - Construir as caches de pacotes e de código-fonte\n"
-"   showpkg - Mostrar informações gerais sobre um pacote\n"
-"   showsrc - Mostrar registos de código-fonte\n"
-"   stats - Mostrar algumas estatísticas simples\n"
-"   dump - Mostrar todo o ficheiro de forma concisa\n"
-"   dumpavail - Escrever um ficheiro disponível para stdout\n"
-"   unmet - Mostrar dependências não satisfeitas\n"
-"   search - Procurar na lista de pacotes por um padrão regex\n"
-"   show - Mostrar um registo legível sobre o pacote\n"
-"   depends - Mostrar informações em bruto de dependências de um pacote\n"
-"   rdepends - Mostrar a informação de dependências inversas de um pacote\n"
-"   pkgnames - Listar o nome de todos os pacotes no sistema\n"
-"   dotty - Gerar gráficos de pacotes para o GraphViz\n"
-"   xvcg - Gerar gráficos de pacotes para o xvcg\n"
-"   policy - Mostrar as configurações de políticas\n"
-"\n"
 "Opções:\n"
 "  -h   Este texto de ajuda.\n"
 "  -p=? A cache de pacotes.\n"
@@ -936,29 +909,91 @@ msgstr ""
 "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"
+msgstr "Mostrar registos de código-fonte"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Procurar na lista de pacotes por um padrão regex"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Mostrar informações em bruto de dependências de um pacote"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Mostrar a informação de dependências inversas de um pacote"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Mostrar um registo legível sobre o pacote"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Listar o nome de todos os pacotes no sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Mostrar as configurações de políticas"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "A ler as listas de pacotes"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pacotes Marcados:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pacotes estragados"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Remover automaticamente todos os pacotes não utilizados"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "mas é um pacote virtual"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "A ler a informação de estado"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -986,6 +1021,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este processo para o resto dos CDs no seu conjunto."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -995,30 +1065,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 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"
-"\n"
-"Comandos:\n"
-"   shell - Modo shell\n"
-"   dump - Mostrar a configuração\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1255,24 +1327,17 @@ msgid ""
 "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 ""
+"Utilização: apt-get [opções] comando\n"
+"            apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
+"            apt-get [opções] source pacote1 [pacote2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"O apt-get é um interface simples de linha de comandos para obter\n"
+"e instalar pacotes. Os comandos utilizados mais frequentemente\n"
+"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"
@@ -1291,32 +1356,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Utilização: apt-get [opções] comando\n"
-"            apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
-"            apt-get [opções] source pacote1 [pacote2 ...]\n"
-"\n"
-"O apt-get é um interface simples de linha de comandos para obter\n"
-"e instalar pacotes. Os comandos utilizados mais frequentemente\n"
-"são update e install.\n"
-"\n"
-"Comandos:\n"
-"   update - Obter novas listas de pacotes\n"
-"   upgrade - Executar uma actualização\n"
-"   install - Instalar novos pacotes (o pacote é libc6 e não libc6.deb)\n"
-"   remove - Remover pacotes\n"
-"   autoremove - Remover automaticamente todos os pacotes não utilizados\n"
-"   purge - Remover pacotes e ficheiros de configuração\n"
-"   source - Fazer o download de arquivos de código-fonte\n"
-"   build-dep - Configurar as dependências de compilação de pacotes de código-"
-"fonte\n"
-"   dist-upgrade - Actualizar a distribuição, veja apt-get(8)\n"
-"   dselect-upgrade - Seguir as escolhas feitas no dselect\n"
-"   clean - Apagar ficheiros de arquivo obtidos por download\n"
-"   autoclean - Apagar ficheiros de arquivo antigos obtidos por download\n"
-"   check - Verificar se existem dependências erradas\n"
-"   changelog - Obter e mostrar o changelog de um pacote\n"
-"   download - Obter o pacote binário para o directório actual\n"
-"\n"
 "Opções:\n"
 "  -h  Este texto de ajuda\n"
 "  -q  Saída para registo - sem indicador de progresso\n"
@@ -1336,6 +1375,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Executar uma actualização"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instalar novos pacotes (o pacote é libc6 e não libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Remover pacotes"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Remover pacotes e ficheiros de configuração"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Actualizar a distribuição, veja apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Seguir as escolhas feitas no dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configurar as dependências de compilação de pacotes de códigofonte"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Apagar ficheiros de arquivo obtidos por download"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Apagar ficheiros de arquivo antigos obtidos por download"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verificar se existem dependências erradas"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Fazer o download de arquivos de código-fonte"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Obter o pacote binário para o directório actual"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Obter e mostrar o changelog de um pacote"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1360,13 +1455,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1394,11 +1498,9 @@ msgstr "%s já estava marcado para manter.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s já estava para não manter.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperou por %s mas não estava lá"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Falhou executar dpkg. É root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1411,8 +1513,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Cancelou manter em %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Falhou executar dpkg. É root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy
@@ -1421,16 +1534,15 @@ msgid ""
 "\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 ""
+"Utilização: apt-mark [opções] {auto|manual} pacote1 [pacote2...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark é um interface simples de linha de comandos para marcar pacotes "
+"como instalados de forma manual ou automática. Pode também listar "
+"marcações.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1441,16 +1553,6 @@ msgid ""
 "  -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 ""
-"Utilização: apt-mark [opções] {auto|manual} pacote1 [pacote2...]\n"
-"\n"
-"apt-mark é um interface simples de linha de comandos para marcar pacotes "
-"como instalados de forma manual ou automática. Pode também listar "
-"marcações.\n"
-"\n"
-"Comandos:\n"
-"   auto - Marca os pacotes como instalados automaticamente\n"
-"   manual - Marca os pacotes como instalados manualmente\n"
-"\n"
 "Opções:\n"
 "   -h\tEste texto de ajuda.\n"
 "   -q\tSaída para registo - sem indicador de progresso\n"
@@ -1462,6 +1564,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Marca os pacotes como instalados manualmente"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2522,7 +2652,21 @@ msgid "Retrieving file %li of %li"
 msgstr "A obter o ficheiro %li de %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2596,19 +2740,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "O directório %s é desviado"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "O directório %s é desviado"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3021,6 +3167,11 @@ msgstr ""
 "A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão "
 "inválida no nome do ficheiro"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperou por %s mas não estava lá"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3737,6 +3888,11 @@ msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d82895db1..0c53de487 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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."
@@ -409,7 +409,7 @@ msgstr[1] ""
 "requeridos:"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Use '%s' para removê-los."
@@ -677,7 +677,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Você deve passar exatamente um padrão"
@@ -864,32 +864,27 @@ msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -900,33 +895,6 @@ msgid ""
 "  -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 ""
-"Uso: apt-cache [opções] comando\n"
-"     apt-cache [opções] add arquivo1 [arquivo1 ...]\n"
-"     apt-cache [opções] showpkg pacote1 [pacote2 ...]\n"
-"     apt-cache [opções] showsrc 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"
-"\n"
-"Comandos:\n"
-"   add - Adiciona um arquivo de pacote ao cache de fontes\n"
-"   gencaches - Constrói ambos os caches de pacotes e fontes\n"
-"   showpkg - Mostra informações gerais para um único pacote\n"
-"   showsrc - Mostra registros fontes\n"
-"   stats - Mostra algumas estatísticas básicas\n"
-"   dump - Mostra o arquivo inteiro em uma forma concisa\n"
-"   dumpavail - Imprime um arquivo \"available\" para stdout\n"
-"   unmet - Mostra dependências desencontradas\n"
-"   search - Procura a lista de pacotes por um padrão regex\n"
-"   show - Mostra um registro legível sobre o pacote\n"
-"   depends - Mostra informações de dependências não processadas de um "
-"pacote\n"
-"   rdepends - Mostra informações de dependências reversas de um pacote\n"
-"   pkgnames - Lista o nome de todos os pacotes no sistema\n"
-"   dotty - Gera gráficos de pacotes para o GraphViz\n"
-"   xvcg - Gera gráficos de pacotes para o xvcg\n"
-"   policy - Mostra as configurações de políticas\n"
-"\n"
 "Opções:\n"
 "  -h   Este texto de ajuda.\n"
 "  -p=? O cache de pacotes.\n"
@@ -938,29 +906,91 @@ msgstr ""
 "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"
+msgstr "Mostra registros fontes"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Procura a lista de pacotes por um padrão regex"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Mostra informações de dependências não processadas de um pacote"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Mostra informações de dependências reversas de um pacote"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Mostra um registro legível sobre o pacote"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Lista o nome de todos os pacotes no sistema"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Mostra as configurações de políticas"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Lendo listas de pacotes"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pacotes alfinetados (\"pinned\"):"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pacotes quebrados"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Remove automaticamente todos os pacotes não usados"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s configurado para instalar manualmente.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Lendo informação de estado"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -989,6 +1019,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este processo para o restante dos CDs em seu conjunto."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumentos não estão em pares"
@@ -998,31 +1052,33 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Uso: apt-config [opções] comando\n"
-"\n"
-"O apt-config é uma ferramenta simples para ler o arquivo de configuração\n"
-"do APT\n"
-"\n"
-"Comandos:\n"
-"   shell - Modo shell\n"
-"   dump - Mostra a configuração\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1239,7 +1295,6 @@ 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"
@@ -1248,24 +1303,17 @@ msgid ""
 "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 ""
+"Uso: apt-get [opções] comando\n"
+"     apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
+"     apt-get [opções] source pacote1 [pacote2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"O apt-get é uma interface simples de linha de comando para baixar\n"
+"pacotes e instalá-los. Os comandos usados mais frequentemente são\n"
+"update e install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1284,29 +1332,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Uso: apt-get [opções] comando\n"
-"     apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
-"     apt-get [opções] source pacote1 [pacote2 ...]\n"
-"\n"
-"O apt-get é uma interface simples de linha de comando para baixar\n"
-"pacotes e instalá-los. Os comandos usados mais frequentemente são\n"
-"update e install.\n"
-"\n"
-"Comandos:\n"
-"   update - Obtém novas listas de pacotes\n"
-"   upgrade - Realiza uma atualização\n"
-"   install - Instala novos pacotes (um pacote é libc6 e não libc6.deb)\n"
-"   remove - Remove pacotes\n"
-"   autoremove - Remove automaticamente todos os pacotes não usados\n"
-"   purge - Remove e expurga (\"purge\") pacotes\n"
-"   source - Baixa arquivos fonte\n"
-"   build-dep - Configura as dependências de compilação de pacotes fonte\n"
-"   dist-upgrade - Atualiza a distribuição, veja apt-get(8)\n"
-"   dselect-upgrade - Segue as seleções do dselect\n"
-"   clean - Apaga arquivos baixados para instalação\n"
-"   autoclean - Apaga arquivos antigos baixados para instalação\n"
-"   check - Verifica se não há dependências quebradas\n"
-"\n"
 "Opções:\n"
 "  -h  Este texto de ajuda\n"
 "  -q  Saída que pode ser registrada em log - sem indicador de progresso\n"
@@ -1326,6 +1351,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Realiza uma atualização"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instala novos pacotes (um pacote é libc6 e não libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Remove pacotes"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Remove e expurga (\"purge\") pacotes"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Atualiza a distribuição, veja apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Segue as seleções do dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configura as dependências de compilação de pacotes fonte"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Apaga arquivos baixados para instalação"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Apaga arquivos antigos baixados para instalação"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verifica se não há dependências quebradas"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Baixa arquivos fonte"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1350,13 +1431,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1384,11 +1474,9 @@ msgstr "%s já é a versão mais nova.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperado %s mas este não estava lá"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1401,7 +1489,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Falhou ao abrir %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1410,16 +1509,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1431,6 +1524,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s configurado para instalar manualmente.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s configurado para instalar manualmente.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s configurado para instalar manualmente.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2498,7 +2623,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Obtendo arquivo %li de %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2563,19 +2702,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "O diretório %s é desviado (\"diverted\")"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "O diretório %s é desviado (\"diverted\")"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2967,6 +3108,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperado %s mas este não estava lá"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3658,6 +3804,11 @@ msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
diff --git a/po/ro.po b/po/ro.po
index deaa65ba6..6912f352e 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -412,7 +412,7 @@ msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Folosiți '%s' pentru a le șterge."
@@ -682,7 +682,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Eroare de compilare expresie regulată - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Trebuie să dați exact un șablon"
@@ -870,32 +870,27 @@ msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -906,32 +901,6 @@ msgid ""
 "  -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 ""
-"Utilizare: apt-cache [opțiuni] comanda\n"
-"       apt-cache [opțiuni] add fișier1 [fișier2 ...]\n"
-"       apt-cache [opțiuni] showpkg pachet1 [pachet2 ...]\n"
-"       apt-cache [opțiuni] showsrc 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"
-"\n"
-"Comenzi:\n"
-"   add       - Adaugă un fișier pachet la cache-ul sursă\n"
-"   gencaches - Generează cache-ul de pachete și cache-ul de surse\n"
-"   showpkg   - Arată câteva informații generale pentru un pachet\n"
-"   showsrc   - Arată înregistrările despre sursă\n"
-"   stats     - Arată câteva statistici de bază\n"
-"   dump      - Arată întregul fișier într-o formă concisă\n"
-"   dumpavail - Afișează un fișier disponibil la ieșirea standard\n"
-"   unmet     - Arată dependențele neîndeplinite\n"
-"   search    - Caută în lista de pachete folosind un șablon regex\n"
-"   show      - Arată o înregistrare lizibilă pentru pachet\n"
-"   depends   - Arată informații brute de dependențe pentru un pachet\n"
-"   rdepends  - Arată dependențele inverse pentru un pachet\n"
-"   pkgnames  - Afișează numele tuturor pachetelor din sistem\n"
-"   dotty     - Generează grafice cu pachete pentru GraphViz\n"
-"   xvcg      - Generează grafice cu pachete pentru xvcg\n"
-"   policy    - Arată configurațiile de politici\n"
-"\n"
 "Opțiuni:\n"
 "  -h   Acest text de ajutor.\n"
 "  -p=? Cache-ul de pachete.\n"
@@ -942,29 +911,91 @@ msgstr ""
 "  -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ă"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Caută în lista de pachete folosind un șablon regex"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Arată informații brute de dependențe pentru un pachet"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Arată dependențele inverse pentru un pachet"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Arată o înregistrare lizibilă pentru pachet"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Afișează numele tuturor pachetelor din sistem"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Arată configurațiile de politici"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Citire liste de pachete"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pachete alese special:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pachete deteriorate"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Șterge automat toate pachetele nefolosite"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s este marcat ca fiind instalat manual.\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Se citesc informațiile de stare"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -992,6 +1023,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetați această procedură pentru restul CD-urilor din set."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Argumentele nu sunt perechi"
@@ -1001,30 +1056,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Utilizare: apt-config [opțiuni] comanda\n"
-"\n"
-"apt-config este o unealtă simplă pentru citirea fișierului de configurare "
-"APT\n"
-"\n"
-"Comenzi:\n"
-"   shell - Modul consolă\n"
-"   dump  - Arată configurația\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1242,7 +1299,6 @@ 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"
@@ -1251,24 +1307,17 @@ msgid ""
 "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 ""
+"Utilizare: apt-get [opțiuni] comanda\n"
+"           apt-get [opțiuni] install|remove pachet1 [pachet2 ...]\n"
+"           apt-get [opțiuni] source pachet1 [pachet2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get este o simplă interfață în linie de comandă pentru descărcarea și\n"
+"instalarea pachetelor. Cele mai frecvent folosite comenzi sunt update\n"
+"și install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1287,30 +1336,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Utilizare: apt-get [opțiuni] comanda\n"
-"         apt-get [opțiuni] install|remove pachet1 [pachet2 ...]\n"
-"         apt-get [opțiuni] source pachet1 [pachet2 ...]\n"
-"\n"
-"apt-get este o simplă interfață în linie de comandă pentru descărcarea și\n"
-"instalarea pachetelor. Cele mai frecvent folosite comenzi sunt update\n"
-"și install.\n"
-"\n"
-"Comenzi:\n"
-"   update  - Aduce listele noi de pachete\n"
-"   upgrade - Realizează o înnoire\n"
-"   install - Instalează pachete noi (pachet este libc6, nu libc6.deb)\n"
-"   remove  - Șterge pachete\n"
-"   autoremove - Șterge automat toate pachetele nefolosite\n"
-"   purge      - Șterge și curăță pachete\n"
-"   source     - Descarcă pachete-sursă\n"
-"   build-dep  - Configurează dependențele de compilare pentru\n"
-"                pachetele-sursă\n"
-"   dist-upgrade - Înnoirea distribuției, a se vedea apt-get(8)\n"
-"   dselect-upgrade - Urmează selecțiile dselect\n"
-"   clean      - Șterge fișierele-arhivă descărcate\n"
-"   autoclean  - Șterge fișiere-arhivă descărcate învechite\n"
-"   check      - Verifică dacă există dependențe neîndeplinite\n"
-"\n"
 "Opțiuni:\n"
 "  -h  Acest text de ajutor.\n"
 "  -q  Afișare jurnalizabilă - fără indicator de progres\n"
@@ -1330,6 +1355,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Realizează o înnoire"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Instalează pachete noi (pachet este libc6, nu libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Șterge pachete"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Șterge și curăță pachete"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Înnoirea distribuției, a se vedea apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Urmează selecțiile dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Configurează dependențele de compilare pentru pachetele-sursă"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Șterge fișierele-arhivă descărcate"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Șterge fișiere-arhivă descărcate învechite"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Verifică dacă există dependențe neîndeplinite"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Descarcă pachete-sursă"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1354,13 +1435,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1388,11 +1478,9 @@ msgstr "%s este deja la cea mai nouă versiune.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Așteptat %s, dar n-a fost acolo"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1405,7 +1493,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Eșec la „open” pentru %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1414,16 +1513,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1435,6 +1528,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s este marcat ca fiind instalat manual.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s este marcat ca fiind instalat manual.\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s este marcat ca fiind instalat manual.\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2510,7 +2635,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Se descarcă fișierul %li din %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2577,19 +2716,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Directorul %s este redirectat"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Directorul %s este redirectat"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2981,6 +3122,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Așteptat %s, dar n-a fost acolo"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3671,6 +3817,11 @@ msgstr "Linie greșită %u în lista sursă %s (tip)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
diff --git a/po/ru.po b/po/ru.po
index 492be269d..577dd020d 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -425,6 +425,7 @@ msgstr[1] "%lu пакета было установлено автоматиче
 msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Для его удаления используйте «%s»."
@@ -697,7 +698,7 @@ msgstr "Н"
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения — %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Вы должны задать не менее одно шаблона поиска"
 
@@ -889,29 +890,25 @@ msgstr "  Таблица версий:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -922,30 +919,6 @@ msgid ""
 "  -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 ""
-"Использование: apt-cache [параметры] команда\n"
-"          или: apt-cache [параметры] showpkg пакет1 [пакет2…]\n"
-"          или: apt-cache [параметры] showsrc пакет1 [пакет2…]\n"
-"\n"
-"apt-cache — низкоуровневый инструмент для поиска\n"
-"информации в двоичных кэш-файлах APT\n"
-"\n"
-"Команды:\n"
-"   gencaches - построить кэш пакетов и кэш источников\n"
-"   showpkg - показать общую информацию о конкретном пакете\n"
-"   showsrc - показать записи об источниках\n"
-"   stats - показать общую статистику\n"
-"   dump - показать весь файл в сокращённой форме\n"
-"   dumpavail - выдать на stdout файл available\n"
-"   unmet - показать неудовлетворённые зависимости\n"
-"   search - найти пакеты, имя которых удовлетворяет регулярному выражению\n"
-"   show - показать информацию о пакете в удобочитаемой форме\n"
-"   depends - показать необработанную информацию о зависимостях пакета\n"
-"   rdepends - показать информацию об обратных зависимостях пакета\n"
-"   pkgnames - показать имена всех пакетов в системе\n"
-"   dotty - генерировать граф пакетов в формате GraphVis\n"
-"   xvcg - генерировать граф пакетов в формате xvcg\n"
-"   policy - показать текущую политику выбора пакетов\n"
-"\n"
 "Параметры:\n"
 "  -h   Эта справка.\n"
 "  -p=? Кэш пакетов.\n"
@@ -956,46 +929,88 @@ msgstr ""
 "  -o=? Задать значение произвольной настройки, например, -o dir::cache=/tmp\n"
 "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "показать записи об источниках"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "найти пакеты, имя которых удовлетворяет регулярному выражению"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "показать необработанную информацию о зависимостях пакета"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "показать информацию об обратных зависимостях пакета"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "показать информацию о пакете в удобочитаемой форме"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "показать имена всех пакетов в системе"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "показать текущую политику выбора пакетов"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Использование: apt [параметры] команда\n"
 "\n"
 "Интерфейс командной строки для apt.\n"
-"Основные команды: \n"
-" list — показать список пакетов из указанных имён пакетов\n"
-" search — искать в описаниях пакетов\n"
-" show — показать дополнительные данные о пакете\n"
-"\n"
-" update — обновить список доступных пакетов\n"
-"\n"
-" install — установить пакеты\n"
-" remove  — удалить пакеты\n"
-"\n"
-" upgrade — обновить систему, устанавливая/обновляя пакеты\n"
-" full-upgrade — обновить систему, удаляя/устанавливая/обновляя пакеты\n"
-"\n"
-" edit-sources — редактировать файл с источниками пакетов\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "показать список пакетов из указанных имён пакетов"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "искать в описаниях пакетов"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "показать дополнительные данные о пакете"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "установить пакеты"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "удалить пакеты"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "автоматически удалить все неиспользуемые пакеты"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "обновить список доступных пакетов"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "обновить систему, устанавливая/обновляя пакеты"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr "обновить систему, удаляя/устанавливая/обновляя пакеты"
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr "редактировать файл с источниками пакетов"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1029,6 +1044,42 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторите этот процесс для всех имеющихся CD."
 
+#: cmdline/apt-cdrom.cc
+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"
+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 "Непарные аргументы"
@@ -1038,30 +1089,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Использование: apt-config [параметры] команда\n"
-"\n"
-"apt-config — простой инструмент для чтения файла настройки APT\n"
-"\n"
-"Команды:\n"
-"   shell - режим shell\n"
-"   dump -  показать настройки\n"
-"\n"
 "Параметры:\n"
 "   -h   Этот текст.\n"
 "   -с=? Читать указанный файл настройки.\n"
 "   -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
 "tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1296,24 +1349,17 @@ msgid ""
 "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 ""
+"Использование: apt-get [параметры] команда\n"
+"               apt-get [параметры] install|remove пакет1 [пакет2…]\n"
+"               apt-get [параметры] source пакет1 [пакет2…]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get — простая программа с интерфейсом командной строки\n"
+"для скачивания и установки пакетов. Наиболее часто используемые\n"
+"команды — update и install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1332,34 +1378,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Использование: apt-get [параметры] команда\n"
-"               apt-get [параметры] install|remove пакет1 [пакет2…]\n"
-"               apt-get [параметры] source пакет1 [пакет2…]\n"
-"\n"
-"apt-get — простая программа с интерфейсом командной строки\n"
-"для скачивания и установки пакетов. Наиболее часто используемые\n"
-"команды — update и install.\n"
-"\n"
-"Команды:\n"
-"   update -  получить новые списки пакетов\n"
-"   upgrade - выполнить обновление\n"
-"   install - установить новые пакеты (на месте пакета указывается имя "
-"пакета\n"
-"             (libc6, а не имя файла libc6.deb)\n"
-"   remove -  удалить пакеты\n"
-"   autoremove - автоматически удалить все неиспользуемые пакеты\n"
-"   purge -   удалить пакеты вместе с их файлами настройки\n"
-"   source -  скачать архивы с исходным кодом\n"
-"   build-dep - настроить всё необходимое для сборки\n"
-"               пакета из исходного кода\n"
-"   dist-upgrade - обновить всю систему, подробнее в apt-get(8)\n"
-"   dselect-upgrade - руководствоваться выбором, сделанным в dselect\n"
-"   clean -   удалить скачанные файлы архивов\n"
-"   autoclean - удалить старые скачанные файлы архивов\n"
-"   check -   проверить наличие нарушенных зависимостей\n"
-"   changelog - скачать и показать файл изменений заданного пакета\n"
-"   download - скачать двоичный пакет в текущий каталог\n"
-"\n"
 "Параметры:\n"
 "  -h   эта справка\n"
 "  -q   показывать сообщения о работе, не выводить индикатор хода работы\n"
@@ -1379,6 +1397,64 @@ msgstr ""
 "содержится подробная информация и описание параметров.\n"
 "                       В APT есть коровья СУПЕРСИЛА.\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "получить новые списки пакетов"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "выполнить обновление"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+"установить новые пакеты (на месте пакета указывается имя пакета (libc6, а не "
+"имя файла libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "удалить пакеты"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "удалить пакеты вместе с их файлами настройки"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "обновить всю систему, подробнее в apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "руководствоваться выбором, сделанным в dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "настроить всё необходимое для сборки пакета из исходного кода"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "удалить скачанные файлы архивов"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "удалить старые скачанные файлы архивов"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "проверить наличие нарушенных зависимостей"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "скачать архивы с исходным кодом"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "скачать двоичный пакет в текущий каталог"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "скачать и показать файл изменений заданного пакета"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "В качестве аргумента требуется URL"
@@ -1397,30 +1473,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Использование: apt-helper [параметры] команда\n"
 "       apt-helper [параметры] download-file uri target-path\n"
 "\n"
 "apt-helper — вспомогательная программа для apt\n"
-"\n"
-"Команды:\n"
-"   download-file — скачать файл по заданному uri в target-path\n"
-"   auto-detect-proxy — определять прокси с помощью apt.conf\n"
-"\n"
-"                   В этой программе есть Super Meep Powers.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "определять прокси с помощью apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1447,11 +1525,10 @@ msgstr "%s уже помечен как зафиксированный.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s уже помечен как не зафиксированный.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ожидалось завершение процесса %s, но он не был запущен"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+"Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1464,9 +1541,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Отмена фиксации для %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
-"Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1474,16 +1561,15 @@ msgid ""
 "\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 ""
+"Использование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark — простая программа с интерфейсом командной строки\n"
+"для отметки пакетов, что они установлены вручную или автоматически.\n"
+"Также может показывать списки помеченных пакетов.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1494,21 +1580,6 @@ msgid ""
 "  -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 ""
-"Использование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n"
-"\n"
-"apt-mark — простая программа с интерфейсом командной строки\n"
-"для отметки пакетов, что они установлены вручную или автоматически.\n"
-"Также может показывать списки помеченных пакетов.\n"
-"\n"
-"Команды:\n"
-"   auto — пометить указанные пакеты, как установленные автоматически\n"
-"   manual — пометить указанные пакеты, как установленные вручную\n"
-"   hold — пометить пакет как зафиксированный\n"
-"   unhold — снять метку пакета, что он зафиксирован\n"
-"   showauto — вывести список автоматически установленных пакетов\n"
-"   showmanual — вывести список пакетов установленных вручную\n"
-"   showhold — вывести список зафиксированных пакетов\n"
-"\n"
 "Параметры:\n"
 "  -h   эта справка\n"
 "  -q   показывать сообщения о работе, не выводить индикатор хода работы\n"
@@ -1521,6 +1592,34 @@ msgstr ""
 "В справочных страницах apt-mark(8) и apt.conf(5)\n"
 "содержится дополнительная информация."
 
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as automatically installed"
+msgstr "пометить указанные пакеты, как установленные автоматически"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "пометить указанные пакеты, как установленные вручную"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "пометить пакет как зафиксированный"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "снять метку пакета, что он зафиксирован"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "вывести список автоматически установленных пакетов"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "вывести список пакетов установленных вручную"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "вывести список зафиксированных пакетов"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2588,7 +2687,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Скачивается файл %li из %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2658,19 +2771,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Каталог %s входит в список diverted"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Каталог %s входит в список diverted"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3073,6 +3188,11 @@ msgstr ""
 "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное "
 "расширение"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ожидалось завершение процесса %s, но он не был запущен"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3790,6 +3910,11 @@ msgstr "Искажённая строка %u в списке источнико�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Неизвестный тип «%s» в строфе %u в списке источников %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
diff --git a/po/sk.po b/po/sk.po
index 05f3e11ed..d7a2baea5 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -416,6 +416,7 @@ msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Na jeho odstránenie použite „%s“."
@@ -689,7 +690,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Chyba pri preklade regulárneho výrazu - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadať aspoň jeden vyhľadávací vzor"
 
@@ -878,29 +879,25 @@ msgstr "  Tabuľka verzií:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -911,30 +908,6 @@ msgid ""
 "  -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 ""
-"Použitie: apt-cache [voľby] príkaz\n"
-"          apt-cache [voľby] showpkg balík1 [balík2 ...]\n"
-"          apt-cache [voľby] showsrc 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"
-"\n"
-"Príkazy:\n"
-"   gencaches - Zostaví vyrovnávaciu pamäť balíkov a zdrojov\n"
-"   showpkg   - Zobrazí všeobecné údaje o balíku\n"
-"   showsrc   - Zobrazí zdrojové záznamy\n"
-"   stats     - Zobrazí základné štatistiky\n"
-"   dump      - Zobrazí celý súbor v zhustenej podobe\n"
-"   dumpavail - Vypíše súbor dostupných balíkov na štandardný výstup\n"
-"   unmet     - Zobrazí nesplnené závislosti\n"
-"   search    - Prehľadá zoznam balíkov podľa regulárneho výrazu\n"
-"   show      - Zobrazí prehľadné informácie o balíku\n"
-"   depends   - Zobrazí základné údaje o závislostiach balíka\n"
-"   rdepends  - Zobrazí údaje o spätných závislostiach balíka\n"
-"   pkgnames  - Vypíše zoznam názvov všetkých balíkov v systéme\n"
-"   dotty     - Vytvorí diagramy balíka pre GraphViz\n"
-"   xvcg      - Vytvorí diagramy balíka pre xvcg\n"
-"   policy    - Zobrazí nastavenia zásad\n"
-"\n"
 "Voľby:\n"
 "  -h   Tento pomocník.\n"
 "  -p=? Vyrovnávacia pamäť balíkov.\n"
@@ -946,29 +919,91 @@ msgstr ""
 "Ď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"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Prehľadá zoznam balíkov podľa regulárneho výrazu"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Zobrazí základné údaje o závislostiach balíka"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Zobrazí údaje o spätných závislostiach balíka"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Zobrazí prehľadné informácie o balíku"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Vypíše zoznam názvov všetkých balíkov v systéme"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Zobrazí nastavenia zásad"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pripevnené balíky:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Poškodené balíky"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Automaticky odstráni všetky nepoužité balíky"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ale je to virtuálny balík"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Načítavajú sa stavové informácie"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“"
@@ -995,6 +1030,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1004,29 +1073,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"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"
-"\n"
-"Príkazy:\n"
-"   shell - Režim shell\n"
-"   dump  - Zobrazí nastavenie\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1258,24 +1329,16 @@ msgid ""
 "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 ""
+"Použitie: apt-get [voľby] príkaz\n"
+"          apt-get [voľby] install|remove balík1 [balík2 ...]\n"
+"          apt-get [voľby] source balík1 [balík2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get je jednoduché rozhranie na príkazovom riadku na sťahovanie\n"
+"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"
@@ -1294,31 +1357,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Použitie: apt-get [voľby] príkaz\n"
-"          apt-get [voľby] install|remove balík1 [balík2 ...]\n"
-"          apt-get [voľby] source balík1 [balík2 ...]\n"
-"\n"
-"apt-get je jednoduché rozhranie na príkazovom riadku na sťahovanie\n"
-"a inštaláciu balíkov. Najpoužívanejšími príkazmi sú update a install.\n"
-"\n"
-"Príkazy:\n"
-"   update          - Získa nové zoznamy balíkov\n"
-"   upgrade         - Vykoná aktualizáciu\n"
-"   install         - Nainštaluje nové balíky (balík je libc6, nie libc6."
-"deb)\n"
-"   remove          - Odstráni balíky\n"
-"   autoremove      - Automaticky odstráni všetky nepoužité balíky\n"
-"   purge           - Odstráni a balíky a ich konfiguračné súbory\n"
-"   source          - Stiahne zdrojové archívy\n"
-"   build-dep       - Nastaví závislosti kompilácie pre zdrojové balíky\n"
-"   dist-upgrade    - Aktualizácia distribúcie, pozri apt-get(8)\n"
-"   dselect-upgrade - Riadi sa podľa výberu v dselect\n"
-"   clean           - Zmaže stiahnuté archívy\n"
-"   autoclean       - Zmaže staré stiahnuté archívy\n"
-"   check           - Overí, či neexistujú poškodené závislosti\n"
-"   markauto        - Označí zadané balíky ako automaticky nainštalované\n"
-"   unmarkauto      - Označí zadané balíky ako manuálne nainštalované\n"
-"\n"
 "Voľby:\n"
 "  -h  Tento pomocník\n"
 "  -q  Nezobrazí indikátor priebehu - pre záznam\n"
@@ -1337,6 +1375,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Vykoná aktualizáciu"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Nainštaluje nové balíky (balík je libc6, nie libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Odstráni balíky"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Odstráni a balíky a ich konfiguračné súbory"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Aktualizácia distribúcie, pozri apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Riadi sa podľa výberu v dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Nastaví závislosti kompilácie pre zdrojové balíky"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Zmaže stiahnuté archívy"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Zmaže staré stiahnuté archívy"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Overí, či neexistujú poškodené závislosti"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Stiahne zdrojové archívy"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1361,13 +1455,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1395,11 +1498,9 @@ msgstr "%s bol už nastavený na podržanie.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s bol už nastavený na nepodržanie.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Čakalo sa na %s, ale nebolo to tam"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Vykonanie dpkg zlyhalo. Ste root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1412,26 +1513,35 @@ msgid "Canceled hold on %s.\n"
 msgstr "Zrušené podržanie %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Vykonanie dpkg zlyhalo. Ste root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+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"
+msgstr ""
+"Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n"
+"balíkov ako manuálne alebo automaticky nainštalované.\n"
+"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"
@@ -1442,16 +1552,6 @@ msgid ""
 "  -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 ""
-"Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n"
-"\n"
-"apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n"
-"balíkov ako manuálne alebo automaticky nainštalované.\n"
-"Tiež dokáže označenia vypisovať.\n"
-"\n"
-"Príkazy:\n"
-"   auto - Označí uvedené balíky ako automaticky nainštalované\n"
-"   manual - Označí uvedené balíky ako manuálne nainštalované\n"
-"\n"
 "Voľby:\n"
 "  -h  Tento text pomocníka.\n"
 "  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
@@ -1462,6 +1562,34 @@ msgstr ""
 "  -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é"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Označí uvedené balíky ako manuálne nainštalované"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2512,7 +2640,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Sťahuje sa %li. súbor z %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2583,19 +2725,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Adresár %s je divertovaný"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Adresár %s je divertovaný"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2988,6 +3132,11 @@ msgid ""
 msgstr ""
 "Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Čakalo sa na %s, ale nebolo to tam"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3689,6 +3838,11 @@ msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
diff --git a/po/sl.po b/po/sl.po
index d6f1c124e..d20dead61 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -419,6 +419,7 @@ msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
 msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Uporabite '%s' za njihovo odstranitev."
@@ -693,7 +694,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Napaka med prevajanjem logičnega izraza - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Podati morate vsaj en iskalni vzorec"
 
@@ -882,29 +883,25 @@ msgstr "  Preglednica različic:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -915,30 +912,6 @@ msgid ""
 "  -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 ""
-"Uporaba: apt-cache [možnosti] ukaz\n"
-"       apt-cache [možnosti] showpkg paket1 [paket2 ...]\n"
-"       apt-cache [možnosti] showsrc paket1 [paket2 ...]\n"
-"\n"
-"apt-cache je orodje nizke ravni za poizvedbo podatkov\n"
-"iz binarni datotek predpomnilnika APT\n"
-"\n"
-"Ukazi:\n"
-"   gencaches - Izgradi tako predpomnilnik paketa in izvorne kode\n"
-"   showpkg - Prikaže nekaj splošnih podatkov o posameznem paketu\n"
-"   showsrc - Prikaže zapise izvorne kode\n"
-"   stats - Prikaže nekaj osnovne statistike\n"
-"   dump - Prikaže celotno datoteko v skrajšani obliki\n"
-"   dumpavail - Izpiše razpoložljivo datoteko na stdout\n"
-"   unmet - Prikaže nezadoščene odvisnosti\n"
-"   search - Išče seznam paketov z vzorcem logičnega izraza\n"
-"   show - Show a readable record for the package\n"
-"   depends - Prikaže surove podatke odvisnosti za paket\n"
-"   rdepends - Pokaže obratne podatke odvisnosti za paket\n"
-"   pkgnames - Izpiše imena vseh paketov na sistemu\n"
-"   dotty - Ustvari grafe paketa za GraphViz\n"
-"   xvcg -  Ustvari grafe paketa za xvcg\n"
-"   policy - Prikaže nastavitve pravil\n"
-"\n"
 "Možnosti:\n"
 "  -h To besedilo pomoči.\n"
 "  -p=? Predpomnilnik paketov.\n"
@@ -950,29 +923,91 @@ msgstr ""
 "Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt."
 "conf(5).\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Prikaže zapise izvorne kode"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Išče seznam paketov z vzorcem logičnega izraza"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Prikaže surove podatke odvisnosti za paket"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Pokaže obratne podatke odvisnosti za paket"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Show a readable record for the package"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Izpiše imena vseh paketov na sistemu"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Prikaže nastavitve pravil"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Branje seznama paketov"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pripeti paketi:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pokvarjeni paketi"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Samodejno odstrani vse neuporabljene pakete"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "vendar je navidezen paket"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Branje podatkov o stanju"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'"
@@ -999,6 +1034,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
@@ -1008,29 +1077,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Uporaba: apt-config [možnosti] ukaz\n"
-"\n"
-"apt-config je preprosto orodje za branje nastavitvene datoteke APT\n"
-"\n"
-"Ukazi:\n"
-"   shell - Lupinski način\n"
-"   dump - Prikaže nastavitve\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1261,24 +1332,16 @@ msgid ""
 "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 ""
+"Uporaba: apt-get [možnosti] ukaz\n"
+"       apt-get [možnosti] install|remove paket1 [paket2 ...]\n"
+"       apt-get [možnosti] source paket1 [paket2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get je enostaven vmesnik ukazne vrstice za prejem in nameščanje\n"
+"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"
@@ -1297,30 +1360,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Uporaba: apt-get [možnosti] ukaz\n"
-"       apt-get [možnosti] install|remove paket1 [paket2 ...]\n"
-"       apt-get [možnosti] source paket1 [paket2 ...]\n"
-"\n"
-"apt-get je enostaven vmesnik ukazne vrstice za prejem in nameščanje\n"
-"paketov. Najbolj pogosto uporabljana ukaza sta update in install.\n"
-"\n"
-"Ukazi:\n"
-"   update - Pridobi nove sezname paketov\n"
-"   upgrade - Izvedix nadgradnjo\n"
-"   install - Namesti nove pakete (paket je libc6, ne libc6.deb)\n"
-"   remove - Odstrani pakete\n"
-"   autoremove - Samodejno odstrani vse neuporabljene pakete\n"
-"   purge - Odstrani pakete in nastavitvene datoteke\n"
-"   source - Prejmi arhive izvorne kode\n"
-"   build-dep - Nastavi odvisnosti gradnje za paket izvorne kode\n"
-"   dist-upgrade - Nadgradnja distribucije, oglejte si apt-get(8)\n"
-"   dselect-upgrade - Sledi izbiri dselect\n"
-"   clean - Izbriši prejete datoteke arhivov\n"
-"   autoclean - Izbriše stare prejete datoteke arhivov\n"
-"   check - Preveri, da ni pokvarjenih odvisnosti\n"
-"   changelog - Prejmi in prikaže dnevnik sprememb za dani paket\n"
-"   download - Prejmi binarni paket v trenutno mapo\n"
-"\n"
 "Možnosti:\n"
 "  -h To besedilo pomoči.\n"
 "  -q Izhod se beleži - brez kazalnika napredka\n"
@@ -1339,6 +1378,62 @@ msgstr ""
 " 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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Izvedix nadgradnjo"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Namesti nove pakete (paket je libc6, ne libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Odstrani pakete"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Odstrani pakete in nastavitvene datoteke"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Nadgradnja distribucije, oglejte si apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Sledi izbiri dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Nastavi odvisnosti gradnje za paket izvorne kode"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Izbriši prejete datoteke arhivov"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Izbriše stare prejete datoteke arhivov"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Preveri, da ni pokvarjenih odvisnosti"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Prejmi arhive izvorne kode"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Prejmi binarni paket v trenutno mapo"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Prejmi in prikaže dnevnik sprememb za dani paket"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1364,13 +1459,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1398,11 +1502,9 @@ msgstr "paket %s je bil že nastavljen kot na čakanju.\n"
 msgid "%s was already not hold.\n"
 msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Program je čakal na %s a ga ni bilo tam"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1415,26 +1517,34 @@ msgid "Canceled hold on %s.\n"
 msgstr "Čakanje za %s je bilo preklicano.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+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"
+msgstr ""
+"Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n"
+"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"
@@ -1445,15 +1555,6 @@ msgid ""
 "  -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 ""
-"Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
-"\n"
-"apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n"
-"kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiše.\n"
-"\n"
-"Ukazi:\n"
-"   auto - Označi dane pakete kot samodejno nameščene\n"
-"  manual - Označi dane pakete kot ročno nameščene\n"
-"\n"
 "Možnosti:\n"
 "  -h To besedilo pomoči.\n"
 "  -q Izhod se beleži - brez kazalnika napredka\n"
@@ -1464,6 +1565,34 @@ msgstr ""
 "  -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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Označi dane pakete kot ročno nameščene"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2517,7 +2646,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Pridobivanje datoteke %li od %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2588,19 +2731,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Mapa %s je odklonjena"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Mapa %s je odklonjena"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2992,6 +3137,11 @@ msgid ""
 msgstr ""
 "Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Program je čakal na %s a ga ni bilo tam"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3694,6 +3844,11 @@ msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
diff --git a/po/sv.po b/po/sv.po
index eb044f321..e93e29282 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -414,6 +414,7 @@ msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Använd ”%s” för att ta bort det."
@@ -687,7 +688,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Du måste ange minst ett sökmönster"
 
@@ -875,29 +876,25 @@ msgstr "  Versionstabell:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -908,30 +905,6 @@ msgid ""
 "  -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 ""
-"Användning: apt-cache [flaggor] kommando\n"
-"            apt-cache [flaggor] showpkg paket1 [paket2 …]\n"
-"            apt-cache [flaggor] showsrc 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"
-"\n"
-"Kommandon:\n"
-"   gencaches - Bygg både paket- och källcache\n"
-"   showpkg - Visa viss allmän information om ett enskilt paket\n"
-"   showsrc - Visa källkodsposter\n"
-"   stats - Visa viss grundläggande statistik\n"
-"   dump - Visa hela filen i koncis form\n"
-"   dumpavail - Skriv en ”available”-fil på standard ut\n"
-"   unmet - Visa otillfredsställbara beroenden\n"
-"   search - Sök i paketlistan med ett reguljärt uttryck\n"
-"   show - Visa en läsbar post för paketet\n"
-"   depends - Visa rå information om beroenden för ett paket\n"
-"   rdepends - Visa information om omvända beroenden för ett paket\n"
-"   pkgnames - Lista namnen på alla paket i systemet\n"
-"   dotty - Generera paketdiagram för GraphViz\n"
-"   xvcg - Generera paketdiagram för xvcg\n"
-"   policy - Visa policyinställningar\n"
-"\n"
 "Flaggor:\n"
 "  -h   Denna hjälptext.\n"
 "  -p=? Paketcachen.\n"
@@ -942,47 +915,88 @@ msgstr ""
 "  -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"
+msgstr "Visa källkodsposter"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Sök i paketlistan med ett reguljärt uttryck"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Visa rå information om beroenden för ett paket"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Visa information om omvända beroenden för ett paket"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Visa en läsbar post för paketet"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Lista namnen på alla paket i systemet"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Visa policyinställningar"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Användning: apt [flaggor] kommando\n"
 "\n"
 "Kommandoradsgränssnitt för apt.\n"
-"Grundläggande kommandon: \n"
-" list - lista paket baserat på paketnamn\n"
-" search - sök i paketbeskrivningar\n"
-" show - visa detaljer för paket\n"
-"\n"
-" update - uppdatera lista över tillgängliga paket\n"
-"\n"
-" install - installera paket\n"
-" remove  - ta bort paket\n"
-"\n"
-" upgrade - uppgradera systemet genom att installera/uppgradera paket\n"
-" full-upgrade - uppgradera systemet genom att ta bort/installera/uppgradera "
-"paket\n"
-"\n"
-" edit-sources - redigera källinformationsfilen\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "lista paket baserat på paketnamn"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "sök i paketbeskrivningar"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "visa detaljer för paket"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "installera paket"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "ta bort paket"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Ta automatiskt bort alla oanvända paket"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "uppdatera lista över tillgängliga paket"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "uppgradera systemet genom att installera/uppgradera paket"
+
+#: cmdline/apt.cc
+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"
+msgstr "redigera källinformationsfilen"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1015,6 +1029,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
 msgstr "Argumenten gavs inte parvis"
@@ -1024,29 +1073,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"Användning: apt-config [flaggor] kommando\n"
-"\n"
-"apt-config är ett enkelt verktyg för att läsa APTs konfigurationsfil\n"
-"\n"
-"Kommandon:\n"
-"   shell - Skalläge.\n"
-"   dump - Visa konfigurationen.\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1280,24 +1331,16 @@ msgid ""
 "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 ""
+"Användning: apt-get [flaggor] kommando\n"
+"       apt-get [flaggor] install|remove paket1 [paket2 …]\n"
+"       apt-get [flaggor] source paket1 [paket2 …]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n"
+"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"
@@ -1316,30 +1359,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Användning: apt-get [flaggor] kommando\n"
-"       apt-get [flaggor] install|remove paket1 [paket2 …]\n"
-"       apt-get [flaggor] source paket1 [paket2 …]\n"
-"\n"
-"apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n"
-"paket. De mest använda kommandona är ”update” och ”install”.\n"
-"\n"
-"Kommandon:\n"
-"   update - Hämta nya paketlistor\n"
-"   upgrade - Genomför en uppgradering\n"
-"   install - Installera nya paket (paket är libc6, inte libc6.deb)\n"
-"   remove - Ta bort paket\n"
-"   autoremove - Ta automatiskt bort alla oanvända paket\n"
-"   purge - Ta bort paket och konfigurationsfiler\n"
-"   source - Hämta källkodsarkiv\n"
-"   build-dep - Tillfredsställ byggberoenden för källkodspaket\n"
-"   dist-upgrade - Uppgradering av distributionen, se apt-get(8)\n"
-"   dselect-upgrade - Följ valen från dselect\n"
-"   clean - Ta bort hämtade arkivfiler\n"
-"   autoclean - Ta bort gamla hämtade arkivfiler\n"
-"   check - Kontrollera att det inte finns några trasiga beroenden\n"
-"   changelog - Hämta och visa ändringslogg för det angivna paketet\n"
-"   download - Hämta det binära paketet till aktuell katalog\n"
-"\n"
 "Flaggor:\n"
 "  -h   Denna hjälptext.\n"
 "  -q   Loggbar utdata - ingen förloppsindikator.\n"
@@ -1358,6 +1377,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Genomför en uppgradering"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Installera nya paket (paket är libc6, inte libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Ta bort paket"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Ta bort paket och konfigurationsfiler"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Uppgradering av distributionen, se apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Följ valen från dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Tillfredsställ byggberoenden för källkodspaket"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Ta bort hämtade arkivfiler"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Ta bort gamla hämtade arkivfiler"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Kontrollera att det inte finns några trasiga beroenden"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Hämta källkodsarkiv"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Hämta det binära paketet till aktuell katalog"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Hämta och visa ändringslogg för det angivna paketet"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Behöver en URL som argument"
@@ -1376,30 +1451,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Användning: apt-helper [flaggor] kommando\n"
 "       apt-helper [flaggor] download-file uri målsökväg\n"
 "\n"
 "apt-helper är en intern hjälpare för apt\n"
-"\n"
-"Kommandon:\n"
-"   download-file - hämta angiven uri till målsökvägen\n"
-"   auto-detect-proxy - hitta proxy med hjälp av apt.conf\n"
-"\n"
-"                       Denna APT-hjälpare har speciella Meep-krafter.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "hitta proxy med hjälp av apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1426,11 +1503,9 @@ msgstr "%s var redan tillbakahållet.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s var redan ej tillbakahållet.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Väntade på %s men den fanns inte där"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Körning av dpkg misslyckades. Är du root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1443,8 +1518,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Avbröt tillbakahållning av %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Körning av dpkg misslyckades. Är du root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1452,16 +1538,15 @@ msgid ""
 "\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 ""
+"Användning: apt-mark [flaggor] {auto|manual} paket1 [paket2 …]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark är ett enkelt kommandoradsgränssnitt för att markera\n"
+"paket som manuellt eller automatiskt installerade. Det kan också\n"
+"lista markeringar.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1472,21 +1557,6 @@ msgid ""
 "  -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 ""
-"Användning: apt-mark [flaggor] {auto|manual} paket1 [paket2 …]\n"
-"\n"
-"apt-mark är ett enkelt kommandoradsgränssnitt för att markera\n"
-"paket som manuellt eller automatiskt installerade. Det kan också\n"
-"lista markeringar.\n"
-"\n"
-"Kommandon:\n"
-"   auto - Markera de angivna paketen som automatiskt installerade\n"
-"   manual - Markera de angivna paketen som manuellt installerade\n"
-"   hold - Markera ett paket som tillbakahållet\n"
-"   unhold - Avmarkera ett paket som är markerat som tillbakahållet\n"
-"   showauto - Visa listan över automatiskt installerade paket\n"
-"   showmanual - Visa listan över manuellt installerade paket\n"
-"   showhold - Visa listan över tillbakahållna paket\n"
-"\n"
 "Flaggor:\n"
 "  -h  Denna hjälptext.\n"
 "  -q  Loggbar utdata - ingen förloppsindikator\n"
@@ -1498,6 +1568,34 @@ msgstr ""
 "  -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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Markera de angivna paketen som manuellt installerade"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Markera ett paket som tillbakahållet"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Avmarkera ett paket som är markerat som tillbakahållet"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Visa listan över automatiskt installerade paket"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Visa listan över manuellt installerade paket"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Visa listan över tillbakahållna paket"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2570,8 +2668,22 @@ msgid "Retrieving file %li of %li"
 msgstr "Hämtar fil %li av %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
-msgstr "Använd --allow-insecure-repositories för att tvinga uppdateringen"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
+msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 #, c-format
@@ -2640,23 +2752,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-"Data från ”%s” är inte signerat. Paket från det förrådet kan inte "
-"autentiseras."
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Förrådet ”%s” är inte längre signerat."
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
-"Förrådet ”%s” har inte en Release-fil. Detta är föråldrat, kontakta "
-"förrådets ägare."
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Förrådet ”%s” är inte längre signerat."
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -3054,6 +3164,11 @@ msgid ""
 msgstr ""
 "Ignorerar filen ”%s” i katalogen ”%s” eftersom den har en ogiltig filändelse"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Väntade på %s men den fanns inte där"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3764,6 +3879,11 @@ msgstr "Rad %u i källistan %s har fel format (typ)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Typen ”%s” är inte känd i post %u i källistan %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du måste lägga till några ”source”-URI:er i din sources.list"
@@ -3790,6 +3910,23 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Beräknar uppgradering"
 
+#~ msgid "Use --allow-insecure-repositories to force the update"
+#~ msgstr "Använd --allow-insecure-repositories för att tvinga uppdateringen"
+
+#~ msgid ""
+#~ "The data from '%s' is not signed. Packages from that repository can not "
+#~ "be authenticated."
+#~ msgstr ""
+#~ "Data från ”%s” är inte signerat. Paket från det förrådet kan inte "
+#~ "autentiseras."
+
+#~ msgid ""
+#~ "The repository '%s' does not have a Release file. This is deprecated, "
+#~ "please contact the owner of the repository."
+#~ msgstr ""
+#~ "Förrådet ”%s” har inte en Release-fil. Detta är föråldrat, kontakta "
+#~ "förrådets ägare."
+
 #~ msgid "Child process failed"
 #~ msgstr "Underprocess misslyckades"
 
diff --git a/po/th.po b/po/th.po
index db3b0015e..0394f3330 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -394,6 +394,7 @@ msgid_plural ""
 msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "ใช้ '%s' เพื่อถอดถอนแพกเกจดังกล่าวได้"
@@ -658,7 +659,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น"
 
@@ -842,29 +843,24 @@ msgstr "  ตารางรุ่น:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -875,30 +871,6 @@ msgid ""
 "  -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 ""
-"วิธีใช้: apt-cache [ตัวเลือก] คำสั่ง\n"
-"       apt-cache [ตัวเลือก] add file1 [file2 ...]\n"
-"       apt-cache [ตัวเลือก] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [ตัวเลือก] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache เป็นเครื่องมือระดับล่างสำหรับสืบค้นข้อมูลจากแฟ้มแคชไบนารีของ APT\n"
-"\n"
-"คำสั่ง:\n"
-"   gencaches - สร้างทั้งแคชของแพกเกจและแคชของซอร์ส\n"
-"   showpkg - แสดงข้อมูลทั่วไปของแพกเกจที่กำหนด\n"
-"   showsrc - แสดงระเบียนข้อมูลซอร์ส\n"
-"   stats - แสดงสถิติทั่วไป\n"
-"   dump - แสดงเนื้อหาแคชทั้งหมดในรูปแบบดิบ\n"
-"   dumpavail - แสดงข้อมูลแพกเกจที่มีทั้งหมดออกทางเอาต์พุตมาตรฐาน\n"
-"   unmet - แสดงความเชื่อมโยงที่ยังขาดหาย\n"
-"   search - ค้นรายชื่อแพกเกจด้วยนิพจน์เรกิวลาร์\n"
-"   show - แสดงข้อมูลของแพกเกจ\n"
-"   depends - แสดงข้อมูลแพกเกจที่ต้องใช้สำหรับแพกเกจที่กำหนด\n"
-"   rdepends - แสดงข้อมูลแพกเกจอื่นที่ต้องใช้แพกเกจที่กำหนด\n"
-"   pkgnames - แสดงรายชื่อแพกเกจทั้งหมด\n"
-"   dotty - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป GraphViz\n"
-"   xvcg - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป xvcg\n"
-"   policy - แสดงค่าตั้งนโยบาย\n"
-"\n"
 "ตัวเลือก:\n"
 "  -h   แสดงข้อความช่วยเหลือนี้\n"
 "  -p=? แฟ้มแคชของแพกเกจ\n"
@@ -909,46 +881,88 @@ msgstr ""
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "แสดงระเบียนข้อมูลซอร์ส"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "ค้นรายชื่อแพกเกจด้วยนิพจน์เรกิวลาร์"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "แสดงข้อมูลแพกเกจที่ต้องใช้สำหรับแพกเกจที่กำหนด"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "แสดงข้อมูลแพกเกจอื่นที่ต้องใช้แพกเกจที่กำหนด"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "แสดงข้อมูลของแพกเกจ"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "แสดงรายชื่อแพกเกจทั้งหมด"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "แสดงค่าตั้งนโยบาย"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "วิธีใช้: apt [ตัวเลือก] คำสั่ง\n"
 "\n"
 "บรรทัดคำสั่งสำหรับ apt\n"
-"คำสั่งพื้นฐาน:\n"
-" list - แสดงรายชื่อแพกเกจที่มีชื่อตรงกับรูปแบบที่กำหนด\n"
-" search - ค้นหาในคำบรรยายแพกเกจ\n"
-" show - แสดงรายละเอียดของแพกเกจ\n"
-"\n"
-" update - ปรับข้อมูลรายชื่อของแพกเกจที่มี\n"
-"\n"
-" install - ติดตั้งแพกเกจ\n"
-" remove  - ถอดถอนแพกเกจ\n"
-"\n"
-" upgrade - ปรับรุ่นระบบโดยติดตั้ง/ปรับรุ่นแพกเกจต่างๆ\n"
-" full-upgrade - ปรับรุ่นระบบโดยถอดถอน/ติดตั้ง/ปรับรุ่นแพกเกจต่างๆ\n"
-"\n"
-" edit-sources - แก้ไขแฟ้มข้อมูลแหล่งแพกเกจ\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "แสดงรายชื่อแพกเกจที่มีชื่อตรงกับรูปแบบที่กำหนด"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "ค้นหาในคำบรรยายแพกเกจ"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "แสดงรายละเอียดของแพกเกจ"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "ติดตั้งแพกเกจ"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "ถอดถอนแพกเกจ"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "ถอดถอนแพกเกจที่ไม่ใช้แล้วโดยอัตโนมัติ"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "ปรับข้อมูลรายชื่อของแพกเกจที่มี"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "ปรับรุ่นระบบโดยติดตั้ง/ปรับรุ่นแพกเกจต่างๆ"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr "ปรับรุ่นระบบโดยถอดถอน/ติดตั้ง/ปรับรุ่นแพกเกจต่างๆ"
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr "แก้ไขแฟ้มข้อมูลแหล่งแพกเกจ"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -979,6 +993,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด"
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+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 "อาร์กิวเมนต์ไม่ได้ระบุเป็นคู่ๆ"
@@ -988,29 +1036,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"วิธีใช้: apt-config [ตัวเลือก] คำสั่ง\n"
-"\n"
-"apt-config เป็นเครื่องมือง่ายๆ ที่ใช้อ่านแฟ้มค่าตั้ง APT\n"
-"\n"
-"คำสั่ง:\n"
-"   shell - โหมดเชลล์\n"
-"   dump - แสดงค่าตั้ง\n"
-"\n"
 "ตัวเลือก:\n"
 "  -h   ข้อความช่วยเหลือนี้\n"
 "  -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n"
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1232,24 +1282,16 @@ msgid ""
 "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 ""
+"วิธีใช้:  apt-get [ตัวเลือก] คำสั่ง\n"
+"       apt-get [ตัวเลือก] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [ตัวเลือก] source pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get เป็นคำสั่งง่ายๆ สำหรับดาวน์โหลดและติดตั้งแพกเกจ คำสั่งที่ใช้บ่อยที่สุดก็คือ\n"
+"update และ install\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1268,30 +1310,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"วิธีใช้:  apt-get [ตัวเลือก] คำสั่ง\n"
-"       apt-get [ตัวเลือก] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [ตัวเลือก] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get เป็นคำสั่งง่ายๆ สำหรับดาวน์โหลดและติดตั้งแพกเกจ คำสั่งที่ใช้บ่อยที่สุดก็คือ\n"
-"update และ install\n"
-"\n"
-"คำสั่ง:\n"
-"   update - ดาวน์โหลดรายชื่อแพกเกจชุดใหม่\n"
-"   upgrade - ปรับรุ่นแพกเกจต่างๆ ขึ้น\n"
-"   install - ติดตั้งแพกเกจใหม่ (pkg อยู่ในรูปเช่น libc6 ไม่ใช่ libc6.deb)\n"
-"   remove - ถอดถอนแพกเกจ\n"
-"   autoremove - ถอดถอนแพกเกจที่ไม่ใช้แล้วโดยอัตโนมัติ\n"
-"   purge - ถอดถอนแพกเกจพร้อมลบค่าตั้งทั้งหมด\n"
-"   source - ดาวน์โหลดซอร์สโค้ดของแพกเกจ\n"
-"   build-dep - ติดตั้งสิ่งที่จำเป็นสำหรับการประกอบสร้างแพกเกจซอร์สโค้ด\n"
-"   dist-upgrade - ปรับรุ่นขึ้นแบบข้ามรุ่นจัดแจก ดู apt-get(8)\n"
-"   dselect-upgrade - ทำตามสิ่งที่เลือกโดย dselect\n"
-"   clean - ลบแฟ้มแพกเกจที่ดาวน์โหลดมา\n"
-"   autoclean - ลบแฟ้มแพกเกจเก่าที่ดาวน์โหลดมา\n"
-"   check - ตรวจสอบว่าไม่มีความเชื่อมโยงที่เสียระหว่างแพกเกจ\n"
-"   changelog - ดาวน์โหลดและแสดงปูมการแก้ไขของแพกเกจที่กำหนด\n"
-"   download - ดาวน์โหลดแพกเกจไบนารีลงในไดเรกทอรีปัจจุบัน\n"
-"\n"
 "ตัวเลือก:\n"
 "  -h  แสดงข้อความช่วยเหลือนี้\n"
 "  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
@@ -1310,6 +1328,62 @@ msgstr ""
 "และ apt.conf(5)\n"
 "                       APT นี้มีพลังของ Super Cow\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "ดาวน์โหลดรายชื่อแพกเกจชุดใหม่"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "ปรับรุ่นแพกเกจต่างๆ ขึ้น"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "ติดตั้งแพกเกจใหม่ (pkg อยู่ในรูปเช่น libc6 ไม่ใช่ libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "ถอดถอนแพกเกจ"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "ถอดถอนแพกเกจพร้อมลบค่าตั้งทั้งหมด"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "ปรับรุ่นขึ้นแบบข้ามรุ่นจัดแจก ดู apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "ทำตามสิ่งที่เลือกโดย dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการประกอบสร้างแพกเกจซอร์สโค้ด"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "ลบแฟ้มแพกเกจที่ดาวน์โหลดมา"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "ลบแฟ้มแพกเกจเก่าที่ดาวน์โหลดมา"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "ตรวจสอบว่าไม่มีความเชื่อมโยงที่เสียระหว่างแพกเกจ"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "ดาวน์โหลดซอร์สโค้ดของแพกเกจ"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "ดาวน์โหลดแพกเกจไบนารีลงในไดเรกทอรีปัจจุบัน"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "ดาวน์โหลดและแสดงปูมการแก้ไขของแพกเกจที่กำหนด"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "ต้องการ URL หนึ่งรายการเป็นอาร์กิวเมนต์"
@@ -1328,30 +1402,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "วิธีใช้: apt-helper [ตัวเลือก] คำสั่ง\n"
 "      apt-helper [ตัวเลือก] download-file URI พาธปลายทาง\n"
 "\n"
 "apt-helper เป็นโปรแกรมช่วยเหลือภายในของ apt\n"
-"\n"
-"คำสั่ง:\n"
-"   download-file - ดาวน์โหลด URI ที่กำหนดลงในพาธปลายทาง\n"
-"   auto-detect-proxy - ตรวจหาพร็อกซีโดยใช้ apt.conf\n"
-"\n"
-"                       โปรแกรมช่วยเหลือของ APT นี้มีพลัง Super Meep\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 ที่กำหนดลงในพาธปลายทาง"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "ตรวจหาพร็อกซีโดยใช้ apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1378,11 +1454,9 @@ msgstr "%s ถูกกำหนดให้คงรุ่นอยู่ก่
 msgid "%s was already not hold.\n"
 msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1395,8 +1469,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "ยกเลิกการคงรุ่นของ %s แล้ว\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1404,16 +1489,14 @@ msgid ""
 "\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 ""
+"วิธีใช้: apt-mark [ตัวเลือก] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark เป็นเครื่องมือบรรทัดคำสั่งอย่างง่ายสำหรับทำเครื่องหมายแพกเกจ\n"
+"ว่าเป็นการติดตั้งแบบเลือกเองหรือแบบอัตโนมัติ และสามารถแสดงการทำเครื่องหมายต่างๆ ได้ด้วย\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1424,20 +1507,6 @@ msgid ""
 "  -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 ""
-"วิธีใช้: apt-mark [ตัวเลือก] {auto|manual} pkg1 [pkg2 ...]\n"
-"\n"
-"apt-mark เป็นเครื่องมือบรรทัดคำสั่งอย่างง่ายสำหรับทำเครื่องหมายแพกเกจ\n"
-"ว่าเป็นการติดตั้งแบบเลือกเองหรือแบบอัตโนมัติ และสามารถแสดงการทำเครื่องหมายต่างๆ ได้ด้วย\n"
-"\n"
-"คำสั่ง:\n"
-"   auto - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบอัตโนมัติ\n"
-"   manual - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบเลือกเอง\n"
-"   hold - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการคงรุ่น\n"
-"   unhold - ลบการทำเครื่องหมายการคงรุ่นจากแพกเกจที่กำหนด\n"
-"   showauto - แสดงรายชื่อของแพกเกจที่ติดตั้งแบบอัตโนมัติ\n"
-"   showmanual - แสดงรายชื่อของแพกเกจที่ติดตั้งแบบเลือกเอง\n"
-"   showhold - แสดงรายชื่อของแพกเกจที่คงรุ่นอยู่\n"
-"\n"
 "ตัวเลือก:\n"
 "  -h  แสดงข้อความช่วยเหลือนี้\n"
 "  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
@@ -1448,6 +1517,34 @@ msgstr ""
 "  -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 "ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบอัตโนมัติ"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบเลือกเอง"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการคงรุ่น"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "ลบการทำเครื่องหมายการคงรุ่นจากแพกเกจที่กำหนด"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "แสดงรายชื่อของแพกเกจที่ติดตั้งแบบอัตโนมัติ"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "แสดงรายชื่อของแพกเกจที่ติดตั้งแบบเลือกเอง"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "แสดงรายชื่อของแพกเกจที่คงรุ่นอยู่"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2487,7 +2584,21 @@ msgid "Retrieving file %li of %li"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2557,19 +2668,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "ไดเรกทอรี %s ถูก divert"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "ไดเรกทอรี %s ถูก divert"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2949,6 +3062,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3637,6 +3755,11 @@ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล�
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
diff --git a/po/tl.po b/po/tl.po
index 6b29ec31e..c82adf1dd 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -407,6 +407,7 @@ msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
@@ -675,7 +676,7 @@ msgstr "H"
 msgid "Regex compilation error - %s"
 msgstr "Error sa pag-compile ng regex - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
@@ -862,32 +863,28 @@ msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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:"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -p=? The package cache.\n"
@@ -898,34 +895,6 @@ msgid ""
 "  -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 ""
-"Pag-gamit: apt-cache [mga option] utos\n"
-"       apt-cache [mga option] add talaksan1 [talaksan2 ...]\n"
-"       apt-cache [mga option] showpkg pkt1 [pkt2 ...]\n"
-"       apt-cache [mga option] showsrc 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"
-"\n"
-"Mga utos:\n"
-"   add - Magdagdag ng talaksang pakete sa source cache\n"
-"   gencaches - Buuin pareho ang cache ng pakete at source\n"
-"   showpkg - Ipakita ang impormasyon tungkol sa isang pakete\n"
-"   showsrc - Ipakita ang mga record ng source\n"
-"   stats - Ipakita ang ilang mga estadistika\n"
-"   dump - Ipakita ang buong talaksan sa anyong maikli\n"
-"   dumpavail - Ipakita ang talaksang available sa stdout\n"
-"   unmet - Ipakita ang mga kulang na mga dependensiya\n"
-"   search - Maghanap sa listahan ng mga pakete ng regex pattern\n"
-"   show - Ipakita ang nababasang record ng pakete\n"
-"   depends - Ipakita ang impormasyon tungkol sa ganap na dependensiya\n"
-"             ng pakete\n"
-"   rdepends - Ipakita ang impormasyong kabaliktarang dependensiya ng pakete\n"
-"   pkgnames - Ipakita ang listahan ng pangalan ng lahat ng mga pakete\n"
-"   dotty - Bumuo ng graph ng mga pakete para sa GraphViz\n"
-"   xvcg - Bumuo ng graph ng mga pakete para sa xvcg\n"
-"   policy - Ipakita ang pagkaayos ng mga policy\n"
-"\n"
 "Mga option:\n"
 "  -h   Itong tulong na ito.\n"
 "  -p=? Ang cache ng mga pakete.\n"
@@ -937,29 +906,91 @@ msgstr ""
 "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"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Maghanap sa listahan ng mga pakete ng regex pattern"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Ipakita ang impormasyon tungkol sa ganap na dependensiya ng pakete"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Ipakita ang impormasyong kabaliktarang dependensiya ng pakete"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Ipakita ang nababasang record ng pakete"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Ipakita ang listahan ng pangalan ng lahat ng mga pakete"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Ipakita ang pagkaayos ng mga policy"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Binabasa ang Listahan ng mga Pakete"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Mga naka-Pin na Pakete:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Sirang mga pakete"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr ""
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ngunit ito ay birtwal na pakete"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Pinagsasama ang magagamit na impormasyon"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -987,6 +1018,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
 
+#: cmdline/apt-cdrom.cc
+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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "Mga argumento ay hindi naka-pares"
@@ -996,29 +1051,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 msgstr ""
-"Pag-gamit: apt-config [mga option] utos\n"
-"\n"
-"Ang apt-config ay simpleng kagamitan sa pagbasa ng talaksang pagkaayos\n"
-"ng APT\n"
-"\n"
-"Mga utos:\n"
-"  shell - modong shell\n"
-"  dump - ipakita ang pagkaayos\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1233,7 +1291,6 @@ 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"
@@ -1242,24 +1299,17 @@ msgid ""
 "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 ""
+"Pag-gamit: apt-get [mga option] utos\n"
+"           apt-get [mga option] install|remove pkt1 [pkt2 ...]\n"
+"           apt-get [mga option] source pkt1 [pkt2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"Ang apt-get ay payak na command line interface para sa pagkuha at\n"
+"pag-instol ng mga pakete. Ang pinakamadalas na gamiting utos ay update\n"
+"at install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1278,27 +1328,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Pag-gamit: apt-get [mga option] utos\n"
-"           apt-get [mga option] install|remove pkt1 [pkt2 ...]\n"
-"           apt-get [mga option] source pkt1 [pkt2 ...]\n"
-"\n"
-"Ang apt-get ay payak na command line interface para sa pagkuha at\n"
-"pag-instol ng mga pakete. Ang pinakamadalas na gamiting utos ay update\n"
-"at install.\n"
-"\n"
-"Mga utos:\n"
-"   update - Kunin ang bagong listahan ng mga pakete\n"
-"   upgrade - Gumawa ng upgrade\n"
-"   install - Mag-instol ng bagong mga pakete (pkt ay libc6 hindi libc6.deb)\n"
-"   remove - Mag-tanggal ng mga pakete\n"
-"   source - Kumuha ng arkibong source\n"
-"   build-dep - Magsaayos ng build-dependencies para sa mga paketeng source\n"
-"   dist-upgrade - Mag-upgrade ng pamudmod, basahin ang apt-get(8)\n"
-"   dselect-upgrade - Sundan ang mga pinili sa dselect\n"
-"   clean - Burahin ang mga nakuhang mga talaksang naka-arkibo\n"
-"   autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga talaksan\n"
-"   check - Tiyakin na walang mga sirang dependensiya\n"
-"\n"
 "Mga option:\n"
 "  -h  Itong tulong na ito.\n"
 "  -q  Output na maaaring itala - walang indikator ng progreso\n"
@@ -1317,6 +1346,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Gumawa ng upgrade"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Mag-instol ng bagong mga pakete (pkt ay libc6 hindi libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Mag-tanggal ng mga pakete"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Mag-upgrade ng pamudmod, basahin ang apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Sundan ang mga pinili sa dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Magsaayos ng build-dependencies para sa mga paketeng source"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Burahin ang mga nakuhang mga talaksang naka-arkibo"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Burahin ang mga lumang naka-arkibo na nakuhang mga talaksan"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Tiyakin na walang mga sirang dependensiya"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Kumuha ng arkibong source"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1341,13 +1426,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1375,11 +1469,9 @@ msgstr "%s ay pinakabagong bersyon na.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Naghintay, para sa %s ngunit wala nito doon"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1392,7 +1484,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "Bigo ang pagbukas ng %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1401,16 +1504,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1422,6 +1519,34 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as automatically installed"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2486,7 +2611,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Kinukuha ang talaksang %li ng %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2552,19 +2691,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Ang directory %s ay divertado"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Ang directory %s ay divertado"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2961,6 +3102,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Naghintay, para sa %s ngunit wala nito doon"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3651,6 +3797,11 @@ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
diff --git a/po/tr.po b/po/tr.po
index 13fe20d2f..d2f0844be 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -420,6 +420,7 @@ msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Bu paketi kaldırmak için '%s' komutunu kullanın."
@@ -692,7 +693,7 @@ msgstr "H"
 msgid "Regex compilation error - %s"
 msgstr "Regex derleme hatası - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "En az bir arama örüntüsü vermelisiniz"
 
@@ -885,29 +886,25 @@ msgstr "  Sürüm çizelgesi:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -918,30 +915,6 @@ msgid ""
 "  -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 ""
-"Kullanım: apt-cache [seçenekler] komut\n"
-"          apt-cache [seçenekler] showpkg paket1 [paket2 ...]\n"
-"          apt-cache [seçenekler] showsrc paket1 [paket2 ...]\n"
-"\n"
-"apt-cache APT'nin ikili paket önbelleğindeki dosyaları\n"
-"sorgulamakta kullanılan alt seviye bir araçtır.\n"
-"\n"
-"Komutlar:\n"
-"   gencaches - Hem paket hem de kaynak önbelleğini oluştur\n"
-"   showpkg - Tek bir paket hakkındaki genel bilgileri görüntüle\n"
-"   showsrc - Paket kayıtlarını görüntüle\n"
-"   stats - Bir takım basit istatistikleri görüntüle\n"
-"   dump - Bütün dosyayı kısa biçimde görüntüle\n"
-"   dumpavail - Uygun bir dosyayı standart çıktıya yazdır\n"
-"   unmet - Karşılanmayan bağımlılıkları görüntüle\n"
-"   search - Paket listesini bir düzenli ifade ile ara\n"
-"   show - Bir paketin okunabilir kaydını görüntüle\n"
-"   depends - Bir paketin bağımlılık bilgilerini ham haliyle görüntüle\n"
-"   rdepends - Bir paketin ters bağımlılık bilgilerini görüntüle\n"
-"   pkgnames - Sistemdeki tüm paketlerin adlarını listele\n"
-"   dotty - GraphViz için paket grafikleri üret\n"
-"   xvcg - xvcg için paket grafikleri üret\n"
-"   policy - İlke seçeneklerini görüntüle\n"
-"\n"
 "Options:\n"
 "  -h   Bu yardım metni.\n"
 "  -p=? Paket önbelleği.\n"
@@ -954,46 +927,88 @@ msgstr ""
 "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"
+msgstr "Paket kayıtlarını görüntüle"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Paket listesini bir düzenli ifade ile ara"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Bir paketin bağımlılık bilgilerini ham haliyle görüntüle"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Bir paketin ters bağımlılık bilgilerini görüntüle"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Bir paketin okunabilir kaydını görüntüle"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Sistemdeki tüm paketlerin adlarını listele"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "İlke seçeneklerini görüntüle"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "Kullanım: apt [seçenekler] komut\n"
 "\n"
 "apt için komut satırı arayüzü.\n"
-"Temel komutlar: \n"
-" list - Paketleri adlarına göre listele\n"
-" search - Paket açıklamalarında arama yap\n"
-" show - Paket ayrıntılarını görüntüle\n"
-"\n"
-" update - Kullanılabilir paketlerin listesini güncelle\n"
-"\n"
-" install - paket kur\n"
-" remove  - paket kaldır\n"
-" autoremove - Kullanılmayan tüm paketleri otomatik olarak kaldır\n"
-"\n"
-" upgrade - sistemi yükselt (paket kurarak ve yükselterek)\n"
-" full-upgrade - sistemi yükselt (paket kurarak, yükselterek ve kaldırarak)\n"
-"\n"
-" edit-sources - kaynak bilgi dosyasını düzenle\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "Paketleri adlarına göre listele"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "Paket açıklamalarında arama yap"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "Paket ayrıntılarını görüntüle"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "paket kur"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "paket kaldır"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Kullanılmayan tüm paketleri otomatik olarak kaldır"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "Kullanılabilir paketlerin listesini güncelle"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "sistemi yükselt (paket kurarak ve yükselterek)"
+
+#: cmdline/apt.cc
+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"
+msgstr "kaynak bilgi dosyasını düzenle"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1025,6 +1040,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Kalan CD'leriniz için bu işlemi yineleyin."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
 msgstr "Argümanlar çiftler halinde değil"
@@ -1034,30 +1084,32 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Kullanım: apt-config [seçenekler] komut\n"
-"\n"
-"apt-config, APT ayar dosyasını okumaya yarayan basit bir araçtır\n"
-"\n"
-"Komutlar:\n"
-"   shell - Kabuk kipi\n"
-"   dump - Ayarları görüntüle\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1287,24 +1339,17 @@ msgid ""
 "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 ""
+"Kullanım: apt-get [seçenekler] komut\n"
+"          apt-get [seçenekler] install|remove paket1 [paket2 ...]\n"
+"          apt-get [seçenekler] kaynak paket1 [paket2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get, paket indirme ve kurmada kullanılan basit bir komut satırı\n"
+"arayüzüdür. En sık kullanılan komutlar güncelleme (update) ve kurma\n"
+"(install) komutlarıdır.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1323,33 +1368,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Kullanım: apt-get [seçenekler] komut\n"
-"          apt-get [seçenekler] install|remove paket1 [paket2 ...]\n"
-"          apt-get [seçenekler] kaynak paket1 [paket2 ...]\n"
-"\n"
-"apt-get, paket indirme ve kurmada kullanılan basit bir komut satırı\n"
-"arayüzüdür. En sık kullanılan komutlar güncelleme (update) ve kurma\n"
-"(install) komutlarıdır.\n"
-"\n"
-"Komutlar:\n"
-"   update - Paket listelerini yenile\n"
-"   upgrade - Yükseltme işlemini gerçekleştir\n"
-"   install - Yeni paket kur (paket libc6.deb değil libc6 şeklinde "
-"olmalıdır)\n"
-"   remove - Paket(leri) kaldır\n"
-"   autoremove - Kullanılmayan tüm paketleri otomatik olarak kaldır\n"
-"   purge - Paketleri ve yapılandırma dosyalarını kaldır\n"
-"   source - Kaynak paket dosyalarını indir\n"
-"   build-dep - Kaynak paketlerin inşa bağımlılıklarını yapılandır\n"
-"   dist-upgrade - Dağıtım yükseltme, ayrıntılı bilgi için apt-get(8)\n"
-"   dselect-upgrade - dselect yapılandırmalarına uy\n"
-"   clean - İndirilmiş olan arşiv dosyalarını sil\n"
-"   autoclean - İndirilmiş olan eski arşiv dosyalarını sil\n"
-"   check - Eksik bağımlılık olmadığından emin ol\n"
-"   changelog - Belirtilen paketlerin değişim günlüklerini indir ve "
-"görüntüle\n"
-"   download - İkili paketleri içinde bulunulan dizine indir\n"
-"\n"
 "Seçenekler:\n"
 "  -h  Bu yardım metni.\n"
 "  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
@@ -1368,6 +1386,62 @@ msgstr ""
 "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"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Yükseltme işlemini gerçekleştir"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Yeni paket kur (paket libc6.deb değil libc6 şeklinde olmalıdır)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Paket(leri) kaldır"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Paketleri ve yapılandırma dosyalarını kaldır"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Dağıtım yükseltme, ayrıntılı bilgi için apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "dselect yapılandırmalarına uy"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Kaynak paketlerin inşa bağımlılıklarını yapılandır"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "İndirilmiş olan arşiv dosyalarını sil"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "İndirilmiş olan eski arşiv dosyalarını sil"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Eksik bağımlılık olmadığından emin ol"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Kaynak paket dosyalarını indir"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "İkili paketleri içinde bulunulan dizine indir"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Belirtilen paketlerin değişim günlüklerini indir ve görüntüle"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Argüman olarak bir adet URL'ye ihtiyaç vardır"
@@ -1391,26 +1465,27 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "Kullanım: apt-helper [seçenekler] komut\n"
 "          apt-helper [seçenekler] download-file uri hedef-konum\n"
 "\n"
 "apt-helper apt'nin bir dâhilî yardımcı aracıdır\n"
-"\n"
-"Komutlar:\n"
-"   download-file - verilen adresi (uri) hedef yola kaydet\n"
-"\n"
-"   srv-lookup - Bir SRV kaydına bak (örneğin _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - apt.conf kullanarak vekil sunucuyu algıla\n"
-"\n"
-"                    Bu APT yardımcısının Süper Meep Güçleri var.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr "Bir SRV kaydına bak (örneğin _http._tcp.ftp.debian.org)"
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "apt.conf kullanarak vekil sunucuyu algıla"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1437,11 +1512,9 @@ msgstr "%s zaten tutulacak şekilde ayarlanmış.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s için beklenildi ama o gelmedi"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1454,8 +1527,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "%s paketini tutma işlemi iptal edildi.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1463,16 +1547,14 @@ msgid ""
 "\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 ""
+"Kullanım: apt-mark [seçenekler] {auto|manual} paket1 [paket2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark paketleri otomatik ya da elle kurulmuş olarak işaretlemeye\n"
+"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"
@@ -1483,20 +1565,6 @@ msgid ""
 "  -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 ""
-"Kullanım: apt-mark [seçenekler] {auto|manual} paket1 [paket2 ...]\n"
-"\n"
-"apt-mark paketleri otomatik ya da elle kurulmuş olarak işaretlemeye\n"
-"ve mevcut işaretleri görmeye yarayan basit bir komut satırı arayüzüdür.\n"
-"\n"
-"Komutlar:\n"
-"   auto - Belirtilen paketleri otomatik kurulmuş olarak işaretle\n"
-"   manual - Belirtilen paketleri elle kurulmuş olarak işaretle\n"
-"   hold - Paketi tutulacak şekilde işaretle\n"
-"   unhold - Paketin tutuluyor işaretini kaldır\n"
-"   showauto - Otomatik olarak kurulmuş paketlerin listesini görüntüle\n"
-"   showmanual - Elle kurulmuş paketlerin listesini görüntüle\n"
-"   showhold - Tutulur durumda olan paketlerin listesini görüntüle\n"
-"\n"
 "Seçenekler:\n"
 "  -h  Bu yardım metni.\n"
 "  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
@@ -1508,6 +1576,34 @@ msgstr ""
 "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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Belirtilen paketleri elle kurulmuş olarak işaretle"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Paketi tutulacak şekilde işaretle"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Paketin tutuluyor işaretini kaldır"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "Otomatik olarak kurulmuş paketlerin listesini görüntüle"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "Elle kurulmuş paketlerin listesini görüntüle"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "Tutulur durumda olan paketlerin listesini görüntüle"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2567,10 +2663,22 @@ msgid "Retrieving file %li of %li"
 msgstr "Alınan dosya: %li / %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
-"Buna rağmen güncellemeyi yapmak için --allow-insecure-repositories "
-"seçeneğini kullanın"
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 #, c-format
@@ -2639,23 +2747,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-"'%s' deposundan alınan veri imzalanmamış. Bu depodan gelen paketlerin aslına "
-"uygunluğu denetlenemeyecek."
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "'%s' deposu imzalanmamış"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
-"'%s' deposunun Release dosyası yok. Bu tür depolar gelecekte kullanımdan "
-"kaldırılacaktır, lütfen depo sahibiyle iletişime geçin."
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "'%s' deposu imzalanmamış"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -3058,6 +3164,11 @@ msgstr ""
 "'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için "
 "yok sayılıyor"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s için beklenildi ama o gelmedi"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3762,6 +3873,11 @@ msgstr "%2$s kaynak listesinin %1$u kısmı hatalı (tür)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "'%s' türü bilinmiyor (girdi: %u, kaynak listesi: %s)"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız"
@@ -3788,6 +3904,25 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Yükseltme hesaplanıyor"
 
+#~ msgid "Use --allow-insecure-repositories to force the update"
+#~ msgstr ""
+#~ "Buna rağmen güncellemeyi yapmak için --allow-insecure-repositories "
+#~ "seçeneğini kullanın"
+
+#~ msgid ""
+#~ "The data from '%s' is not signed. Packages from that repository can not "
+#~ "be authenticated."
+#~ msgstr ""
+#~ "'%s' deposundan alınan veri imzalanmamış. Bu depodan gelen paketlerin "
+#~ "aslına uygunluğu denetlenemeyecek."
+
+#~ msgid ""
+#~ "The repository '%s' does not have a Release file. This is deprecated, "
+#~ "please contact the owner of the repository."
+#~ msgstr ""
+#~ "'%s' deposunun Release dosyası yok. Bu tür depolar gelecekte kullanımdan "
+#~ "kaldırılacaktır, lütfen depo sahibiyle iletişime geçin."
+
 #~ msgid "Child process failed"
 #~ msgstr "Alt süreç başarısız"
 
diff --git a/po/uk.po b/po/uk.po
index d4697b4de..ead75963b 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -423,6 +423,7 @@ msgstr[2] ""
 "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Використовуйте '%s' щоб видалити його."
@@ -698,7 +699,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Ви повинні задати не менше одного шаблону пошуку"
 
@@ -887,29 +888,25 @@ msgstr "  Таблиця версій:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -920,30 +917,6 @@ msgid ""
 "  -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 ""
-"Використання: apt-cache [опції] команда\n"
-"              apt-cache [опції] showpkg пакунок1 [пкн2 ...]\n"
-"              apt-cache [опції] showsrc пакунок1 [пкн2 ...]\n"
-"\n"
-"apt-cache - низькорівневий інструмент, що використовується для запиту\n"
-"інформації з двійкових кеш-файлів APT\n"
-"\n"
-"Команди:\n"
-"   gencaches - побудувати обидва кеші - бінарний і з вихідними текстами\n"
-"   showpkg - показати загальну інформацію про конкретний пакунок\n"
-"   showsrc - показати інформацію про вихідний текст (source)\n"
-"   stats - показати основну статистику\n"
-"   dump - показати весь файл у стислій формі\n"
-"   dumpavail - видати доступний файл на stdout\n"
-"   unmet - показати незадоволені залежності\n"
-"   search - знайти пакунки, назва яких задовольняє регулярний вираз\n"
-"   show - показати інформацію про пакунок в зрозумілій формі\n"
-"   depends - показати інформацію про залежності пакунка\n"
-"   rdepends - показати інформацію про зворотні залежності пакунка\n"
-"   pkgnames - показати імена всіх пакунків у системі\n"
-"   dotty - генерувати графік пакунків у форматі GraphViz\n"
-"   xvcg - генерувати графік пакунків у форматі xvcg\n"
-"   policy - показати поточну політику\n"
-"\n"
 "Опції:\n"
 "  -h   Цей текст допомоги.\n"
 "  -p=? Кеш пакунків.\n"
@@ -954,29 +927,91 @@ msgstr ""
 "  -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
 "Дивіться подробиці на man-сторінках apt-cache(8) і apt.conf(5).\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "показати інформацію про вихідний текст (source)"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "знайти пакунки, назва яких задовольняє регулярний вираз"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "показати інформацію про залежності пакунка"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "показати інформацію про зворотні залежності пакунка"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "показати інформацію про пакунок в зрозумілій формі"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "показати імена всіх пакунків у системі"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "показати поточну політику"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Зчитування переліків пакунків"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Зафіксовані пакунки:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Зламані пакунки"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "видалити автоматично усі пакунки, що не використовуються"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "але це віртуальний пакунок"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Зчитування інформації про стан"
+
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Задайте назву для цього Диска, наприклад 'Debian 5.0.3 Disk 1'"
@@ -1003,6 +1038,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторіть цей процес для решти CD з вашого набору."
 
+#: cmdline/apt-cdrom.cc
+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"
+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 "Аргументи не в парах"
@@ -1012,29 +1081,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"Використання: apt-config [опції] команда\n"
-"\n"
-"apt-config - простий інструмент для зчитування конфігураційного файла APT\n"
-"\n"
-"Команди:\n"
-"   shell - режим shell\n"
-"   dump - показати конфігурацію\n"
-"\n"
 "Опції:\n"
 "   -h   Цей текст допомоги.\n"
 "   -с=? Читати зазначений конфігураційний файл.\n"
 "   -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1270,24 +1341,17 @@ msgid ""
 "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 ""
+"Використання: apt-get [опції] команда\n"
+"               apt-get [опції] install|remove пакунок1 [пкн2 ...]\n"
+"               apt-get [опції] source пакунок1 [пкн2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get - простий інтерфейс командного рядка для завантаження й\n"
+"встановлення пакунків. Найбільш часто використовувані команди - update\n"
+"і install.\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1306,33 +1370,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Використання: apt-get [опції] команда\n"
-"               apt-get [опції] install|remove пакунок1 [пкн2 ...]\n"
-"               apt-get [опції] source пакунок1 [пкн2 ...]\n"
-"\n"
-"apt-get - простий інтерфейс командного рядка для завантаження й\n"
-"встановлення пакунків. Найбільш часто використовувані команди - update\n"
-"і install.\n"
-"\n"
-"Команди:\n"
-"   update - завантажити нові переліки пакунків\n"
-"   upgrade - виконати оновлення пакунків\n"
-"   install - встановити нові пакунки (назва пакунка вказується\n"
-"             як libc6, а не libc6.deb)\n"
-"   remove - видалити пакунки\n"
-"   autoremove - видалити автоматично усі пакунки, що не використовуються\n"
-"   purge - видалити пакунки разом з іхніми конфігураційними файлами\n"
-"   source - завантажити архіви з вихідними текстами\n"
-"   build-dep - завантажити все необхідне для побудови зазначеного\n"
-"               пакунку з вихідних текстів\n"
-"   dist-upgrade - оновити всю систему, докладніше в apt-get(8)\n"
-"   dselect-upgrade - керуватися вибором, зробленим у dselect\n"
-"   clean - видалити завантажені архіви\n"
-"   autoclean - видалити старі завантажені архіви\n"
-"   check - перевірити наявність порушених залежностей\n"
-"   changelog - завантажити і показати журнал змін для визначеного пакунку\n"
-"   download - завантажити двійковий пакунок у поточну директорію\n"
-"\n"
 "Опції:\n"
 "  -h  Цей текст допомоги.\n"
 "  -q  Виводити повідомлення, придатні для запису у файл журналу.\n"
@@ -1353,6 +1390,64 @@ msgstr ""
 "містять більше інформації і опцій.\n"
 "                       Цей APT має Супер-Коров'ячу Силу.\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "завантажити нові переліки пакунків"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "виконати оновлення пакунків"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr ""
+"встановити нові пакунки (назва пакунка вказується як libc6, а не libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "видалити пакунки"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "видалити пакунки разом з іхніми конфігураційними файлами"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "оновити всю систему, докладніше в apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "керуватися вибором, зробленим у dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr ""
+"завантажити все необхідне для побудови зазначеного пакунку з вихідних текстів"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "видалити завантажені архіви"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "видалити старі завантажені архіви"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "перевірити наявність порушених залежностей"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "завантажити архіви з вихідними текстами"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "завантажити двійковий пакунок у поточну директорію"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "завантажити і показати журнал змін для визначеного пакунку"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1379,13 +1474,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1413,11 +1517,9 @@ msgstr "%s вже був зафіксований.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s вже був незафіксований.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Очікував на %s, але його там не було"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "Не вдалося виконати dpkg. Ви root?"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1430,26 +1532,35 @@ msgid "Canceled hold on %s.\n"
 msgstr "Фіксацію для %s відмінено.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "Не вдалося виконати dpkg. Ви root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+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"
+msgstr ""
+"Використання: apt-mark [опції] {auto|manual} пакунок1 [пакунок2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark - це простий інтерфейс командного рядка для позначення\n"
+"пакунків як встановлені вручну, або автоматично. Він також уміє\n"
+"показувати позначки.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1460,16 +1571,6 @@ msgid ""
 "  -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 ""
-"Використання: apt-mark [опції] {auto|manual} пакунок1 [пакунок2 ...]\n"
-"\n"
-"apt-mark - це простий інтерфейс командного рядка для позначення\n"
-"пакунків як встановлені вручну, або автоматично. Він також уміє\n"
-"показувати позначки.\n"
-"\n"
-"Команди:\n"
-"   auto - позначити вказані пакунки як автоматично встановлені\n"
-"   manual - позначити вказані пакунки як встановлені вручну\n"
-"\n"
 "Опції:\n"
 "  -h   Цей текст допомоги.\n"
 "  -q   Не показувати індикатор прогресу.\n"
@@ -1480,6 +1581,34 @@ msgstr ""
 "  -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 "позначити вказані пакунки як автоматично встановлені"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "позначити вказані пакунки як встановлені вручну"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2554,7 +2683,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Завантажується файл %li з %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2625,19 +2768,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Директорія %s є відхиленою (diverted)"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Директорія %s є відхиленою (diverted)"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3039,6 +3184,11 @@ msgid ""
 msgstr ""
 "Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Очікував на %s, але його там не було"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3752,6 +3902,11 @@ msgstr "Спотворений рядок %u у переліку джерел %s
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
diff --git a/po/vi.po b/po/vi.po
index 8deacf4d5..727a439d0 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -406,6 +406,7 @@ msgid_plural ""
 msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "Hãy dùng lệnh “%s” để gỡ bỏ chúng."
@@ -672,7 +673,7 @@ msgstr "K"
 msgid "Regex compilation error - %s"
 msgstr "Lỗi biên dịch biểu thức chính quy - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "Bạn phải đưa ra ít nhất một mẫu tìm kiếm"
 
@@ -858,29 +859,25 @@ msgstr "  Bảng phiên bản:"
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -891,33 +888,6 @@ msgid ""
 "  -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 ""
-"Cách dùng: apt-cache [tùy_chọn...] lệnh\n"
-"           apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n"
-"           apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n"
-"(cache: bộ nhớ tạm\n"
-"showpkg: hiển thị gói nhị phân\n"
-"showsrc: hiển thị gói nguồn)\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"
-"\n"
-"Lệnh:\n"
-"   gencaches - Tạo bộ nhớ tạm cho cả gói lẫn nguồn\n"
-"   showpkg - Hiện thông tin chung về một gói riêng lẻ\n"
-"   showsrc - Hiện các bản ghi cho gói nguồn\n"
-"   stats - Hiện phần thống kê cơ bản\n"
-"   dump - Hiện toàn bộ tập tin dạng ngắn (đổ)\n"
-"   dumpavail - In ra một tập tin sẵn dùng ra thiết bị xuất chuẩn\n"
-"   unmet - Hiện các gói chưa thỏa mãn quan hệ phụ thuộc\n"
-"   search - Tìm kiếm danh sách các gói dựa trên biểu thức chính quy\n"
-"   show - Hiển thị bản ghi có thể đọc cho những gói đó\n"
-"   depends - Hiện thông tin quan hệ phụ thuộc dạng thô cho gói\n"
-"   rdepends - Hiện thông tin những gói phụ thuộc vào gói này\n"
-"   pkgnames - Liệt kê danh sách mọi gói trên hệ thống\n"
-"   dotty - Tạo ra đồ thị gói cho GraphViz (nhiều chấm)\n"
-"   xvcg - Tạo ra đồ thị gói cho xvcg\n"
-"   policy - Hiển thị các cài đặt về chính sách\n"
-"\n"
 "Tùy chọn:\n"
 "  -h   Hiển thị trợ giúp này.\n"
 "  -p=? Bộ nhớ tạm gói.\n"
@@ -929,47 +899,88 @@ msgstr ""
 "Để 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"
+msgstr "Hiện các bản ghi cho gói nguồn"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "Tìm kiếm danh sách các gói dựa trên biểu thức chính quy"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "Hiện thông tin quan hệ phụ thuộc dạng thô cho gói"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "Hiện thông tin những gói phụ thuộc vào gói này"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "Hiển thị bản ghi có thể đọc cho những gói đó"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "Liệt kê danh sách mọi gói trên hệ thống"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "Hiển thị các cài đặt về chính sách"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 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"
-"Các lệnh cơ bản:\n"
-" list - liệt kê các gói dựa trên cơ sở là tên gói\n"
-" search - tìm trong phần mô tả của gói\n"
-" show - hiển thị thông tin chi tiết về gói\n"
-"\n"
-" update - cập nhật danh sánh các gói sẵn có\n"
-"\n"
-" install - cài đặt các gói\n"
-" remove - gỡ bỏ các gói\n"
-"\n"
-" upgrade - nâng cấp các gói trong hệ thống\n"
-" full-upgrade - nâng cấp hệ thống bằng cách gỡ bỏ, cài đặt, nâng cấp các "
-"gói\n"
-"\n"
-" edit-sources - sửa tập tin thông tin gói nguồn\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "liệt kê các gói dựa trên cơ sở là tên gói"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "tìm trong phần mô tả của gói"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "hiển thị thông tin chi tiết về gói"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "cài đặt các gói"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "gỡ bỏ các gói"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "Tự động gỡ bỏ tất cả các gói không dùng"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "cập nhật danh sánh các gói sẵn có"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "nâng cấp các gói trong hệ thống"
+
+#: cmdline/apt.cc
+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"
+msgstr "sửa tập tin thông tin gói nguồn"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -1002,6 +1013,41 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn."
 
+#: cmdline/apt-cdrom.cc
+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"
+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"
 msgstr "Các đối số không thành cặp"
@@ -1011,31 +1057,33 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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"
 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"
-"\n"
-"Lệnh:\n"
-"   shell - Chế độ hệ vỏ\n"
-"   dump - Hiển thị cấu hình\n"
-"\n"
 "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"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1268,24 +1316,22 @@ msgid ""
 "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 ""
+"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"
+"           apt-get [tùy_chọn...] source gói1 [gói2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
+"get:     lấy\n"
+"install: cài đặt\n"
+"remove:  gỡ bỏ\n"
+"source:  nguồn\n"
 "\n"
+"apt-get là một giao diện dòng lệnh đơn giản dùng để tải về và cài đặt gói "
+"phần mềm.\n"
+"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"
@@ -1304,37 +1350,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\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"
-"           apt-get [tùy_chọn...] source gói1 [gói2 ...]\n"
-"\n"
-"get:     lấy\n"
-"install: cài đặt\n"
-"remove:  gỡ bỏ\n"
-"source:  nguồn\n"
-"\n"
-"apt-get là một giao diện dòng lệnh đơn giản dùng để tải về và cài đặt gói "
-"phần mềm.\n"
-"Những lệnh được dùng thường nhất là update (cập nhật) và install (cài đặt).\n"
-"\n"
-"Lệnh:\n"
-"   update - Lấy danh sách gói mới (cập nhật cơ sở dữ liệu)\n"
-"   upgrade - Nâng cấp lên phiên bản mới hơn\n"
-"   install - Cài đặt gói mới (gói có dạng libc6 không phải libc6.deb)\n"
-"   remove - Gỡ bỏ gói phần mềm\n"
-"   autoremove - Tự động gỡ bỏ tất cả các gói không dùng\n"
-"   purge - Gỡ bỏ và tẩy xóa gói\n"
-"   source - Tải về kho nguồn\n"
-"   build-dep - Cấu hình quan hệ phụ thuộc khi biên dịch, cho gói nguồn\n"
-"   dist-upgrade - Nâng cấp hệ điều hành lên phiên bản mới hơn, hãy xem apt-"
-"get(8)\n"
-"   dselect-upgrade - Cho phép chọn dselect\n"
-"   clean - Xóa các tập tin kho đã tải về (dọn dẹp thư mục lưu trữ)\n"
-"   autoclean - Xóa các tập tin kho cũ đã tải về (tự động làm sạch)\n"
-"   check - Kiểm tra xem có quan hệ phụ thuộc bị sai không\n"
-"   changelog - Tải về và hiển thị các thay đổi cho gói đã cho\n"
-"   download - Tải về gói phần mềm vào thư mục hiện hành\n"
-"\n"
 "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"
@@ -1353,6 +1368,62 @@ msgstr ""
 "       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)"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Nâng cấp lên phiên bản mới hơn"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Cài đặt gói mới (gói có dạng libc6 không phải libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Gỡ bỏ gói phần mềm"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "Gỡ bỏ và tẩy xóa gói"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Nâng cấp hệ điều hành lên phiên bản mới hơn, hãy xem apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Cho phép chọn dselect"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Cấu hình quan hệ phụ thuộc khi biên dịch, cho gói nguồn"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Xóa các tập tin kho đã tải về (dọn dẹp thư mục lưu trữ)"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Xóa các tập tin kho cũ đã tải về (tự động làm sạch)"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Kiểm tra xem có quan hệ phụ thuộc bị sai không"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Tải về kho nguồn"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "Tải về gói phần mềm vào thư mục hiện hành"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "Tải về và hiển thị các thay đổi cho gói đã cho"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "Cần một URL làm đối số"
@@ -1371,30 +1442,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\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"
 "\n"
 "apt-helper là phần trợ giúp dành cho apt\n"
-"\n"
-"Các lệnh:\n"
-"   download-file - tải về uri đã cho về đường-dẫn-đích\n"
-"   auto-detect-proxy - dò tìm proxy dùng apt.conf\n"
-"\n"
-"     Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep”.\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"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "dò tìm proxy dùng apt.conf"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1421,11 +1494,11 @@ msgstr "%s đã sẵn được đặt là giữ lại.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s đã sẵn được đặt là không giữ lại.\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Cần %s nhưng mà không thấy nó ở đây"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+"Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi "
+"lệnh này"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1438,10 +1511,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "Hủy bỏ nắm giữ %s.\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
-"Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi "
-"lệnh này"
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1449,16 +1531,15 @@ msgid ""
 "\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 ""
+"Cách dùng: apt-mark [tùy-chọn...] {auto|manual} gói1 [gói2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark là câu lệnh đơn giản được dùng để đánh dấu các gói là\n"
+"được cài đặt tự động hay bằng tay. Nó còn có thể liệt kê danh sách các đánh "
+"dấu.\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1469,21 +1550,6 @@ msgid ""
 "  -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 ""
-"Cách dùng: apt-mark [tùy-chọn...] {auto|manual} gói1 [gói2 ...]\n"
-"\n"
-"apt-mark là câu lệnh đơn giản được dùng để đánh dấu các gói là\n"
-"được cài đặt tự động hay bằng tay. Nó còn có thể liệt kê danh sách các đánh "
-"dấu.\n"
-"\n"
-"Lệnh:\n"
-"   auto - Đánh dấu các gói đưa ra là được cài đặt tự động\n"
-"   manual - Đánh dấu các gói đưa ra là được cài đặt bằng tay\n"
-"   hold - Đánh dấu một gói là giữ lại\n"
-"   unhold - Bỏ đánh dấu một gói là giữ lại\n"
-"   showauto - In ra danh sách các gói được tự động cài đặt\n"
-"   showmanual - In ra danh sách các gói được cài đặt bằng tay\n"
-"   showhold - In ra danh sách các gói được giữ lại\n"
-"\n"
 "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"
@@ -1495,6 +1561,34 @@ msgstr ""
 "Để 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"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "Đánh dấu các gói đưa ra là được cài đặt bằng tay"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "Đánh dấu một gói là giữ lại"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "Bỏ đánh dấu một gói là giữ lại"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "In ra danh sách các gói được tự động cài đặt"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "In ra danh sách các gói được cài đặt bằng tay"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "In ra danh sách các gói được giữ lại"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2573,7 +2667,21 @@ msgid "Retrieving file %li of %li"
 msgstr "Đang tải tập tin %li trong tổng số %li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2644,19 +2752,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Thư mục %s bị trệch hướng"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Thư mục %s bị trệch hướng"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -3052,6 +3162,11 @@ msgstr ""
 "Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp "
 "lệ"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Cần %s nhưng mà không thấy nó ở đây"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3761,6 +3876,11 @@ msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 648528b09..8c4593ddf 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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"
@@ -393,6 +393,7 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: apt-private/private-install.cc
+#, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "使用'%s'来卸载它(它们)。"
@@ -656,7 +657,7 @@ msgstr "N"
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 
@@ -840,29 +841,25 @@ msgstr "  版本列表："
 #: cmdline/apt-cache.cc
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"       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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -873,30 +870,6 @@ msgid ""
 "  -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 ""
-"用法： apt-cache [选项] 命令\n"
-"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
-"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-cache 是一个底层的工具，它可以在 APT 的\n"
-"二进制缓存文件中查询信息\n"
-"\n"
-"命令：\n"
-"   gencaches - 同时生成软件包和源代码包的缓存\n"
-"   showpkg - 显示某个软件包的全面信息\n"
-"   showsrc - 显示源文件的各项记录\n"
-"   stats - 显示基本的统计信息\n"
-"   dump - 简要显示整个缓存文件的内容\n"
-"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
-"   unmet - 显示所有未满足的依赖关系\n"
-"   search - 根据正则表达式搜索软件包列表\n"
-"   show - 以便于阅读的格式介绍该软件包\n"
-"   depends - 显示该软件包的依赖关系信息\n"
-"   rdepends - 显示所有依赖于该软件包的软件包名字\n"
-"   pkgnames - 列出所有软件包的名字\n"
-"   dotty - 生成可用 GraphViz 处理的软件包关系图\n"
-"   xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
-"   policy - 显示软件包的安装设置状态\n"
-"\n"
 "选项：\n"
 "  -h   本帮助文档。\n"
 "  -p=? 软件包的缓存。\n"
@@ -907,46 +880,88 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "显示源文件的各项记录"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "根据正则表达式搜索软件包列表"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "显示该软件包的依赖关系信息"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "显示所有依赖于该软件包的软件包名字"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "以便于阅读的格式介绍该软件包"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "列出所有软件包的名字"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "显示软件包的安装设置状态"
+
 #: cmdline/apt.cc
-#, fuzzy
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 "用法： apt [选项] 命令\n"
 "\n"
 "apt 的命令行界面。\n"
-"基本命令：\n"
-" list - 根据名称列出软件包\n"
-" search - 搜索软件包描述\n"
-" show - 显示软件包细节\n"
-"\n"
-" update - 更新可用软件包列表\n"
-"\n"
-" install - 安装软件包\n"
-" remove  - 移除软件包\n"
-"\n"
-" upgrade - 通过 安装/升级 软件来更新系统\n"
-" full-upgrade - 通过 卸载/安装/升级 来更新系统\n"
-"\n"
-" edit-sources - 编辑软件源信息文件\n"
+
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr "根据名称列出软件包"
+
+#: cmdline/apt.cc
+msgid "search in package descriptions"
+msgstr "搜索软件包描述"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr "显示软件包细节"
+
+#. package stuff
+#: cmdline/apt.cc
+msgid "install packages"
+msgstr "安装软件包"
+
+#: cmdline/apt.cc
+msgid "remove packages"
+msgstr "移除软件包"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "卸载所有自动安装且不再使用的软件包"
+
+#. system wide stuff
+#: cmdline/apt.cc
+msgid "update list of available packages"
+msgstr "更新可用软件包列表"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr "通过 安装/升级 软件来更新系统"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr "通过 卸载/安装/升级 来更新系统"
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+msgid "edit the source information file"
+msgstr "编辑软件源信息文件"
 
 #: cmdline/apt-cdrom.cc
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -977,6 +992,40 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+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 "参数不成对"
@@ -986,29 +1035,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"用法：apt-config [选项] 命令\n"
-"\n"
-"apt-config 是一个用于读取APT 配置文件的简单工具\n"
-"\n"
-"命令：\n"
-"   shell - Shell 模式\n"
-"   dump - 显示配置文件\n"
-"\n"
 "选项：\n"
 "  -h   显示本帮助文本。\n"
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1230,24 +1281,16 @@ msgid ""
 "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 ""
+"用法： apt-get [选项] 命令\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get 是一个用于下载和安装软件包的简易命令行界面。\n"
+"最常用命令是 update 和 install。\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1266,30 +1309,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"用法： apt-get [选项] 命令\n"
-"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-get 是一个用于下载和安装软件包的简易命令行界面。\n"
-"最常用命令是 update 和 install。\n"
-"\n"
-"命令：\n"
-"   update - 取回更新的软件包列表信息\n"
-"   upgrade - 进行一次升级\n"
-"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
-"   remove - 卸载软件包\n"
-"   autoremove - 卸载所有自动安装且不再使用的软件包\n"
-"   purge - 卸载并清除软件包的配置\n"
-"   source - 下载源码包文件\n"
-"   build-dep - 为源码包配置所需的编译依赖关系\n"
-"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
-"   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
-"   clean - 删除所有已下载的包文件\n"
-"   autoclean - 删除已下载的旧包文件\n"
-"   check - 核对以确认系统的依赖关系的完整性\n"
-"   changelog - 下载指定软件包，并显示其changelog\n"
-"   download - 下载指定的二进制包到当前目录\n"
-"\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
 "  -q  让输出可作为日志 - 不显示进度\n"
@@ -1308,6 +1327,62 @@ msgstr ""
 "以获取更多信息和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "取回更新的软件包列表信息"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "进行一次升级"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "卸载软件包"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "卸载并清除软件包的配置"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "发布版升级，见 apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "根据 dselect 的选择来进行升级"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "为源码包配置所需的编译依赖关系"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "删除所有已下载的包文件"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "删除已下载的旧包文件"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "核对以确认系统的依赖关系的完整性"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "下载源码包文件"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr "下载指定的二进制包到当前目录"
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr "下载指定软件包，并显示其changelog"
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr "需要一个 URL 作为参数"
@@ -1326,30 +1401,32 @@ 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"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "用法： apt-helper [选项] 命令\n"
 "       apt-helper [选项] download-file URI 目标路径\n"
 "\n"
 "apt-helper 是一个 apt 的内部助手\n"
-"\n"
-"命令：\n"
-"   download-file - 将 URI 指定的文件下载到目标路径\n"
-"   auto-detect-proxy - 用 apt.conf 检测代理设置\n"
-"\n"
-"                       本 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 指定的文件下载到目标路径"
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr "用 apt.conf 检测代理设置"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1376,11 +1453,9 @@ msgstr "%s 已经设置为保留。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 已经设置为不保留。\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待子进程 %s 的退出，但是它并不存在"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr "执行 dpkg 失败。您是 root 吗？"
 
 #: cmdline/apt-mark.cc
 #, c-format
@@ -1393,8 +1468,19 @@ msgid "Canceled hold on %s.\n"
 msgstr "取消保留 %s 的设置。\n"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
-msgstr "执行 dpkg 失败。您是 root 吗？"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 msgid ""
@@ -1402,16 +1488,14 @@ msgid ""
 "\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 ""
+"用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
 "\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
+"它也能列出标记。\n"
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1422,20 +1506,6 @@ msgid ""
 "  -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 ""
-"用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
-"它也能列出标记。\n"
-"\n"
-"命令：\n"
-"   auto - 标记指定软件包为自动安装\n"
-"   manual - 标记指定软件包为手动安装\n"
-"   hold - 标记指定软件包为保留(held back)\n"
-"   unhold - 取消指定软件包的保留(held back)标记\n"
-"   showauto - 列出所有自动安装的软件包\n"
-"   showmanual - 列出所有手动安装的软件包\n"
-"   showhold - 列出设为保留的软件包\n"
-"\n"
 "选项：\n"
 "  -h  显示本帮助信息\n"
 "  -q  日志型输出 - 不显示进度\n"
@@ -1446,6 +1516,34 @@ msgstr ""
 "  -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 "标记指定软件包为自动安装"
+
+#: cmdline/apt-mark.cc
+msgid "Mark the given packages as manually installed"
+msgstr "标记指定软件包为手动安装"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr "标记指定软件包为保留(held back)"
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr "取消指定软件包的保留(held back)标记"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of automatically installed packages"
+msgstr "列出所有自动安装的软件包"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of manually installed packages"
+msgstr "列出所有手动安装的软件包"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr "列出设为保留的软件包"
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2488,7 +2586,21 @@ msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2555,19 +2667,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "目录 %s 已被转移"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "目录 %s 已被转移"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2952,6 +3066,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效"
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待子进程 %s 的退出，但是它并不存在"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3637,6 +3756,11 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "无法识别在源列表 %3$s 里，第 %2$u 节中的软件包类别“%1$s”"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 86e16c723..879d6be4f 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-05 18:29+0200\n"
+"POT-Creation-Date: 2015-10-24 00:07+0200\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."
@@ -398,7 +398,7 @@ msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
 #: apt-private/private-install.cc
-#, fuzzy
+#, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 msgstr[0] "使用 '%s' 來將其移除。"
@@ -663,7 +663,7 @@ msgstr ""
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示式時發生錯誤 - %s"
 
-#: apt-private/private-search.cc cmdline/apt-cache.cc
+#: apt-private/private-search.cc
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "您必須明確得給定一個樣式"
@@ -848,32 +848,27 @@ msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\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"
-"Commands:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages in the system\n"
-"   dotty - Generate package graphs for GraphViz\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
+"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"
@@ -884,32 +879,6 @@ msgid ""
 "  -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 ""
-"用法：apt-cache [選項] 指令\n"
-"      apt-cache [選項] add 檔案1 [檔案2 ...]\n"
-"      apt-cache [選項] showpkg 套件1 [套件2 ...]\n"
-"      apt-cache [選項] showsrc 套件1 [套件2 ...]\n"
-"\n"
-"apt-cache 是一個低階的工具，可用來操作 APT 的二進制快取檔，也可用來\n"
-"查詢那些檔案中的相關訊息\n"
-"\n"
-"指令:\n"
-"   add - 把套件檔加入原始碼快取中\n"
-"   gencaches - 同時產生套件和原始碼的快取\n"
-"   showpkg - 顯示某單一套件的一般資訊\n"
-"   showsrc - 顯示原始碼報告\n"
-"   stats - 顯示一些基本的統計資訊\n"
-"   dump - 簡要得顯示整個檔案\n"
-"   dumpavail - 將可用的檔案列印至標準輸出\n"
-"   unmet - 顯示所有未滿足的相依關係\n"
-"   search - 根據正規表示式搜索套件列表\n"
-"   show - 顯示該套件的易於閱讀的報告\n"
-"   depends - 顯示該套件的原始相依關係的資訊\n"
-"   rdepends - 顯示所有相依於該套件的套件名稱\n"
-"   pkgnames - 列出系統中所有套件\n"
-"   dotty - 產生用於 GraphViz 的套件關係圖\n"
-"   xvcg - 產生用於 xvcg 的套件的關係圖\n"
-"   policy - 顯示套件的可安裝版本資訊\n"
-"\n"
 "選項：\n"
 "  -h   本幫助訊息。\n"
 "  -p=? 套件的快取。\n"
@@ -920,29 +889,91 @@ msgstr ""
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 "請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
 
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "顯示原始碼報告"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr "根據正規表示式搜索套件列表"
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr "顯示該套件的原始相依關係的資訊"
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr "顯示所有相依於該套件的套件名稱"
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr "顯示該套件的易於閱讀的報告"
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr "列出系統中所有套件"
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr "顯示套件的可安裝版本資訊"
+
 #: cmdline/apt.cc
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
-"Basic commands: \n"
-" list - list packages based on package names\n"
-" search - search in package descriptions\n"
-" show - show package details\n"
-"\n"
-" update - update list of available packages\n"
-"\n"
-" install - install packages\n"
-" remove  - remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-"\n"
-" upgrade - upgrade the system by installing/upgrading packages\n"
-" full-upgrade - upgrade the system by removing/installing/upgrading "
-"packages\n"
-"\n"
-" edit-sources - edit the source information file\n"
 msgstr ""
 
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "正在讀取套件清單"
+
+#: cmdline/apt.cc
+msgid "show package details"
+msgstr ""
+
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "鎖定的套件："
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "損毀的套件"
+
+#: cmdline/apt.cc cmdline/apt-get.cc
+msgid "Remove automatically all unused packages"
+msgstr "自動移除所有不再使用的套件"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"
+msgstr ""
+
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"
+msgstr ""
+
+#. for compat with muscle memory
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "正在讀取狀態資料"
+
 #: cmdline/apt-cdrom.cc
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -970,6 +1001,30 @@ msgstr ""
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
 
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is 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"
+msgstr ""
+
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "參數並未成對"
@@ -979,29 +1034,31 @@ 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"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\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 ""
-"用法：apt-config [選項] 指令\n"
-"\n"
-"apt-config 是一個用於讀取 APT 設定檔的簡單工具\n"
-"\n"
-"指令:\n"
-"   shell - Shell 模式\n"
-"   dump - 顯示設定\n"
-"\n"
 "選項：\n"
 "  -h   本幫助訊息。\n"
 "  -c=? 讀取指定的設定檔\n"
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
 #: cmdline/apt-get.cc
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
@@ -1207,7 +1264,6 @@ msgid "Supported modules:"
 msgstr "已支援模組："
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1216,24 +1272,16 @@ msgid ""
 "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 ""
+"用法：apt-get [選項] 指令\n"
+"      apt-get [選項] install|remove 套件1 [套件2 ...]\n"
+"      apt-get [選項] source 套件1 [套件2 ...]\n"
 "\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
+"apt-get 是一個用來下載和安裝套件的簡易命令列界面。\n"
+"最常用指令是 update 和 install。\n"
+
+#: cmdline/apt-get.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1252,28 +1300,6 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"用法：apt-get [選項] 指令\n"
-"      apt-get [選項] install|remove 套件1 [套件2 ...]\n"
-"      apt-get [選項] source 套件1 [套件2 ...]\n"
-"\n"
-"apt-get 是一個用來下載和安裝套件的簡易命令列界面。\n"
-"最常用指令是 update 和 install。\n"
-"\n"
-"指令:\n"
-"   update - 取得新的套件列表\n"
-"   upgrade - 進行升級\n"
-"   install - 安裝新套件（套件名稱是 libc6 而不是 libc6.deb）\n"
-"   remove - 移除套件\n"
-"   autoremove - 自動移除所有不再使用的套件\n"
-"   purge - 移除並清除套件\n"
-"   source - 下載套件原始碼\n"
-"   build-dep - 為原始碼套件配置編譯相依關係\n"
-"   dist-upgrade - 發行版本升級，請參閱 apt-get(8)\n"
-"   dselect-upgrade - 採用 dselect 的選項升級\n"
-"   clean - 刪除已下載的套件檔\n"
-"   auto-clean - 刪除已下載但已有新版本的套件檔\n"
-"   check - 檢查相依關係是否有問題\n"
-"\n"
 "選項：\n"
 "  -h  本求助訊息。\n"
 "  -q  讓輸出可作為記錄檔之用 - 不顯示進度\n"
@@ -1292,6 +1318,62 @@ msgstr ""
 "以取得更多資訊和選項。\n"
 "                        該 APT 有著超級牛力。\n"
 
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "取得新的套件列表"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "進行升級"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "安裝新套件（套件名稱是 libc6 而不是 libc6.deb）"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "移除套件"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr "移除並清除套件"
+
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "發行版本升級，請參閱 apt-get(8)"
+
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "採用 dselect 的選項升級"
+
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "為原始碼套件配置編譯相依關係"
+
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "刪除已下載的套件檔"
+
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "刪除已下載但已有新版本的套件檔"
+
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "檢查相依關係是否有問題"
+
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "下載套件原始碼"
+
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"
+msgstr ""
+
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""
+
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 msgstr ""
@@ -1316,13 +1398,22 @@ msgid ""
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper is a internal helper for apt\n"
-"\n"
-"Commands:\n"
-"   download-file - download the given uri to the target-path\n"
-"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""
+
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1350,11 +1441,9 @@ msgstr "%s 已經是最新版本了。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待 %s 但是它並不存在"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
@@ -1367,7 +1456,18 @@ msgid "Canceled hold on %s.\n"
 msgstr "無法開啟 %s"
 
 #: cmdline/apt-mark.cc
-msgid "Executing dpkg failed. Are you root?"
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1376,16 +1476,10 @@ msgid ""
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
 "as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"   hold - Mark a package as held back\n"
-"   unhold - Unset a package set as held back\n"
-"   showauto - Print the list of automatically installed packages\n"
-"   showmanual - Print the list of manually installed packages\n"
-"   showhold - Print the list of package on hold\n"
-"\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid ""
 "Options:\n"
 "  -h  This help text.\n"
 "  -q  Loggable output - no progress indicator\n"
@@ -1397,6 +1491,38 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"
+msgstr ""
+
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -2441,7 +2567,21 @@ msgid "Retrieving file %li of %li"
 msgstr "正在取得檔案 %li/%li"
 
 #: apt-pkg/acquire-item.cc
-msgid "Use --allow-insecure-repositories to force the update"
+msgid ""
+"Updating such a repository securily is impossible and therefore disabled by "
+"default."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can not be authenticated and is therefore "
+"potentially dangerous to use."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
@@ -2506,19 +2646,21 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
 
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "路徑 %s 已被抽換"
 
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the users explicitely wants it
 #: apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "路徑 %s 已被抽換"
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy, c-format
@@ -2897,6 +3039,11 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待 %s 但是它並不存在"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -3581,6 +3728,11 @@ msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
 
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"