summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-11-23 19:58:23 +0000
committerJim Meyering <jim@meyering.net>2001-11-23 19:58:23 +0000
commit909dc8c01d31c23ffe4e89f4ec68850b5d401662 (patch)
tree88e241a2b384bcd7a33a8f429283540e3d0d2f91
parent6f468fedb43dff9e6966ec73d3bb61a28d227484 (diff)
downloadcoreutils-909dc8c01d31c23ffe4e89f4ec68850b5d401662.tar.gz
coreutils-909dc8c01d31c23ffe4e89f4ec68850b5d401662.tar.bz2
coreutils-909dc8c01d31c23ffe4e89f4ec68850b5d401662.zip
Factor out some common strings to make translation easier.
Split usage strings so that --help and --version descriptions are alone in their own string. Likewise for the one that says: Mandatory arguments to long options are mandatory for short options too.
-rw-r--r--src/cat.c4
-rw-r--r--src/cksum.c6
-rw-r--r--src/comm.c6
-rw-r--r--src/csplit.c8
-rw-r--r--src/cut.c8
-rw-r--r--src/expand.c8
-rw-r--r--src/fmt.c8
-rw-r--r--src/fold.c10
-rw-r--r--src/head.c8
-rw-r--r--src/join.c4
-rw-r--r--src/md5sum.c8
-rw-r--r--src/nl.c8
-rw-r--r--src/od.c6
-rw-r--r--src/paste.c13
-rw-r--r--src/pr.c6
-rw-r--r--src/ptx.c12
-rw-r--r--src/sort.c8
-rw-r--r--src/split.c10
-rw-r--r--src/sum.c8
-rw-r--r--src/tac.c6
-rw-r--r--src/tail.c12
-rw-r--r--src/tr.c2
-rw-r--r--src/tsort.c6
-rw-r--r--src/unexpand.c8
-rw-r--r--src/uniq.c8
-rw-r--r--src/wc.c2
26 files changed, 167 insertions, 26 deletions
diff --git a/src/cat.c b/src/cat.c
index 9d96e4072..5bddfd039 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -108,8 +108,12 @@ Concatenate FILE(s), or standard input, to standard output.\n\
-T, --show-tabs display TAB characters as ^I\n\
-u (ignored)\n\
-v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
With no FILE, or when FILE is -, read standard input.\n\
"), stdout);
diff --git a/src/cksum.c b/src/cksum.c
index 95d4f5cd8..34a3b8133 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -282,12 +282,14 @@ Usage: %s [FILE]...\n\
or: %s [OPTION]\n\
"),
program_name, program_name);
- printf (_("\
+ fputs (_("\
Print CRC checksum and byte counts of each FILE.\n\
\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
-"));
+"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/src/comm.c b/src/comm.c
index e95dfe47c..dc05124d5 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -76,15 +76,17 @@ usage (int status)
Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n\
"),
program_name);
- printf (_("\
+ fputs (_("\
Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n\
\n\
-1 suppress lines unique to left file\n\
-2 suppress lines unique to right file\n\
-3 suppress lines that appear in both files\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
-"));
+"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/src/csplit.c b/src/csplit.c
index adea98e63..3af18c928 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1500,7 +1500,11 @@ Usage: %s [OPTION]... FILE PATTERN...\n\
Output pieces of FILE separated by PATTERN(s) to files `xx01', `xx02', ...,\n\
and output byte counts of each piece to standard output.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-b, --suffix-format=FORMAT use sprintf FORMAT instead of %d\n\
-f, --prefix=PREFIX use PREFIX instead of `xx'\n\
-k, --keep-files do not remove output files on errors\n\
@@ -1509,8 +1513,12 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-n, --digits=DIGITS use specified number of digits instead of 2\n\
-s, --quiet, --silent do not print counts of output file sizes\n\
-z, --elide-empty-files remove empty output files\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
Read standard input if FILE is -. Each PATTERN may be:\n\
"), stdout);
diff --git a/src/cut.c b/src/cut.c
index f8e7fe252..206bbd293 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -171,7 +171,11 @@ Usage: %s [OPTION]... [FILE]...\n\
fputs (_("\
Print selected parts of lines from each FILE to standard output.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-b, --bytes=LIST output only these bytes\n\
-c, --characters=LIST output only these characters\n\
-d, --delimiter=DELIM use DELIM instead of TAB for field delimiter\n\
@@ -186,11 +190,13 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-s, --only-delimited do not print lines not containing delimiters\n\
--output-delimiter=STRING use STRING as the output delimiter\n\
the default is to use the input delimiter\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
-\n\
"), stdout);
fputs (_("\
+\n\
Use one, and only one of -b, -c or -f. Each LIST is made up of one\n\
range, or many ranges separated by commas. Each range is one of:\n\
\n\
diff --git a/src/expand.c b/src/expand.c
index 32749ce3e..38624c7e7 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -114,14 +114,22 @@ Usage: %s [OPTION]... [FILE]...\n\
Convert tabs in each FILE to spaces, writing to standard output.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-i, --initial do not convert TABs after non whitespace\n\
-t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n\
"), stdout);
fputs (_("\
-t, --tabs=LIST use comma separated list of explicit tab positions\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be used.\n\
"), stdout);
diff --git a/src/fmt.c b/src/fmt.c
index 254ac990c..d9aefac27 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -273,7 +273,11 @@ usage (int status)
Reformat each paragraph in the FILE(s), writing to standard output.\n\
If no FILE or if FILE is `-', read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-c, --crown-margin preserve indentation of first two lines\n\
-p, --prefix=STRING combine only lines having STRING as prefix\n\
-s, --split-only split long lines, but do not refill\n\
@@ -283,8 +287,12 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-t, --tagged-paragraph indentation of first line different from second\n\
-u, --uniform-spacing one space between words, two after sentences\n\
-w, --width=NUMBER maximum line width (default of 75 columns)\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
In -wNUMBER, the letter `w' may be omitted.\n"),
stdout);
diff --git a/src/fold.c b/src/fold.c
index c38679741..d2503a95d 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -67,17 +67,23 @@ usage (int status)
Usage: %s [OPTION]... [FILE]...\n\
"),
program_name);
- printf (_("\
+ fputs (_("\
Wrap input lines in each FILE (standard input by default), writing to\n\
standard output.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-b, --bytes count bytes rather than columns\n\
-s, --spaces break at spaces\n\
-w, --width=WIDTH use WIDTH columns instead of 80\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
-"));
+"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/src/head.c b/src/head.c
index 3a8049351..85e53b7b3 100644
--- a/src/head.c
+++ b/src/head.c
@@ -90,15 +90,23 @@ Print first 10 lines of each FILE to standard output.\n\
With more than one FILE, precede each with a header giving the file name.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-c, --bytes=SIZE print first SIZE bytes\n\
-n, --lines=NUMBER print first NUMBER lines instead of first 10\n\
"), stdout);
fputs (_("\
-q, --quiet, --silent never print headers giving file names\n\
-v, --verbose always print headers giving file names\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\
If -VALUE is used as first OPTION, read -c VALUE when one of\n\
diff --git a/src/join.c b/src/join.c
index 7a5797c81..aebecf666 100644
--- a/src/join.c
+++ b/src/join.c
@@ -167,8 +167,12 @@ by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n\
-v SIDE like -a SIDE, but suppress joined output lines\n\
-1 FIELD join on this FIELD of file 1\n\
-2 FIELD join on this FIELD of file 2\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
"), stdout);
fputs (_("\
diff --git a/src/md5sum.c b/src/md5sum.c
index 2771a1240..2014d89fd 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -139,15 +139,19 @@ With no FILE, or when FILE is -, read standard input.\n\
\n\
"),
DIGEST_TYPE_STRING (algorithm));
- printf (_("\
+ fputs (_("\
The following two options are useful only when verifying checksums:\n\
--status don't output anything, status code shows success\n\
-w, --warn warn about improperly formated checksum lines\n\
\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
-"));
+"), stdout);
printf (_("\
The sums are computed as described in %s. When checking, the input\n\
should be a former output of this program. The default mode is to print\n\
diff --git a/src/nl.c b/src/nl.c
index bb59458c3..a3706b969 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -181,7 +181,11 @@ Usage: %s [OPTION]... [FILE]...\n\
Write each FILE to standard output, with line numbers added.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-b, --body-numbering=STYLE use STYLE for numbering body lines\n\
-d, --section-delimiter=CC use CC for separating logical pages\n\
-f, --footer-numbering=STYLE use STYLE for numbering footer lines\n\
@@ -197,8 +201,12 @@ Mandatory arguments to long options are mandatory for short options too.\n\
fputs (_("\
-v, --first-page=NUMBER first line number on each logical page\n\
-w, --number-width=NUMBER use NUMBER columns for line numbers\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n\
two delimiter characters for separating logical pages, a missing\n\
diff --git a/src/od.c b/src/od.c
index a2798e6cb..a393eeba4 100644
--- a/src/od.c
+++ b/src/od.c
@@ -282,7 +282,11 @@ of FILE to standard output. With more than one FILE argument,\n\
concatenate them in the listed order to form the input.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-A, --address-radix=RADIX decide how file offsets are printed\n\
-j, --skip-bytes=BYTES skip BYTES input bytes first\n\
"), stdout);
@@ -297,6 +301,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
Pre-POSIX format specifications may be intermixed, they accumulate:\n\
-a same as -t a, select named characters\n\
diff --git a/src/paste.c b/src/paste.c
index 061750286..f8ef2ddb2 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -404,18 +404,27 @@ usage (int status)
Usage: %s [OPTION]... [FILE]...\n\
"),
program_name);
- printf (_("\
+ fputs (_("\
Write lines consisting of the sequentially corresponding lines from\n\
each FILE, separated by TABs, to standard output.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-d, --delimiters=LIST reuse characters from LIST instead of TABs\n\
-s, --serial paste one file at a time instead of in parallel\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ /* FIXME: add a couple of examples. */
+ fputs (_("\
\n\
-"));
+"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/src/pr.c b/src/pr.c
index a1c38a1fa..aaa14ff64 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -2755,7 +2755,11 @@ Usage: %s [OPTION]... [FILE]...\n\
fputs (_("\
Paginate or columnate FILE(s) for printing.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
+FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n\
begin [stop] printing with page FIRST_[LAST_]PAGE\n\
-COLUMN, --columns=COLUMN\n\
@@ -2842,6 +2846,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
set page width to PAGE_WIDTH (72) characters always,\n\
truncate lines, except -J option is set, no interference\n\
with -S or -s\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
"), stdout);
diff --git a/src/ptx.c b/src/ptx.c
index 9747e87a6..27a311736 100644
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -1863,7 +1863,11 @@ Usage: %s [OPTION]... [INPUT]... (without -G)\n\
fputs (_("\
Output a permuted index, including context, of the words in the input files.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-A, --auto-reference output automatically generated references\n\
-C, --copyright display Copyright and copying conditions\n\
-G, --traditional behave more like System V `ptx'\n\
@@ -1888,11 +1892,15 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-r, --references first field of each line is a reference\n\
-t, --typeset-mode - not implemented -\n\
-w, --width=NUMBER output width in columns, reference excluded\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
-With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n"),
- stdout);
+With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n\
+"), stdout);
}
exit (status);
}
diff --git a/src/sort.c b/src/sort.c
index 7ebb99ff9..f693cff2c 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -291,7 +291,11 @@ Write sorted concatenation of all FILE(s) to standard output.\n\
\n\
Ordering options:\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-b, --ignore-leading-blanks ignore leading blanks\n\
-d, --dictionary-order consider only blanks and alphanumeric characters\n\
-f, --ignore-case fold lower case to upper case characters\n\
@@ -325,11 +329,13 @@ Other options:\n\
-z, --zero-terminated end lines with 0 byte, not newline\n\
+POS1 [-POS2] start a key at POS1, end it before POS2 (origin 0)\n\
Warning: this option is obsolescent\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
-\n\
"), stdout);
fputs (_("\
+\n\
POS is F[.C][OPTS], where F is the field number and C the character position\n\
in the field, both counted from one with -k, from zero with the obsolescent\n\
form. OPTS is made up of one or more single-letter ordering options, which\n\
diff --git a/src/split.c b/src/split.c
index 5af540c6d..7ffa8417e 100644
--- a/src/split.c
+++ b/src/split.c
@@ -92,17 +92,23 @@ Usage: %s [OPTION] [INPUT [PREFIX]]\n\
Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n\
PREFIX is `x'. With no INPUT, or when INPUT is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-b, --bytes=SIZE put SIZE bytes per output file\n\
-C, --line-bytes=SIZE put at most SIZE bytes of lines per output file\n\
-l, --lines=NUMBER put NUMBER lines per output file\n\
-"), stdout);
- fputs (_("\
-NUMBER same as -l NUMBER\n\
--verbose print a diagnostic to standard error just\n\
before each output file is opened\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\
"), stdout);
diff --git a/src/sum.c b/src/sum.c
index 3e405bb51..342be7002 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -61,16 +61,20 @@ usage (int status)
Usage: %s [OPTION]... [FILE]...\n\
"),
program_name);
- printf (_("\
+ fputs (_("\
Print checksum and block counts for each FILE.\n\
\n\
-r defeat -s, use BSD sum algorithm, use 1K blocks\n\
-s, --sysv use System V sum algorithm, use 512 bytes blocks\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
With no FILE, or when FILE is -, read standard input.\n\
-"));
+"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/src/tac.c b/src/tac.c
index 62f673dd3..1f5668e52 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -132,12 +132,16 @@ Usage: %s [OPTION]... [FILE]...\n\
Write each FILE to standard output, last line first.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
- -b, --before attach the separator before instead of after\n\
"), stdout);
fputs (_("\
+ -b, --before attach the separator before instead of after\n\
-r, --regex interpret the separator as a regular expression\n\
-s, --separator=STRING use STRING as the separator instead of newline\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
"), stdout);
diff --git a/src/tail.c b/src/tail.c
index e474560de..41e51121a 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -243,13 +243,17 @@ Print the last %d lines of each FILE to standard output.\n\
With more than one FILE, precede each with a header giving the file name.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), DEFAULT_N_LINES);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
--retry keep trying to open a file even if it is\n\
inaccessible when tail starts or if it becomes\n\
inaccessible later -- useful only with -f\n\
-"), DEFAULT_N_LINES);
- fputs (_("\
-c, --bytes=N output the last N bytes\n\
+"), stdout);
+ fputs (_("\
-f, --follow[={name|descriptor}]\n\
output appended data as the file grows;\n\
-f, --follow, and --follow=descriptor are\n\
@@ -272,14 +276,14 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-q, --quiet, --silent never output headers giving file names\n\
-s, --sleep-interval=S with -f, each iteration lasts approximately S\n\
(default 1) seconds\n\
+ -v, --verbose always output headers giving file names\n\
"), stdout);
fputs (_("\
- -v, --verbose always output headers giving file names\n\
--help display this help and exit\n\
--version output version information and exit\n\
-\n\
"), stdout);
fputs (_("\
+\n\
If the first character of N (the number of bytes or lines) is a `+',\n\
print beginning with the Nth item from the start of each file, otherwise,\n\
print the last N items in the file. N may have a multiplier suffix:\n\
diff --git a/src/tr.c b/src/tr.c
index b67f1d84c..c166bcda8 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -336,6 +336,8 @@ writing to standard output.\n\
-d, --delete delete characters in SET1, do not translate\n\
-s, --squeeze-repeats replace sequence of characters with one\n\
-t, --truncate-set1 first truncate SET1 to length of SET2\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
"), stdout);
diff --git a/src/tsort.c b/src/tsort.c
index 8d40a28b3..1d60c182f 100644
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -99,9 +99,11 @@ Usage: %s [OPTION] [FILE]\n\
Write totally ordered list consistent with the partial ordering in FILE.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), program_name);
+ fputs (_("\
--help display this help and exit\n\
- --version output version information and exit\n"),
- program_name);
+ --version output version information and exit\n\
+"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
diff --git a/src/unexpand.c b/src/unexpand.c
index ed9b0e3f6..9bab4bc68 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -380,14 +380,20 @@ Usage: %s [OPTION]... [FILE]...\n\
Convert spaces in each FILE to tabs, writing to standard output.\n\
With no FILE, or when FILE is -, read standard input.\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
- -a, --all convert all whitespace, instead of initial whitespace\n\
"), stdout);
fputs (_("\
+ -a, --all convert all whitespace, instead of initial whitespace\n\
-t, --tabs=NUMBER have tabs NUMBER characters apart instead of 8\n\
-t, --tabs=LIST use comma separated list of explicit tab positions\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be used.\n\
"), stdout);
diff --git a/src/uniq.c b/src/uniq.c
index 82dbeb234..f81e51aee 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -138,7 +138,11 @@ Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
Discard all but one of successive identical lines from INPUT (or\n\
standard input), writing to OUTPUT (or standard output).\n\
\n\
+"), stdout);
+ fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
-c, --count prefix lines by the number of occurrences\n\
-d, --repeated only print duplicate lines\n\
"), stdout);
@@ -155,8 +159,12 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-w, --check-chars=N compare no more than N characters in lines\n\
-N same as -f N\n\
+N same as -s N (obsolescent; will be withdrawn)\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
+"), stdout);
+ fputs (_("\
\n\
A field is a run of whitespace, then non-whitespace characters.\n\
Fields are skipped before chars.\n\
diff --git a/src/wc.c b/src/wc.c
index f92f124a3..fe9c24873 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -136,6 +136,8 @@ read standard input.\n\
fputs (_("\
-L, --max-line-length print the length of the longest line\n\
-w, --words print the word counts\n\
+"), stdout);
+ fputs (_("\
--help display this help and exit\n\
--version output version information and exit\n\
"), stdout);