From 8f730b8a46d6e29c053da6205ba9db0253be01db Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 3 Dec 2001 16:07:50 +0000 Subject: (usage): Don't split translatable strings in the middle of a sentence. --- src/od.c | 13 ++++++++----- src/tail.c | 13 ++++++++++--- src/tr.c | 10 +++++++--- 3 files changed, 25 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/od.c b/src/od.c index 44c1e31ab..ad73bb252 100644 --- a/src/od.c +++ b/src/od.c @@ -334,21 +334,24 @@ TYPE is made up of one or more of these specifications:\n\ o[SIZE] octal, SIZE bytes per integer\n\ u[SIZE] unsigned decimal, SIZE bytes per integer\n\ x[SIZE] hexadecimal, SIZE bytes per integer\n\ +"), stdout); + fputs (_("\ \n\ SIZE is a number. For TYPE in doux, SIZE may also be C for\n\ sizeof(char), S for sizeof(short), I for sizeof(int) or L for\n\ -"), stdout); - fputs (_("\ sizeof(long). If TYPE is f, SIZE may also be F for sizeof(float), D\n\ for sizeof(double) or L for sizeof(long double).\n\ +"), stdout); + fputs (_("\ \n\ RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n\ BYTES is hexadecimal with 0x or 0X prefix, it is multiplied by 512\n\ -"), stdout); - fputs (_("\ with b suffix, by 1024 with k and by 1048576 with m. Adding a z suffix to\n\ any type adds a display of printable characters to the end of each line\n\ -of output. -s without a number implies 3. -w without a number implies 32.\n\ +of output. \ +"), stdout); + fputs (_("\ +-s without a number implies 3. -w without a number implies 32.\n\ By default, od uses -A o -t d2 -w 16.\n\ "), stdout); puts (_("\nReport bugs to .")); diff --git a/src/tail.c b/src/tail.c index 04a5e6e89..da757ad15 100644 --- a/src/tail.c +++ b/src/tail.c @@ -285,19 +285,26 @@ Mandatory arguments to long options are mandatory for short options too.\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\ -b for 512, k for 1024, m for 1048576 (1 Meg). A first OPTION of -VALUE\n\ +b for 512, k for 1024, m for 1048576 (1 Meg). \ +"), stdout); + fputs (_("\ +A first OPTION of -VALUE\n\ or +VALUE is treated like -n VALUE or -n +VALUE unless VALUE has one of\n\ the [bkm] suffix multipliers, in which case it is treated like -c VALUE\n\ +or -c +VALUE. \ "), stdout); fputs (_("\ -or -c +VALUE. Warning: a first option of +VALUE is obsolescent, and support\n\ +Warning: a first option of +VALUE is obsolescent, and support\n\ for it will be withdrawn.\n\ \n\ +"), stdout); + fputs (_("\ With --follow (-f), tail defaults to following the file descriptor, which\n\ means that even if a tail'ed file is renamed, tail will continue to track\n\ -its end. This default behavior is not desirable when you really want to\n\ +its end. \ "), stdout); fputs (_("\ +This default behavior is not desirable when you really want to\n\ track the actual name of the file, not the file descriptor (e.g., log\n\ rotation). Use --follow=name in that case. That causes tail to track the\n\ named file by reopening it periodically to see if it has been removed and\n\ diff --git a/src/tr.c b/src/tr.c index a39e50fa8..deaf576fe 100644 --- a/src/tr.c +++ b/src/tr.c @@ -378,12 +378,16 @@ Interpreted sequences are:\n\ \n\ Translation occurs if -d is not given and both SET1 and SET2 appear.\n\ -t may be used only when translating. SET2 is extended to length of\n\ -SET1 by repeating its last character as necessary. Excess characters\n\ -of SET2 are ignored. Only [:lower:] and [:upper:] are guaranteed to\n\ +SET1 by repeating its last character as necessary. \ "), stdout); fputs (_("\ +Excess characters\n\ +of SET2 are ignored. Only [:lower:] and [:upper:] are guaranteed to\n\ expand in ascending order; used in SET2 while translating, they may\n\ -only be used in pairs to specify case conversion. -s uses SET1 if not\n\ +only be used in pairs to specify case conversion. \ +"), stdout); + fputs (_("\ +-s uses SET1 if not\n\ translating nor deleting; else squeezing uses SET2 and occurs after\n\ translation or deletion.\n\ "), stdout); -- cgit v1.2.3-54-g00ecf