Browse Source

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
tags/debian/1.1_exp15
David Kalnischkies 6 years ago
parent
commit
cbbee23e77
68 changed files with 18729 additions and 9104 deletions
  1. +60
    -2
      apt-pkg/contrib/cmndline.cc
  2. +11
    -0
      apt-pkg/contrib/cmndline.h
  3. +8
    -7
      apt-private/private-cmndline.cc
  4. +2
    -2
      apt-private/private-cmndline.h
  5. +35
    -45
      cmdline/apt-cache.cc
  6. +23
    -18
      cmdline/apt-cdrom.cc
  7. +22
    -16
      cmdline/apt-config.cc
  8. +2
    -2
      cmdline/apt-extracttemplates.cc
  9. +40
    -47
      cmdline/apt-get.cc
  10. +21
    -15
      cmdline/apt-helper.cc
  11. +2
    -2
      cmdline/apt-internal-solver.cc
  12. +36
    -36
      cmdline/apt-mark.cc
  13. +2
    -2
      cmdline/apt-sortpkgs.cc
  14. +36
    -47
      cmdline/apt.cc
  15. +333
    -145
      doc/po/apt-doc.pot
  16. +620
    -221
      doc/po/de.po
  17. +534
    -198
      doc/po/es.po
  18. +618
    -221
      doc/po/fr.po
  19. +618
    -223
      doc/po/it.po
  20. +613
    -221
      doc/po/ja.po
  21. +535
    -199
      doc/po/pl.po
  22. +615
    -218
      doc/po/pt.po
  23. +350
    -149
      doc/po/pt_BR.po
  24. +17
    -15
      ftparchive/apt-ftparchive.cc
  25. +279
    -91
      po/apt-all.pot
  26. +295
    -94
      po/ar.po
  27. +304
    -156
      po/ast.po
  28. +315
    -161
      po/bg.po
  29. +292
    -97
      po/bs.po
  30. +305
    -156
      po/ca.po
  31. +325
    -187
      po/cs.po
  32. +302
    -156
      po/cy.po
  33. +312
    -185
      po/da.po
  34. +316
    -197
      po/de.po
  35. +309
    -156
      po/dz.po
  36. +304
    -153
      po/el.po
  37. +322
    -235
      po/es.po
  38. +304
    -151
      po/eu.po
  39. +304
    -150
      po/fi.po
  40. +316
    -174
      po/fr.po
  41. +304
    -156
      po/gl.po
  42. +315
    -158
      po/hu.po
  43. +315
    -192
      po/it.po
  44. +313
    -192
      po/ja.po
  45. +305
    -149
      po/km.po
  46. +303
    -154
      po/ko.po
  47. +293
    -100
      po/ku.po
  48. +299
    -102
      po/lt.po
  49. +302
    -156
      po/mr.po
  50. +304
    -156
      po/nb.po
  51. +306
    -149
      po/ne.po
  52. +313
    -192
      po/nl.po
  53. +305
    -150
      po/nn.po
  54. +317
    -159
      po/pl.po
  55. +316
    -160
      po/pt.po
  56. +305
    -154
      po/pt_BR.po
  57. +305
    -154
      po/ro.po
  58. +314
    -189
      po/ru.po
  59. +314
    -160
      po/sk.po
  60. +313
    -158
      po/sl.po
  61. +328
    -191
      po/sv.po
  62. +307
    -184
      po/th.po
  63. +302
    -151
      po/tl.po
  64. +329
    -194
      po/tr.po
  65. +317
    -162
      po/uk.po
  66. +317
    -197
      po/vi.po
  67. +308
    -184
      po/zh_CN.po
  68. +303
    -151
      po/zh_TW.po

+ 60
- 2
apt-pkg/contrib/cmndline.cc View File

@@ -83,6 +83,43 @@ char const * CommandLine::GetCommand(Dispatch const * const Map,
return Map[j].Match;
}
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;


+ 11
- 0
apt-pkg/contrib/cmndline.h View File

@@ -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

+ 8
- 7
apt-private/private-cmndline.cc View File

@@ -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);
}
}


+ 2
- 2
apt-private/private-cmndline.h View File

@@ -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

+ 35
- 45
cmdline/apt-cache.cc View File

@@ -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));



+ 23
- 18
cmdline/apt-cdrom.cc View File

@@ -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));



+ 22
- 16
cmdline/apt-config.cc View File

@@ -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));



+ 2
- 2
cmdline/apt-extracttemplates.cc View File

@@ -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);



+ 40
- 47
cmdline/apt-get.cc View File

@@ -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));



+ 21
- 15
cmdline/apt-helper.cc View File

@@ -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,"");


+ 2
- 2
cmdline/apt-internal-solver.cc View File

@@ -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)
{


+ 36
- 36
cmdline/apt-mark.cc View File

@@ -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));



+ 2
- 2
cmdline/apt-sortpkgs.cc View File

@@ -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);



+ 36
- 47
cmdline/apt.cc View File

@@ -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));



+ 333
- 145
doc/po/apt-doc.pot View File

@@ -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>
@@ -817,6 +827,17 @@ msgid ""
"decisions made by apt-get's conflict resolution system."
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 ""
@@ -855,6 +876,16 @@ msgid ""
"expression."
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 ""
@@ -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 ""
@@ -958,6 +999,14 @@ msgid ""
"being erased if it is set to off."
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 ""
@@ -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 ""
@@ -1841,6 +1896,14 @@ msgid ""
"filename is <literal>-</literal> from standard input."
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."
@@ -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 "
@@ -2533,6 +2664,13 @@ msgstr ""
msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
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 ""
@@ -3370,6 +3508,40 @@ msgid ""
"tried if available in this case."
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"
@@ -5368,6 +5540,22 @@ msgid ""
"detect and error out on such anomalies."
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 ""


+ 620
- 221
doc/po/de.po
File diff suppressed because it is too large
View File


+ 534
- 198
doc/po/es.po
File diff suppressed because it is too large
View File


+ 618
- 221
doc/po/fr.po
File diff suppressed because it is too large
View File


+ 618
- 223
doc/po/it.po
File diff suppressed because it is too large
View File


+ 613
- 221
doc/po/ja.po
File diff suppressed because it is too large
View File


+ 535
- 199
doc/po/pl.po
File diff suppressed because it is too large
View File


+ 615
- 218
doc/po/pt.po
File diff suppressed because it is too large
View File


+ 350
- 149
doc/po/pt_BR.po View File

@@ -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
@@ -800,6 +813,17 @@ msgid ""
"get's conflict resolution system."
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><va