From: Bruno Haible Date: Wed, 9 May 2001 14:02:46 +0000 (+0000) Subject: Tweak the --help output again. X-Git-Tag: v0.11~732 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc635033f9bcd3838ccb35d51d49b5a107d17a8d;p=thirdparty%2Fgettext.git Tweak the --help output again. --- diff --git a/src/ChangeLog b/src/ChangeLog index 97181e573..fa5af4281 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2001-05-04 Bruno Haible + + * gettext.c (usage): Add description of what the program does. + Separate blocks with blank lines. + * ngettext.c (usage): Likewise. + + * msgcmp.c (usage): Add a blank line after the first usage line. + Hardwire the blank line output. + * msgcomm.c (usage): Likewise. + * msgfmt.c (usage): Likewise. + * msgmerge.c (usage): Likewise. + * msgunfmt.c (usage): Likewise. + * xgettext.c (usage): Likewise. + 2001-05-05 Karl Eichwalder * xgettext.c (read_name_from_file): Remove trailing space from line. diff --git a/src/gettext.c b/src/gettext.c index 27bb4ef74..7bb4330e3 100644 --- a/src/gettext.c +++ b/src/gettext.c @@ -248,7 +248,16 @@ usage (status) { /* xgettext: no-wrap */ printf (_("\ -Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n\ +Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n\ +or: %s [OPTION] -s [MSGID]...\n\ +"), program_name, program_name); + printf ("\n"); + /* xgettext: no-wrap */ + printf (_("\ +Display native language translation of a textual message.\n")); + printf ("\n"); + /* xgettext: no-wrap */ + printf (_("\ -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n\ -e enable expansion of some escape sequences\n\ -E (ignored for compatibility)\n\ @@ -256,11 +265,10 @@ Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n\ -n suppress trailing newline\n\ -V, --version display version information and exit\n\ [TEXTDOMAIN] MSGID retrieve translated message corresponding\n\ - to MSGID from TEXTDOMAIN\n"), - program_name); + to MSGID from TEXTDOMAIN\n")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ -\n\ If the TEXTDOMAIN parameter is not given, the domain is determined from the\n\ environment variable TEXTDOMAIN. If the message catalog is not found in the\n\ regular directory, another location can be specified with the environment\n\ @@ -269,6 +277,7 @@ When used with the -s option the program behaves like the `echo' command.\n\ But it does not simply copy its arguments to stdout. Instead those messages\n\ found in the selected catalog are translated.\n\ Standard search directory: %s\n"), LOCALEDIR); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/msgcmp.c b/src/msgcmp.c index e17af95ad..7bff9caef 100644 --- a/src/msgcmp.c +++ b/src/msgcmp.c @@ -180,6 +180,7 @@ usage (status) printf (_("\ Usage: %s [OPTION] def.po ref.pot\n\ "), program_name); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Compare two Uniforum style .po files to check that both contain the same\n\ @@ -188,24 +189,28 @@ translations. The ref.pot file is the last created PO file, or a PO Template\n\ file (generally created by xgettext). This is useful for checking that\n\ you have translated each and every message in your program. Where an exact\n\ match cannot be found, fuzzy matching is used to produce better diagnostics.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file location:\n\ def.po translations\n\ ref.pot references to the sources\n\ -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Informative output:\n\ -h, --help display this help and exit\n\ -V, --version output version information and exit\n\ -\n")); +")); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/msgcomm.c b/src/msgcomm.c index a1eaf1a90..2f236b23c 100644 --- a/src/msgcomm.c +++ b/src/msgcomm.c @@ -378,6 +378,7 @@ usage (status) printf (_("\ Usage: %s [OPTION] [INPUTFILE]...\n\ "), program_name); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Find messages which are common to two or more of the specified PO files.\n\ @@ -388,11 +389,13 @@ used to specify less commonality before messages are printed (i.e.\n\ comments and extract comments will be preserved, but only from the first\n\ PO file to define them. File positions from all PO files will be\n\ cumulated.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file location:\n\ @@ -400,7 +403,8 @@ Input file location:\n\ -f, --files-from=FILE get list of input files from FILE\n\ -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ If input file is -, standard input is read.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output file location:\n\ @@ -408,7 +412,8 @@ Output file location:\n\ -o, --output=FILE write output to specified file\n\ -p, --output-dir=DIR output files will be placed in directory DIR\n\ If output file is -, output is written to standard output.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Message selection:\n\ @@ -419,7 +424,8 @@ Message selection:\n\ definitions, defaults to 1 if not set\n\ -u, --unique shorthand for --less-than=2, requests\n\ that only unique messages be printed\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output details:\n\ @@ -434,13 +440,15 @@ Output details:\n\ -s, --sort-output generate sorted output and remove duplicates\n\ -F, --sort-by-file sort output by file location\n\ --omit-header don't write header with `msgid \"\"' entry\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Informative output:\n\ -h, --help display this help and exit\n\ -V, --version output version information and exit\n\ -\n")); +")); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/msgfmt.c b/src/msgfmt.c index 7edd74c4a..6b2c681d3 100644 --- a/src/msgfmt.c +++ b/src/msgfmt.c @@ -390,40 +390,47 @@ usage (status) printf (_("\ Usage: %s [OPTION] filename.po ...\n\ "), program_name); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Generate binary message catalog from textual translation description.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file location:\n\ filename.po ... input files\n\ -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ If input file is -, standard input is read.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output file location:\n\ -o, --output-file=FILE write output to specified file\n\ --strict enable strict Uniforum mode\n\ If output file is -, output is written to standard output.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file interpretation:\n\ -c, --check perform language dependent checks on strings\n\ -f, --use-fuzzy use fuzzy entries in output\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output details:\n\ -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n\ --no-hash binary file will not include the hash table\n\ -\n"), DEFAULT_OUTPUT_ALIGNMENT); +"), DEFAULT_OUTPUT_ALIGNMENT); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Informative output:\n\ @@ -432,7 +439,8 @@ Informative output:\n\ --statistics print statistics about translations\n\ -v, --verbose list input file anomalies\n\ Giving the -v option more than once increases the verbosity level.\n\ -\n")); +")); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/msgmerge.c b/src/msgmerge.c index c8e5145a1..a09c3f93f 100644 --- a/src/msgmerge.c +++ b/src/msgmerge.c @@ -268,6 +268,7 @@ usage (status) printf (_("\ Usage: %s [OPTION] def.po ref.pot\n\ "), program_name); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Merges two Uniforum style .po files together. The def.po file is an\n\ @@ -279,11 +280,13 @@ old translations, or a PO Template file (generally created by xgettext);\n\ any translations or comments in the file will be discarded, however dot\n\ comments and file positions will be preserved. Where an exact match\n\ cannot be found, fuzzy matching is used to produce better results.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file location:\n\ @@ -292,14 +295,16 @@ Input file location:\n\ -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -C, --compendium=FILE additional library of message translations,\n\ may be specified more than once\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output file location:\n\ -o, --output-file=FILE write output to specified file\n\ The results are written to standard output if no output file is specified\n\ or if it is -.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output details:\n\ @@ -313,7 +318,8 @@ Output details:\n\ -w, --width=NUMBER set output page width\n\ -s, --sort-output generate sorted output and remove duplicates\n\ -F, --sort-by-file sort output by file location\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Informative output:\n\ @@ -321,7 +327,8 @@ Informative output:\n\ -V, --version output version information and exit\n\ -v, --verbose increase verbosity level\n\ -q, --quiet, --silent suppress progress indicators\n\ -\n")); +")); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/msgunfmt.c b/src/msgunfmt.c index 2b613447c..f58bd41a0 100644 --- a/src/msgunfmt.c +++ b/src/msgunfmt.c @@ -216,27 +216,32 @@ usage (status) printf (_("\ Usage: %s [OPTION] [FILE]...\n\ "), program_name); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Convert binary message catalog to Uniforum style .po file.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file location:\n\ FILE ... input .mo files\n\ If no input file is given or if it is -, standard input is read.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output file location:\n\ -o, --output-file=FILE write output to specified file\n\ The results are written to standard output if no output file is specified\n\ or if it is -.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output details:\n\ @@ -247,13 +252,15 @@ Output details:\n\ --strict write strict uniforum style\n\ -w, --width=NUMBER set output page width\n\ -s, --sort-output generate sorted output and remove duplicates\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Informative output:\n\ -h, --help display this help and exit\n\ -V, --version output version information and exit\n\ -\n")); +")); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/ngettext.c b/src/ngettext.c index ee54cb3d0..36b1513a2 100644 --- a/src/ngettext.c +++ b/src/ngettext.c @@ -208,6 +208,15 @@ usage (status) /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n\ +"), program_name); + printf ("\n"); + /* xgettext: no-wrap */ + printf (_("\ +Display native language translation of a textual message whose grammatical\n\ +form depends on a number.\n")); + printf ("\n"); + /* xgettext: no-wrap */ + printf (_("\ -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n\ -e enable expansion of some escape sequences\n\ -E (ignored for compatibility)\n\ @@ -215,16 +224,16 @@ Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n\ -V, --version display version information and exit\n\ [TEXTDOMAIN] retrieve translated message from TEXTDOMAIN\n\ MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n\ - COUNT choose singular/plural form based on this value\n"), - program_name); + COUNT choose singular/plural form based on this value\n")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ -\n\ If the TEXTDOMAIN parameter is not given, the domain is determined from the\n\ environment variable TEXTDOMAIN. If the message catalog is not found in the\n\ regular directory, another location can be specified with the environment\n\ variable TEXTDOMAINDIR.\n\ Standard search directory: %s\n"), LOCALEDIR); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/src/xgettext.c b/src/xgettext.c index 492a31c9d..64afb7ae1 100644 --- a/src/xgettext.c +++ b/src/xgettext.c @@ -519,15 +519,18 @@ usage (status) printf (_("\ Usage: %s [OPTION] [INPUTFILE]...\n\ "), program_name); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ -Extract translatable string from given input files.\n\ -\n")); +Extract translatable strings from given input files.\n\ +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ Similarly for optional arguments.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Input file location:\n\ @@ -535,7 +538,8 @@ Input file location:\n\ -f, --files-from=FILE get list of input files from FILE\n\ -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ If input file is -, standard input is read.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output file location:\n\ @@ -543,14 +547,16 @@ Output file location:\n\ -o, --output=FILE write output to specified file\n\ -p, --output-dir=DIR output files will be placed in directory DIR\n\ If output file is -, output is written to standard output.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Choice of input file language:\n\ -L, --language=NAME recognise the specified language (C, C++, PO)\n\ -C, --c++ shorthand for --language=C++\n\ By default the language is guessed depending on the input file name extension.\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Operation mode:\n\ @@ -558,7 +564,8 @@ Operation mode:\n\ -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n\ -c, --add-comments[=TAG] place comment block with TAG (or those\n\ preceding keyword lines) in output file\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Language=C/C++ specific options:\n\ @@ -567,7 +574,8 @@ Language=C/C++ specific options:\n\ WORD means not to use default keywords)\n\ -T, --trigraphs understand ANSI C trigraphs for input\n\ --debug more detailed formatstring recognition result\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Output details:\n\ @@ -585,13 +593,15 @@ Output details:\n\ --foreign-user omit FSF copyright in output for foreign user\n\ -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n\ -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n\ -\n")); +")); + printf ("\n"); /* xgettext: no-wrap */ printf (_("\ Informative output:\n\ -h, --help display this help and exit\n\ -V, --version output version information and exit\n\ -\n")); +")); + printf ("\n"); fputs (_("Report bugs to .\n"), stdout); }