* popthelp.c (poptPrintHelp): Use POPT_ for "[OPTION...]",

this message is eliminated by poptSetOtherOptionHelp().
* popt.c (poptStrerror): Use _ instead of POPT_ for useful
messages.
This commit is contained in:
Andrew V. Samoilov 2002-10-22 11:51:47 +00:00
parent 499aa8c24f
commit 13f6e4646d
3 changed files with 11 additions and 5 deletions

View File

@ -1,5 +1,10 @@
2002-10-22 Andrew V. Samoilov <sav@bcs.zp.ua>
* popthelp.c (poptPrintHelp): Use POPT_ for "[OPTION...]",
this message is eliminated by poptSetOtherOptionHelp().
* popt.c (poptStrerror): Use _ instead of POPT_ for useful
messages.
* utilunix.c (mc_tmpdir): Make directory only if not exists.
Use strncpy() instead of g_snprintf() - there can be printf()
pattern(s) in the $TMPDIR.
@ -76,7 +81,8 @@
2002-10-09 Andrew V. Samoilov <sav@bcs.zp.ua>
* popt.h: Adjust poptHelpOptions[] declaration.
* popt.h: Adjust poptHelpOptions[] and poptPrintHelp()
declarations.
* popthelp.c: Replace POPT_ with _ for visible strings.
(singleOptionHelp): Eliminate format array.

View File

@ -544,15 +544,15 @@ char * poptBadOption(poptContext con, int flags) {
const char * poptStrerror(const int error) {
switch (error) {
case POPT_ERROR_NOARG:
return POPT_("missing argument");
return _("missing argument");
case POPT_ERROR_BADOPT:
return POPT_("unknown option");
return _("unknown option");
case POPT_ERROR_OPTSTOODEEP:
return POPT_("aliases nested too deeply");
case POPT_ERROR_BADQUOTE:
return POPT_("error in parameter quoting");
case POPT_ERROR_BADNUMBER:
return POPT_("invalid numeric value");
return _("invalid numeric value");
case POPT_ERROR_OVERFLOW:
return POPT_("number too large or too small");
case POPT_ERROR_ERRNO:

View File

@ -194,7 +194,7 @@ int poptPrintHelp(poptContext con, FILE * f, int flags) {
if (con->otherHelp)
fprintf(f, " %s\n", con->otherHelp);
else
fprintf(f, " %s\n", _("[OPTION...]"));
fprintf(f, " %s\n", POPT_("[OPTION...]"));
leftColWidth = maxArgWidth(con->options, NULL);
singleTableHelp(f, con->options, leftColWidth, NULL);