diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
| commit | b53c9cea2902572822bbbece5bac236c1bbf846e (patch) | |
| tree | 6c6b0524e0971c0623ccbff71383523ee0b2a5cc /apt-pkg/contrib/cmndline.cc | |
| parent | 21248c0f00ee71412dbadc6ebf84011cf974346d (diff) | |
| parent | 2a22cd60f04c4291ea9b9b72e15b6d2ec378b001 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records
Diffstat (limited to 'apt-pkg/contrib/cmndline.cc')
| -rw-r--r-- | apt-pkg/contrib/cmndline.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index ff8b09ebc..40365237e 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -124,7 +124,7 @@ bool CommandLine::Parse(int argc,const char **argv) Args *A; for (A = ArgList; A->end() == false && A->ShortOpt != *Opt; A++); if (A->end() == true) - return _error->Error(_("Command line option '%c' [from %s] is not known."),*Opt,argv[I]); + return _error->Error(_("Command line option '%c' [from %s] is not understood in combination with the other options."),*Opt,argv[I]); if (HandleOpt(I,argc,argv,Opt,A) == false) return false; @@ -149,7 +149,7 @@ bool CommandLine::Parse(int argc,const char **argv) { Opt = (const char*) memchr(Opt, '-', OptEnd - Opt); if (Opt == NULL) - return _error->Error(_("Command line option %s is not understood"),argv[I]); + return _error->Error(_("Command line option %s is not understood in combination with the other options"),argv[I]); Opt++; for (A = ArgList; A->end() == false && @@ -158,7 +158,7 @@ bool CommandLine::Parse(int argc,const char **argv) // Failed again.. if (A->end() == true && OptEnd - Opt != 1) - return _error->Error(_("Command line option %s is not understood"),argv[I]); + return _error->Error(_("Command line option %s is not understood in combination with the other options"),argv[I]); // The option could be a single letter option prefixed by a no-.. if (A->end() == true) @@ -166,7 +166,7 @@ bool CommandLine::Parse(int argc,const char **argv) for (A = ArgList; A->end() == false && A->ShortOpt != *Opt; A++); if (A->end() == true) - return _error->Error(_("Command line option %s is not understood"),argv[I]); + return _error->Error(_("Command line option %s is not understood in combination with the other options"),argv[I]); } // The option is not boolean |