* src/getargs.c (usage): Rework to use conventions similar to

coreutils, to make translation a bit easier and the code a bit
smaller.  Problem reported by Tim Van Holder.
This commit is contained in:
Paul Eggert
2006-09-20 20:04:28 +00:00
parent 3b2942e671
commit a92be413b2
2 changed files with 19 additions and 19 deletions

View File

@@ -1,3 +1,9 @@
2006-09-20 Paul Eggert <eggert@cs.ucla.edu>
* src/getargs.c (usage): Rework to use conventions similar to
coreutils, to make translation a bit easier and the code a bit
smaller. Problem reported by Tim Van Holder.
2006-09-15 Paul Eggert <eggert@cs.ucla.edu> 2006-09-15 Paul Eggert <eggert@cs.ucla.edu>
Use some of gnulib's new modules, taken from coreutils. Use some of gnulib's new modules, taken from coreutils.

View File

@@ -235,29 +235,25 @@ usage (int status)
program_name); program_name);
else else
{ {
/* Some efforts were made to ease the translators' task, please printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
continue. */
fputs (_("\ fputs (_("\
GNU bison generates LALR(1) and GLR parsers.\n"), stdout); Generate LALR(1) and GLR parsers.\n\
putc ('\n', stdout); \n\
"), stdout);
fprintf (stdout, _("\
Usage: %s [OPTION]... FILE\n"), program_name);
putc ('\n', stdout);
fputs (_("\ fputs (_("\
If a long option shows an argument as mandatory, then it is mandatory\n\ Mandatory arguments to long options are mandatory for short options too.\n\
for the equivalent short option also. Similarly for optional arguments.\n"), "), stdout);
stdout);
putc ('\n', stdout);
fputs (_("\ fputs (_("\
\n\
Operation modes:\n\ Operation modes:\n\
-h, --help display this help and exit\n\ -h, --help display this help and exit\n\
-V, --version output version information and exit\n\ -V, --version output version information and exit\n\
--print-localedir output directory containing locale-dependent data\n\ --print-localedir output directory containing locale-dependent data\n\
-y, --yacc emulate POSIX Yacc\n"), stdout); -y, --yacc emulate POSIX Yacc\n\
putc ('\n', stdout); \n\
"), stdout);
fputs (_("\ fputs (_("\
Parser:\n\ Parser:\n\
@@ -268,8 +264,8 @@ Parser:\n\
-l, --no-lines don't generate `#line' directives\n\ -l, --no-lines don't generate `#line' directives\n\
-n, --no-parser generate the tables only\n\ -n, --no-parser generate the tables only\n\
-k, --token-table include a table of token names\n\ -k, --token-table include a table of token names\n\
\n\
"), stdout); "), stdout);
putc ('\n', stdout);
fputs (_("\ fputs (_("\
Output:\n\ Output:\n\
@@ -279,8 +275,8 @@ Output:\n\
-b, --file-prefix=PREFIX specify a PREFIX for output files\n\ -b, --file-prefix=PREFIX specify a PREFIX for output files\n\
-o, --output=FILE leave output to FILE\n\ -o, --output=FILE leave output to FILE\n\
-g, --graph also produce a VCG description of the automaton\n\ -g, --graph also produce a VCG description of the automaton\n\
\n\
"), stdout); "), stdout);
putc ('\n', stdout);
fputs (_("\ fputs (_("\
THINGS is a list of comma separated words that can include:\n\ THINGS is a list of comma separated words that can include:\n\
@@ -291,10 +287,8 @@ THINGS is a list of comma separated words that can include:\n\
`all' include all the above information\n\ `all' include all the above information\n\
`none' disable the report\n\ `none' disable the report\n\
"), stdout); "), stdout);
putc ('\n', stdout);
fputs (_("\ printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
Report bugs to <" PACKAGE_BUGREPORT ">.\n"), stdout);
} }
exit (status); exit (status);