From: Bruno Haible Date: Fri, 25 Apr 2003 10:21:24 +0000 (+0000) Subject: Split strings in usage message. X-Git-Tag: v0.12~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35f072046d5fcf064eed22d6dff0caef1899aae;p=thirdparty%2Fgettext.git Split strings in usage message. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index ec96ab1d4..7369f4737 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,24 @@ +2003-04-14 Bruno Haible + + * hostname.c (usage): Split strings: use one string per option + description. + * msgattrib.c (usage): Likewise. + * msgcat.c (usage): Likewise. + * msgcmp.c (usage): Likewise. + * msgcomm.c (usage): Likewise. + * msgconv.c (usage): Likewise. + * msgen.c (usage): Likewise. + * msgexec.c (usage): Likewise. + * msgfilter.c (usage): Likewise. + * msgfmt.c (usage): Likewise. + * msggrep.c (usage): Likewise. + * msginit.c (usage): Likewise. + * msgmerge.c (usage): Likewise. + * msgunfmt.c (usage): Likewise. + * msguniq.c (usage): Likewise. + * urlget.c (usage): Likewise. + * xgettext.c (usage): Likewise. + 2003-04-13 Bruno Haible Unify three PO file parsers. diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index 32fae9cdf..9e73ca86c 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -201,31 +201,29 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION]\n\ "), program_name); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Print the machine's hostname.\n\ -")); +Print the machine's hostname.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output format:\n\ - -s, --short short host name\n\ - -f, --fqdn, --long long host name, includes fully qualified domain name,\n\ - and aliases\n\ - -i, --ip-address addresses for the hostname\n\ -")); +Output format:\n")); + printf (_("\ + -s, --short short host name\n")); + printf (_("\ + -f, --fqdn, --long long host name, includes fully qualified domain\n\ + name, and aliases\n")); + printf (_("\ + -i, --ip-address addresses for the hostname\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c index fac9ae793..9b8dab65f 100644 --- a/gettext-tools/src/msgattrib.c +++ b/gettext-tools/src/msgattrib.c @@ -348,7 +348,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]\n\ "), program_name); @@ -356,77 +355,94 @@ Usage: %s [OPTION] [INPUTFILE]\n\ /* xgettext: no-wrap */ printf (_("\ Filters the messages of a translation catalog according to their attributes,\n\ -and manipulates the attributes.\n\ -")); +and manipulates the attributes.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE input PO file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If no input file is given or if it is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE input PO file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Message selection:\n\ - --translated keep translated, remove untranslated messages\n\ - --untranslated keep untranslated, remove translated messages\n\ - --no-fuzzy remove 'fuzzy' marked messages\n\ - --only-fuzzy keep 'fuzzy' marked messages\n\ - --no-obsolete remove obsolete #~ messages\n\ - --only-obsolete keep obsolete #~ messages\n\ -")); +Message selection:\n")); + printf (_("\ + --translated keep translated, remove untranslated messages\n")); + printf (_("\ + --untranslated keep untranslated, remove translated messages\n")); + printf (_("\ + --no-fuzzy remove 'fuzzy' marked messages\n")); + printf (_("\ + --only-fuzzy keep 'fuzzy' marked messages\n")); + printf (_("\ + --no-obsolete remove obsolete #~ messages\n")); + printf (_("\ + --only-obsolete keep obsolete #~ messages\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Attribute manipulation:\n\ - --set-fuzzy set all messages 'fuzzy'\n\ - --clear-fuzzy set all messages non-'fuzzy'\n\ - --set-obsolete set all messages obsolete\n\ - --clear-obsolete set all messages non-obsolete\n\ - --only-file=FILE.po manipulate only entries listed in FILE.po\n\ - --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n\ - --fuzzy synonym for --only-fuzzy --clear-fuzzy\n\ - --obsolete synonym for --only-obsolete --clear-obsolete\n\ -")); +Attribute manipulation:\n")); + printf (_("\ + --set-fuzzy set all messages 'fuzzy'\n")); + printf (_("\ + --clear-fuzzy set all messages non-'fuzzy'\n")); + printf (_("\ + --set-obsolete set all messages obsolete\n")); + printf (_("\ + --clear-obsolete set all messages non-obsolete\n")); + printf (_("\ + --only-file=FILE.po manipulate only entries listed in FILE.po\n")); + printf (_("\ + --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n")); + printf (_("\ + --fuzzy synonym for --only-fuzzy --clear-fuzzy\n")); + printf (_("\ + --obsolete synonym for --only-obsolete --clear-obsolete\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent write the .po file using indented style\n\ - --no-location do not write '#: filename:line' lines\n\ - -n, --add-location generate '#: filename:line' lines (default)\n\ - --strict write out strict Uniforum conforming .po file\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent write the .po file using indented style\n")); + printf (_("\ + --no-location do not write '#: filename:line' lines\n")); + printf (_("\ + -n, --add-location generate '#: filename:line' lines (default)\n")); + printf (_("\ + --strict write out strict Uniforum conforming .po file\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index a949f562b..4a07bf6a9 100644 --- a/gettext-tools/src/msgcat.c +++ b/gettext-tools/src/msgcat.c @@ -297,7 +297,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]...\n\ "), program_name); @@ -315,66 +314,77 @@ is specified, they will be taken from the first PO file to define them.\n\ File positions from all PO files will be cumulated.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE ... input files\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\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE ... input files\n")); + printf (_("\ + -f, --files-from=FILE get list of input files from FILE\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If input file is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Message selection:\n\ - -<, --less-than=NUMBER print messages with less than this many\n\ - definitions, defaults to infinite if not\n\ - set\n\ - ->, --more-than=NUMBER print messages with more than this many\n\ - definitions, defaults to 0 if not set\n\ - -u, --unique shorthand for --less-than=2, requests\n\ - that only unique messages be printed\n\ -")); +Message selection:\n")); + printf (_("\ + -<, --less-than=NUMBER print messages with less than this many\n\ + definitions, defaults to infinite if not set\n")); + printf (_("\ + ->, --more-than=NUMBER print messages with more than this many\n\ + definitions, defaults to 0 if not set\n")); + printf (_("\ + -u, --unique shorthand for --less-than=2, requests\n\ + that only unique messages be printed\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -t, --to-code=NAME encoding for output\n\ - --use-first use first available translation for each\n\ - message, don't merge several translations\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent write the .po file using indented style\n\ - --no-location do not write '#: filename:line' lines\n\ - -n, --add-location generate '#: filename:line' lines (default)\n\ - --strict write out strict Uniforum conforming .po file\n\ - -w, --width=NUMBER set output page width\n\ - --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); +Output details:\n")); + printf (_("\ + -t, --to-code=NAME encoding for output\n")); + printf (_("\ + --use-first use first available translation for each\n\ + message, don't merge several translations\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent write the .po file using indented style\n")); + printf (_("\ + --no-location do not write '#: filename:line' lines\n")); + printf (_("\ + -n, --add-location generate '#: filename:line' lines (default)\n")); + printf (_("\ + --strict write out strict Uniforum conforming .po file\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ + --no-wrap do not break long message lines, longer than\n\ + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c index d1f56e21f..6f627a36a 100644 --- a/gettext-tools/src/msgcmp.c +++ b/gettext-tools/src/msgcmp.c @@ -162,7 +162,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] def.po ref.pot\n\ "), program_name); @@ -177,31 +176,29 @@ 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\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\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\ -")); +Input file location:\n")); + printf (_("\ + def.po translations\n")); + printf (_("\ + ref.pot references to the sources\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Operation modifiers:\n\ - -m, --multi-domain apply ref.pot to each of the domains in def.po\n\ -")); +Operation modifiers:\n")); + printf (_("\ + -m, --multi-domain apply ref.pot to each of the domains in def.po\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c index 2f1d799ed..0b8219337 100644 --- a/gettext-tools/src/msgcomm.c +++ b/gettext-tools/src/msgcomm.c @@ -309,7 +309,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]...\n\ "), program_name); @@ -326,64 +325,74 @@ PO file to define them. File positions from all PO files will be\n\ cumulated.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE ... input files\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\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE ... input files\n")); + printf (_("\ + -f, --files-from=FILE get list of input files from FILE\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If input file is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Message selection:\n\ - -<, --less-than=NUMBER print messages with less than this many\n\ - definitions, defaults to infinite if not\n\ - set\n\ - ->, --more-than=NUMBER print messages with more than this many\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\ -")); +Message selection:\n")); + printf (_("\ + -<, --less-than=NUMBER print messages with less than this many\n\ + definitions, defaults to infinite if not set\n")); + printf (_("\ + ->, --more-than=NUMBER print messages with more than this many\n\ + definitions, defaults to 1 if not set\n")); + printf (_("\ + -u, --unique shorthand for --less-than=2, requests\n\ + that only unique messages be printed\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent write the .po file using indented style\n\ - --no-location do not write '#: filename:line' lines\n\ - -n, --add-location generate '#: filename:line' lines (default)\n\ - --strict write out strict Uniforum conforming .po file\n\ - -w, --width=NUMBER set output page width\n\ - --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ - --omit-header don't write header with `msgid \"\"' entry\n\ -")); +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent write the .po file using indented style\n")); + printf (_("\ + --no-location do not write '#: filename:line' lines\n")); + printf (_("\ + -n, --add-location generate '#: filename:line' lines (default)\n")); + printf (_("\ + --strict write out strict Uniforum conforming .po file\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ + --no-wrap do not break long message lines, longer than\n\ + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\n")); + printf (_("\ + --omit-header don't write header with `msgid \"\"' entry\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c index e843eb3a0..41a0b8ae0 100644 --- a/gettext-tools/src/msgconv.c +++ b/gettext-tools/src/msgconv.c @@ -249,67 +249,73 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]\n\ "), program_name); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ Converts a translation catalog to a different character encoding.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE input PO file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If no input file is given or if it is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE input PO file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Conversion target:\n\ - -t, --to-code=NAME encoding for output\n\ -The default encoding is the current locale's encoding.\n\ -")); +Conversion target:\n")); + printf (_("\ + -t, --to-code=NAME encoding for output\n")); + printf (_("\ +The default encoding is the current locale's encoding.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent indented output style\n\ - --no-location suppress '#: filename:line' lines\n\ - --add-location preserve '#: filename:line' lines (default)\n\ - --strict strict Uniforum output style\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent indented output style\n")); + printf (_("\ + --no-location suppress '#: filename:line' lines\n")); + printf (_("\ + --add-location preserve '#: filename:line' lines (default)\n")); + printf (_("\ + --strict strict Uniforum output style\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c index ac66ebb48..8e5a0174b 100644 --- a/gettext-tools/src/msgen.c +++ b/gettext-tools/src/msgen.c @@ -234,7 +234,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] INPUTFILE\n\ "), program_name); @@ -247,50 +246,58 @@ xgettext). Untranslated entries are assigned a translation that is\n\ identical to the msgid.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE input PO or POT file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If input file is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE input PO or POT file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If input file is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent indented output style\n\ - --no-location suppress '#: filename:line' lines\n\ - --add-location preserve '#: filename:line' lines (default)\n\ - --strict strict Uniforum output style\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent indented output style\n")); + printf (_("\ + --no-location suppress '#: filename:line' lines\n")); + printf (_("\ + --add-location preserve '#: filename:line' lines (default)\n")); + printf (_("\ + --strict strict Uniforum output style\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index 4840ee4d3..e6e24c67d 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -218,7 +218,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n\ "), program_name); @@ -238,25 +237,24 @@ A special builtin command called '0' outputs the translation, followed by a\n\ null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - -i, --input=INPUTFILE input PO file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If no input file is given or if it is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + -i, --input=INPUTFILE input PO file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index 2e4fb9a40..9ed4097c1 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -340,76 +340,83 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] FILTER [FILTER-OPTION]\n\ "), program_name); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ Applies a filter to all translations of a translation catalog.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - -i, --input=INPUTFILE input PO file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If no input file is given or if it is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + -i, --input=INPUTFILE input PO file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ The FILTER can be any program that reads a translation from standard input\n\ and writes a modified translation to standard output.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Useful FILTER-OPTIONs when the FILTER is 'sed':\n\ - -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n\ +Useful FILTER-OPTIONs when the FILTER is 'sed':\n")); + printf (_("\ + -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n")); + printf (_("\ -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the commands\n\ - to be executed\n\ - -n, --quiet, --silent suppress automatic printing of pattern space\n\ -")); + to be executed\n")); + printf (_("\ + -n, --quiet, --silent suppress automatic printing of pattern space\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - --indent indented output style\n\ - --keep-header keep header entry unmodified, don't filter it\n\ - --no-location suppress '#: filename:line' lines\n\ - --add-location preserve '#: filename:line' lines (default)\n\ - --strict strict Uniforum output style\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + --indent indented output style\n")); + printf (_("\ + --keep-header keep header entry unmodified, don't filter it\n")); + printf (_("\ + --no-location suppress '#: filename:line' lines\n")); + printf (_("\ + --add-location preserve '#: filename:line' lines (default)\n")); + printf (_("\ + --strict strict Uniforum output style\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index f84458f39..91d9c1cc9 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -487,12 +487,10 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] filename.po ...\n\ "), program_name); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ Generate binary message catalog from textual translation description.\n\ ")); @@ -500,82 +498,97 @@ Generate binary message catalog from textual translation description.\n\ /* xgettext: no-wrap */ printf (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ +Similarly for optional arguments.\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\ -")); +Input file location:\n")); + printf (_("\ + filename.po ... input files\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If input file is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Operation mode:\n\ - -j, --java Java mode: generate a Java ResourceBundle class\n\ - --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n\ - --tcl Tcl mode: generate a tcl/msgcat .msg file\n\ -")); +Operation mode:\n")); + printf (_("\ + -j, --java Java mode: generate a Java ResourceBundle class\n")); + printf (_("\ + --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n")); + printf (_("\ + --tcl Tcl mode: generate a tcl/msgcat .msg file\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\ -")); +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ + --strict enable strict Uniforum mode\n")); + printf (_("\ +If output file is -, output is written to standard output.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location in Java mode:\n\ - -r, --resource=RESOURCE resource name\n\ - -l, --locale=LOCALE locale name, either language or language_COUNTRY\n\ - -d DIRECTORY base directory of classes directory hierarchy\n\ +Output file location in Java mode:\n")); + printf (_("\ + -r, --resource=RESOURCE resource name\n")); + printf (_("\ + -l, --locale=LOCALE locale name, either language or language_COUNTRY\n")); + printf (_("\ + -d DIRECTORY base directory of classes directory hierarchy\n")); + printf (_("\ The class name is determined by appending the locale name to the resource name,\n\ separated with an underscore. The -d option is mandatory. The class is\n\ written under the specified directory.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location in Tcl mode:\n\ - -l, --locale=LOCALE locale name, either language or language_COUNTRY\n\ - -d DIRECTORY base directory of .msg message catalogs\n\ +Output file location in Tcl mode:\n")); + printf (_("\ + -l, --locale=LOCALE locale name, either language or language_COUNTRY\n")); + printf (_("\ + -d DIRECTORY base directory of .msg message catalogs\n")); + printf (_("\ The -l and -d options are mandatory. The .msg file is written in the\n\ -specified directory.\n\ -")); +specified directory.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file interpretation:\n\ +Input file interpretation:\n")); + printf (_("\ -c, --check perform all the checks implied by\n\ - --check-format, --check-header, --check-domain\n\ - --check-format check language dependent format strings\n\ - --check-header verify presence and contents of the header entry\n\ + --check-format, --check-header, --check-domain\n")); + printf (_("\ + --check-format check language dependent format strings\n")); + printf (_("\ + --check-header verify presence and contents of the header entry\n")); + printf (_("\ --check-domain check for conflicts between domain directives\n\ - and the --output-file option\n\ - -C, --check-compatibility check that GNU msgfmt behaves like X/Open msgfmt\n\ + and the --output-file option\n")); + printf (_("\ + -C, --check-compatibility check that GNU msgfmt behaves like X/Open msgfmt\n")); + printf (_("\ --check-accelerators[=CHAR] check presence of keyboard accelerators for\n\ - menu items\n\ - -f, --use-fuzzy use fuzzy entries in output\n\ -")); + menu items\n")); + printf (_("\ + -f, --use-fuzzy use fuzzy entries in output\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\ -"), DEFAULT_OUTPUT_ALIGNMENT); +Output details:\n")); + printf (_("\ + -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"), DEFAULT_OUTPUT_ALIGNMENT); + printf (_("\ + --no-hash binary file will not include the hash table\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\ - --statistics print statistics about translations\n\ - -v, --verbose increase verbosity level\n\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); + printf (_("\ + --statistics print statistics about translations\n")); + printf (_("\ + -v, --verbose increase verbosity level\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); } diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index d143401d6..b4181debc 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -406,7 +406,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]\n\ "), program_name); @@ -417,26 +416,25 @@ Extracts all messages of a translation catalog that match a given pattern\n\ or belong to some given source files.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE input PO file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If no input file is given or if it is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE input PO file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); /* xgettext: no-wrap */ printf (_("\ @@ -469,29 +467,38 @@ expressions if -E is given, or fixed strings if -F is given.\n\ -i, --ignore-case ignore case distinctions\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - --no-escape do not use C escapes in output (default)\n\ - --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - --indent indented output style\n\ - --no-location suppress '#: filename:line' lines\n\ - --add-location preserve '#: filename:line' lines (default)\n\ - --strict strict Uniforum output style\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + --indent indented output style\n")); + printf (_("\ + --no-location suppress '#: filename:line' lines\n")); + printf (_("\ + --add-location preserve '#: filename:line' lines (default)\n")); + printf (_("\ + --strict strict Uniforum output style\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - --sort-output generate sorted output\n\ - --sort-by-file sort output by file location\n\ -")); + the output page width, into several lines\n")); + printf (_("\ + --sort-output generate sorted output\n")); + printf (_("\ + --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index f04dc281d..6abb690f7 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -326,7 +326,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION]\n\ "), program_name); @@ -337,43 +336,43 @@ Creates a new PO file, initializing the meta information with values from the\n\ user's environment.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - -i, --input=INPUTFILE input POT file\n\ +Input file location:\n")); + printf (_("\ + -i, --input=INPUTFILE input POT file\n")); + printf (_("\ If no input file is given, the current directory is searched for the POT file.\n\ -If it is -, standard input is read.\n\ -")); +If it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified PO file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified PO file\n")); + printf (_("\ If no output file is given, it depends on the --locale option or the user's\n\ -locale setting. If it is -, the results are written to standard output.\n\ -")); +locale setting. If it is -, the results are written to standard output.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -l, --locale=LL_CC set target locale\n\ - --no-translator assume the PO file is automatically generated\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + -l, --locale=LL_CC set target locale\n")); + printf (_("\ + --no-translator assume the PO file is automatically generated\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ -")); + the output page width, into several lines\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index 6198df402..96a4bd9f0 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -386,7 +386,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] def.po ref.pot\n\ "), program_name); @@ -404,84 +403,98 @@ comments and file positions will be preserved. Where an exact match\n\ cannot be found, fuzzy matching is used to produce better results.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - def.po translations referring to old sources\n\ - ref.pot references to new sources\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ +Input file location:\n")); + printf (_("\ + def.po translations referring to old sources\n")); + printf (_("\ + ref.pot references to new sources\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ -C, --compendium=FILE additional library of message translations,\n\ - may be specified more than once\n\ -")); + may be specified more than once\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Operation mode:\n\ +Operation mode:\n")); + printf (_("\ -U, --update update def.po,\n\ - do nothing if def.po already up to date\n\ -")); + do nothing if def.po already up to date\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location in update mode:\n\ -The result is written back to def.po.\n\ - --backup=CONTROL make a backup of def.po\n\ - --suffix=SUFFIX override the usual backup suffix\n\ +Output file location in update mode:\n")); + printf (_("\ +The result is written back to def.po.\n")); + printf (_("\ + --backup=CONTROL make a backup of def.po\n")); + printf (_("\ + --suffix=SUFFIX override the usual backup suffix\n")); + printf (_("\ The version control method may be selected via the --backup option or through\n\ the VERSION_CONTROL environment variable. Here are the values:\n\ none, off never make backups (even if --backup is given)\n\ numbered, t make numbered backups\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ - simple, never always make simple backups\n\ + simple, never always make simple backups\n")); + printf (_("\ The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n\ environment variable.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Operation modifiers:\n\ - -m, --multi-domain apply ref.pot to each of the domains in def.po\n\ - -N, --no-fuzzy-matching do not use fuzzy matching\n\ -")); +Operation modifiers:\n")); + printf (_("\ + -m, --multi-domain apply ref.pot to each of the domains in def.po\n")); + printf (_("\ + -N, --no-fuzzy-matching do not use fuzzy matching\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent indented output style\n\ - --no-location suppress '#: filename:line' lines\n\ - --add-location preserve '#: filename:line' lines (default)\n\ - --strict strict Uniforum output style\n\ - -w, --width=NUMBER set output page width\n\ +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent indented output style\n")); + printf (_("\ + --no-location suppress '#: filename:line' lines\n")); + printf (_("\ + --add-location preserve '#: filename:line' lines (default)\n")); + printf (_("\ + --strict strict Uniforum output style\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ - -v, --verbose increase verbosity level\n\ - -q, --quiet, --silent suppress progress indicators\n\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); + printf (_("\ + -v, --verbose increase verbosity level\n")); + printf (_("\ + -q, --quiet, --silent suppress progress indicators\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c index 38344760f..66176b5f3 100644 --- a/gettext-tools/src/msgunfmt.c +++ b/gettext-tools/src/msgunfmt.c @@ -316,82 +316,88 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [FILE]...\n\ "), program_name); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ Convert binary message catalog to Uniforum style .po file.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Operation mode:\n\ - -j, --java Java mode: input is a Java ResourceBundle class\n\ - --tcl Tcl mode: input is a tcl/msgcat .msg file\n\ -")); +Operation mode:\n")); + printf (_("\ + -j, --java Java mode: input is a Java ResourceBundle class\n")); + printf (_("\ + --tcl Tcl mode: input is a tcl/msgcat .msg file\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\ -")); +Input file location:\n")); + printf (_("\ + FILE ... input .mo files\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location in Java mode:\n\ - -r, --resource=RESOURCE resource name\n\ - -l, --locale=LOCALE locale name, either language or language_COUNTRY\n\ +Input file location in Java mode:\n")); + printf (_("\ + -r, --resource=RESOURCE resource name\n")); + printf (_("\ + -l, --locale=LOCALE locale name, either language or language_COUNTRY\n")); + printf (_("\ The class name is determined by appending the locale name to the resource name,\n\ separated with an underscore. The class is located using the CLASSPATH.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location in Tcl mode:\n\ - -l, --locale=LOCALE locale name, either language or language_COUNTRY\n\ - -d DIRECTORY base directory of .msg message catalogs\n\ +Input file location in Tcl mode:\n")); + printf (_("\ + -l, --locale=LOCALE locale name, either language or language_COUNTRY\n")); + printf (_("\ + -d DIRECTORY base directory of .msg message catalogs\n")); + printf (_("\ The -l and -d options are mandatory. The .msg file is located in the\n\ -specified directory.\n\ -")); +specified directory.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent write indented output style\n\ - --strict write strict uniforum style\n\ - -w, --width=NUMBER set output page width\n\ - --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ -")); +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent write indented output style\n")); + printf (_("\ + --strict write strict uniforum style\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ + --no-wrap do not break long message lines, longer than\n\ + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\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\ - -v, --verbose increase verbosity level\n\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); + printf (_("\ + -v, --verbose increase verbosity level\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c index 3bf1cbfc2..31a2ba424 100644 --- a/gettext-tools/src/msguniq.c +++ b/gettext-tools/src/msguniq.c @@ -276,7 +276,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]\n\ "), program_name); @@ -293,60 +292,70 @@ specified, they will be taken from the first translation. File positions\n\ will be cumulated. When using the --unique option, duplicates are discarded.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ -")); +Mandatory arguments to long options are mandatory for short options too.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE input PO file\n\ - -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n\ -If no input file is given or if it is -, standard input is read.\n\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE input PO file\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If no input file is given or if it is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -o, --output-file=FILE write output to specified file\n\ +Output file location:\n")); + printf (_("\ + -o, --output-file=FILE write output to specified file\n")); + printf (_("\ The results are written to standard output if no output file is specified\n\ -or if it is -.\n\ -")); +or if it is -.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Message selection:\n\ - -d, --repeated print only duplicates\n\ - -u, --unique print only unique messages, discard duplicates\n\ -")); +Message selection:\n")); + printf (_("\ + -d, --repeated print only duplicates\n")); + printf (_("\ + -u, --unique print only unique messages, discard duplicates\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -t, --to-code=NAME encoding for output\n\ - --use-first use first available translation for each\n\ - message, don't merge several translations\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent write the .po file using indented style\n\ - --no-location do not write '#: filename:line' lines\n\ - -n, --add-location generate '#: filename:line' lines (default)\n\ - --strict write out strict Uniforum conforming .po file\n\ - -w, --width=NUMBER set output page width\n\ - --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ -")); +Output details:\n")); + printf (_("\ + -t, --to-code=NAME encoding for output\n")); + printf (_("\ + --use-first use first available translation for each\n\ + message, don't merge several translations\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent write the .po file using indented style\n")); + printf (_("\ + --no-location do not write '#: filename:line' lines\n")); + printf (_("\ + -n, --add-location generate '#: filename:line' lines (default)\n")); + printf (_("\ + --strict write out strict Uniforum conforming .po file\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ + --no-wrap do not break long message lines, longer than\n\ + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index f11ee1b4d..d38ff4295 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -158,7 +158,6 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] URL FILE\n\ "), program_name); @@ -169,12 +168,12 @@ Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n\ the locally accessible FILE is used instead.\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout); diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index 1e26d1f81..5a74a7262 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -602,12 +602,10 @@ usage (int status) program_name); else { - /* xgettext: no-wrap */ printf (_("\ Usage: %s [OPTION] [INPUTFILE]...\n\ "), program_name); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ Extract translatable strings from given input files.\n\ ")); @@ -618,91 +616,114 @@ Mandatory arguments to long options are mandatory for short options too.\n\ Similarly for optional arguments.\n\ ")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file location:\n\ - INPUTFILE ... input files\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\ -")); +Input file location:\n")); + printf (_("\ + INPUTFILE ... input files\n")); + printf (_("\ + -f, --files-from=FILE get list of input files from FILE\n")); + printf (_("\ + -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n")); + printf (_("\ +If input file is -, standard input is read.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output file location:\n\ - -d, --default-domain=NAME use NAME.po for output (instead of messages.po)\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\ -")); +Output file location:\n")); + printf (_("\ + -d, --default-domain=NAME use NAME.po for output (instead of messages.po)\n")); + printf (_("\ + -o, --output=FILE write output to specified file\n")); + printf (_("\ + -p, --output-dir=DIR output files will be placed in directory DIR\n")); + printf (_("\ +If output file is -, output is written to standard output.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Choice of input file language:\n\ - -L, --language=NAME recognise the specified language\n\ - (C, C++, ObjectiveC, PO, Python, Lisp,\n\ - EmacsLisp, librep, Smalltalk, Java, awk,\n\ - YCP, Tcl, PHP, RST, Glade)\n\ - -C, --c++ shorthand for --language=C++\n\ -By default the language is guessed depending on the input file name extension.\n\ -")); +Choice of input file language:\n")); + printf (_("\ + -L, --language=NAME recognise the specified language\n\ + (C, C++, ObjectiveC, PO, Python, Lisp,\n\ + EmacsLisp, librep, Smalltalk, Java, awk, YCP,\n\ + Tcl, PHP, RST, Glade)\n")); + printf (_("\ + -C, --c++ shorthand for --language=C++\n")); + printf (_("\ +By default the language is guessed depending on the input file name extension.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Input file interpretation:\n\ - --from-code=NAME encoding of input files\n\ - (except for Python, Tcl, Glade)\n\ -By default the input files are assumed to be in ASCII.\n\ -")); +Input file interpretation:\n")); + printf (_("\ + --from-code=NAME encoding of input files\n\ + (except for Python, Tcl, Glade)\n")); + printf (_("\ +By default the input files are assumed to be in ASCII.\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Operation mode:\n\ - -j, --join-existing join messages with existing file\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\ -")); +Operation mode:\n")); + printf (_("\ + -j, --join-existing join messages with existing file\n")); + printf (_("\ + -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n")); + printf (_("\ + -c, --add-comments[=TAG] place comment block with TAG (or those\n\ + preceding keyword lines) in output file\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Language=C/C++ specific options:\n\ - -a, --extract-all extract all strings\n\ - -k, --keyword[=WORD] additional keyword to be looked for (without\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\ -")); +Language=C/C++ specific options:\n")); + printf (_("\ + -a, --extract-all extract all strings\n")); + printf (_("\ + -k, --keyword[=WORD] additional keyword to be looked for (without\n\ + WORD means not to use default keywords)\n")); + printf (_("\ + -T, --trigraphs understand ANSI C trigraphs for input\n")); + printf (_("\ + --debug more detailed formatstring recognition result\n")); printf ("\n"); - /* xgettext: no-wrap */ printf (_("\ -Output details:\n\ - -e, --no-escape do not use C escapes in output (default)\n\ - -E, --escape use C escapes in output, no extended chars\n\ - --force-po write PO file even if empty\n\ - -i, --indent write the .po file using indented style\n\ - --no-location do not write '#: filename:line' lines\n\ - -n, --add-location generate '#: filename:line' lines (default)\n\ - --strict write out strict Uniforum conforming .po file\n\ - -w, --width=NUMBER set output page width\n\ - --no-wrap do not break long message lines, longer than\n\ - the output page width, into several lines\n\ - -s, --sort-output generate sorted output\n\ - -F, --sort-by-file sort output by file location\n\ - --omit-header don't write header with `msgid \"\"' entry\n\ - --copyright-holder=STRING set copyright holder in output\n\ - --foreign-user omit FSF copyright in output for foreign user\n\ - --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\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\ -")); +Output details:\n")); + printf (_("\ + -e, --no-escape do not use C escapes in output (default)\n")); + printf (_("\ + -E, --escape use C escapes in output, no extended chars\n")); + printf (_("\ + --force-po write PO file even if empty\n")); + printf (_("\ + -i, --indent write the .po file using indented style\n")); + printf (_("\ + --no-location do not write '#: filename:line' lines\n")); + printf (_("\ + -n, --add-location generate '#: filename:line' lines (default)\n")); + printf (_("\ + --strict write out strict Uniforum conforming .po file\n")); + printf (_("\ + -w, --width=NUMBER set output page width\n")); + printf (_("\ + --no-wrap do not break long message lines, longer than\n\ + the output page width, into several lines\n")); + printf (_("\ + -s, --sort-output generate sorted output\n")); + printf (_("\ + -F, --sort-by-file sort output by file location\n")); + printf (_("\ + --omit-header don't write header with `msgid \"\"' entry\n")); + printf (_("\ + --copyright-holder=STRING set copyright holder in output\n")); + printf (_("\ + --foreign-user omit FSF copyright in output for foreign user\n")); + printf (_("\ + --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n")); + printf (_("\ + -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n")); + printf (_("\ + -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\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\ -")); +Informative output:\n")); + printf (_("\ + -h, --help display this help and exit\n")); + printf (_("\ + -V, --version output version information and exit\n")); printf ("\n"); fputs (_("Report bugs to .\n"), stdout);