Hi,
Attached the promised batch of other string fixes.
The sixth patch removes brackets around the MMDD... part on the
second synopsis line of 'date'. They are unneeded, because the
first synopsis line already desscribes the possibility of having
zero arguments or only an option argument. Removing the brackets
makes it clearer what "or set the system date" refers to.
The equal signs in the eighth patch (to 'dd') are just a suggestion.
If not acceptable, then at least the "xM M" should move to the end
of the line; it is rather confusing to find it there out of order.
Maybe leave it out altogether?
In the thirteenth patch (to 'fmt'), maybe replace -DIGITS with
-WIDTH, as in the Info document? Or maybe deprecate the option, as
it is for 'fold'? Having one accept it and the other not seems odd.
Some of these synopsis changes may need to be made to the Info
documents too, I haven't systematically checked that.
Benno
>From 7c92e6ddd7e3341eba32ca7e5096b4f10bb4a46b Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Mon, 4 Aug 2008 22:11:47 +0200
Subject: [PATCH] who: Gettextize two forgotten strings.
---
src/who.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/who.c b/src/who.c
index 0bba912..94af8bf 100644
--- a/src/who.c
+++ b/src/who.c
@@ -427,7 +427,7 @@ print_user (const STRUCT_UTMP *utmp_ent, time_t boottime)
static void
print_boottime (const STRUCT_UTMP *utmp_ent)
{
- print_line (-1, "", ' ', -1, "system boot",
+ print_line (-1, "", ' ', -1, _("system boot"),
time_string (utmp_ent), "", "", "", "");
}
@@ -472,7 +472,7 @@ print_login (const STRUCT_UTMP *utmp_ent)
/* FIXME: add idle time? */
- print_line (-1, "LOGIN", ' ', sizeof utmp_ent->ut_line, utmp_ent->ut_line,
+ print_line (-1, _("LOGIN"), ' ', sizeof utmp_ent->ut_line, utmp_ent->ut_line,
time_string (utmp_ent), "", pidstr, comment, "");
free (comment);
}
--
1.5.6.4
>From 75706de0aae7d455af877f251564bba5906dbf51 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Mon, 4 Aug 2008 22:40:48 +0200
Subject: [PATCH] cp: Move a newline to make second message identical to others.
---
src/cp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/cp.c b/src/cp.c
index c768d1b..059f317 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -235,9 +235,9 @@ corresponding DEST file is made sparse as well. That is the behavior\n\
selected by --sparse=auto. Specify --sparse=always to create a sparse DEST\n\
file whenever the SOURCE file contains a long enough sequence of zero bytes.\n\
Use --sparse=never to inhibit creation of sparse files.\n\
-\n\
"), stdout);
fputs (_("\
+\n\
The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\
The version control method may be selected via the --backup option or through\n\
the VERSION_CONTROL environment variable. Here are the values:\n\
--
1.5.6.4
>From 310b52e5bdae2021836e95c0693bc11733b59f2a Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Mon, 4 Aug 2008 23:21:35 +0200
Subject: [PATCH] doc: Put the exitstatus paragraph in a better place.
* doc/coreutils.texi (tsort invocation): move two lines
---
doc/coreutils.texi | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index b47448f..3d18608 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -4624,6 +4624,8 @@ precedes @code{main}.
The only options are @option{--help} and @option{--version}. @xref{Common
options}.
[EMAIL PROTECTED]
+
@node tsort background
@section @command{tsort}: Background
@@ -4659,8 +4661,6 @@ Anyhow, that's where tsort came from. To solve an old problem with
the way the linker handled archive files, which has since been solved
in different ways.
[EMAIL PROTECTED]
-
@node ptx invocation
@section @command{ptx}: Produce permuted indexes
--
1.5.6.4
>From a776e8406a2be4d945110e5eac77f2d32d71b81f Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Mon, 4 Aug 2008 22:57:07 +0200
Subject: [PATCH] printenv: Say what it does when variables are specified.
---
src/printenv.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/printenv.c b/src/printenv.c
index b68fb21..ecb6593 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -58,7 +58,8 @@ usage (int status)
printf (_("\
Usage: %s [VARIABLE]...\n\
or: %s OPTION\n\
-If no environment VARIABLE specified, print them all.\n\
+Print the values of the specified environment VARIABLE(s).\n\
+If no VARIABLE is specified, print name and value pairs for them all.\n\
\n\
"),
program_name, program_name);
--
1.5.6.4
>From 32906d0864978535682615199cecb2686cf3c98c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Thu, 7 Aug 2008 00:01:16 +0200
Subject: [PATCH] date: Remove confusing and unneeded sentence from -help.
It makes it unclear what 'sequences' refers to,
and the -u option already says enough.
---
src/date.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/date.c b/src/date.c
index 9592bf8..3cfcc62 100644
--- a/src/date.c
+++ b/src/date.c
@@ -152,8 +152,7 @@ Display the current time in the given FORMAT, or set the system date.\n\
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\
\n\
-FORMAT controls the output. The only valid option for the second form\n\
-specifies Coordinated Universal Time. Interpreted sequences are:\n\
+FORMAT controls the output. Interpreted sequences are:\n\
\n\
%% a literal %\n\
%a locale's abbreviated weekday name (e.g., Sun)\n\
--
1.5.6.4
>From 845ea89409827e87f537db2f9ec8526dd65dffb2 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Thu, 7 Aug 2008 00:03:25 +0200
Subject: [PATCH] date: Remove unneeded brackets from synopsis.
Removal also makes the second part of the docstring clearer.
---
src/date.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/date.c b/src/date.c
index 3cfcc62..8813983 100644
--- a/src/date.c
+++ b/src/date.c
@@ -125,7 +125,7 @@ usage (int status)
{
printf (_("\
Usage: %s [OPTION]... [+FORMAT]\n\
- or: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n\
+ or: %s [-u|--utc|--universal] MMDDhhmm[[CC]YY][.ss]\n\
"),
program_name, program_name);
fputs (_("\
--
1.5.6.4
>From 528b37e0cc4c16c933b4fc37834c88b598348eba Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Thu, 7 Aug 2008 00:37:27 +0200
Subject: [PATCH] doc: Remove stray word from date's field width description.
---
doc/coreutils.texi | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index a934b2a..a0c4677 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -13080,7 +13080,7 @@ date +%_d/%_m -d "Feb 1"
As a @acronym{GNU} extension, you can specify the field width
(after any flag, if present) as a decimal number. If the natural size of the
-output is of the field has less than the specified number of characters,
+output of the field has less than the specified number of characters,
the result is written right adjusted and padded to the given
size. For example, @samp{%9B} prints the right adjusted month name in
a field of width 9.
--
1.5.6.4
>From 1a10530f4f0bbcb18b0d1fbcf385d5a3271435a3 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Fri, 8 Aug 2008 13:33:20 +0200
Subject: [PATCH] dd: Clarify meaning of multiplication factors; put xM in order.
---
src/dd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dd.c b/src/dd.c
index 8c9400b..5ef85ba 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -475,8 +475,8 @@ Copy a file, converting and formatting according to the operands.\n\
fputs (_("\
\n\
BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n\
-xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n\
-GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n\
+c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M\n\
+GB =1000*1000*1000, G =1024*1024*1024, and so on for T, P, E, Z, Y.\n\
\n\
Each CONV symbol may be:\n\
\n\
--
1.5.6.4
>From 1038d3b95b57b7c6cb402c468810a01f3756d369 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Fri, 8 Aug 2008 22:58:51 +0200
Subject: [PATCH] echo: Gettextize the alternative option description too.
---
src/echo.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/echo.c b/src/echo.c
index 11e648e..51fa15a 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -67,12 +67,12 @@ Echo the STRING(s) to standard output.\n\
-n do not output the trailing newline\n\
"), stdout);
fputs (_(DEFAULT_ECHO_TO_XPG
- ? "\
+ ? N_("\
-e enable interpretation of backslash escapes (default)\n\
- -E disable interpretation of backslash escapes\n"
- : "\
+ -E disable interpretation of backslash escapes\n")
+ : N_("\
-e enable interpretation of backslash escapes\n\
- -E disable interpretation of backslash escapes (default)\n"),
+ -E disable interpretation of backslash escapes (default)\n")),
stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
--
1.5.6.4
>From 881b66cd585e8e3562cc0ea8ee3553665d1a2257 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sat, 9 Aug 2008 14:52:54 +0200
Subject: [PATCH] factor: Remove the duplicate docstring; use the more detailed one.
---
src/factor.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/factor.c b/src/factor.c
index 8a1acf8..e4ac599 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -530,7 +530,8 @@ Usage: %s [NUMBER]...\n\
"),
program_name, program_name);
fputs (_("\
-Print the prime factors of each NUMBER.\n\
+Print the prime factors of each specified integer NUMBER. If no arguments\n\
+are specified on the command line, they are read from standard input.\n\
\n\
"), stdout);
fputs (_("\
@@ -539,11 +540,6 @@ Print the prime factors of each NUMBER.\n\
stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
- fputs (_("\
-\n\
-Print the prime factors of all specified integer NUMBERs. If no arguments\n\
-are specified on the command line, they are read from standard input.\n\
-"), stdout);
emit_bug_reporting_address ();
}
exit (status);
--
1.5.6.4
>From 924893170c6d5e25d4f526ea0c1f2607930d7cee Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sat, 9 Aug 2008 14:31:32 +0200
Subject: [PATCH] doc: The quote character for expr is '+', not 'quote'.
---
doc/coreutils.texi | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index a0c4677..9fe4c25 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -11282,7 +11282,7 @@ expr index abcdef cz
@result{} 3
expr index index a
@error{} expr: syntax error
-expr index quote index a
+expr index + index a
@result{} 0
@end example
--
1.5.6.4
>From 6eb1460029b7c89657320c738d37311dbd16097c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Fri, 8 Aug 2008 23:15:52 +0200
Subject: [PATCH] echo: Adjust description of \c to what it actually does.
---
src/echo.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/echo.c b/src/echo.c
index 51fa15a..23b4018 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -86,7 +86,7 @@ If -e is in effect, the following sequences are recognized:\n\
\\b backspace\n\
"), stdout);
fputs (_("\
- \\c suppress trailing newline\n\
+ \\c produce no further output\n\
\\f form feed\n\
\\n new line\n\
\\r carriage return\n\
--
1.5.6.4
>From b22a05fb188d4eca0acd646fb81087a4367e5875 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sat, 9 Aug 2008 15:43:32 +0200
Subject: [PATCH] fmt: Remove the 'no file' sentence; the standard phrase is given below.
Replace the sentence with a more useful explanation of -DIGITS.
---
src/fmt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/fmt.c b/src/fmt.c
index c1f6b22..696fcfd 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -269,7 +269,7 @@ usage (int status)
printf (_("Usage: %s [-DIGITS] [OPTION]... [FILE]...\n"), program_name);
fputs (_("\
Reformat each paragraph in the FILE(s), writing to standard output.\n\
-If no FILE or if FILE is `-', read standard input.\n\
+The option -DIGITS is an abbreviated form of --width=DIGITS.\n\
\n\
"), stdout);
fputs (_("\
--
1.5.6.4
>From c8fbdb7c9afa2042501f95187743abc6fab96bdf Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sat, 9 Aug 2008 23:01:12 +0200
Subject: [PATCH] id: Gettextize a few missed tiny strings.
---
src/id.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/id.c b/src/id.c
index 89957f7..156b066 100644
--- a/src/id.c
+++ b/src/id.c
@@ -265,19 +265,19 @@ print_full_info (const char *username)
struct passwd *pwd;
struct group *grp;
- printf ("uid=%lu", (unsigned long int) ruid);
+ printf (_("uid=%lu"), (unsigned long int) ruid);
pwd = getpwuid (ruid);
if (pwd)
printf ("(%s)", pwd->pw_name);
- printf (" gid=%lu", (unsigned long int) rgid);
+ printf (_(" gid=%lu"), (unsigned long int) rgid);
grp = getgrgid (rgid);
if (grp)
printf ("(%s)", grp->gr_name);
if (euid != ruid)
{
- printf (" euid=%lu", (unsigned long int) euid);
+ printf (_(" euid=%lu"), (unsigned long int) euid);
pwd = getpwuid (euid);
if (pwd)
printf ("(%s)", pwd->pw_name);
@@ -285,7 +285,7 @@ print_full_info (const char *username)
if (egid != rgid)
{
- printf (" egid=%lu", (unsigned long int) egid);
+ printf (_(" egid=%lu"), (unsigned long int) egid);
grp = getgrgid (egid);
if (grp)
printf ("(%s)", grp->gr_name);
@@ -328,5 +328,5 @@ print_full_info (const char *username)
}
#endif /* HAVE_GETGROUPS */
if (context != NULL)
- printf (" context=%s", context);
+ printf (_(" context=%s"), context);
}
--
1.5.6.4
>From 4f91f3dfe205a1783bfe6547cbb41f35a2b6f198 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sat, 9 Aug 2008 22:44:16 +0200
Subject: [PATCH] id: Remove superfluous condition test; it is caught at -Z above.
---
src/id.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/src/id.c b/src/id.c
index 14b558d..89957f7 100644
--- a/src/id.c
+++ b/src/id.c
@@ -173,11 +173,6 @@ main (int argc, char **argv)
error (EXIT_FAILURE, 0,
_("cannot print security context when user specified"));
- if (just_context && !selinux_enabled)
- error (EXIT_FAILURE, 0, _("\
-cannot display context when selinux not enabled or when displaying the id\n\
-of a different user"));
-
/* If we are on a selinux-enabled kernel and no user is specified,
get our context. Otherwise, leave the context variable alone -
it has been initialized known invalid value and will be not
--
1.5.6.4
>From 64474fc999a444b5e15315165fd811bfff917bd0 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sun, 10 Aug 2008 19:39:38 +0200
Subject: [PATCH] groups: Let synopsis show that the command allows multiple usernames.
Also make the docstring say so.
---
src/groups.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/groups.c b/src/groups.c
index ef96400..c71667b 100644
--- a/src/groups.c
+++ b/src/groups.c
@@ -52,10 +52,10 @@ usage (int status)
program_name);
else
{
- printf (_("Usage: %s [OPTION]... [USERNAME]\n"), program_name);
+ printf (_("Usage: %s [OPTION]... [USERNAME]...\n"), program_name);
fputs (_("\
-Print information for USERNAME or, if no USERNAME is specified,\n\
-the current process (which is different if the groups database has changed).\n"),
+Print group memberships for each USERNAME or, if no USERNAME is specified, for\n\
+the current process (which may differ if the groups database has changed).\n"),
stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
--
1.5.6.4
>From b78cd53dff3c8f18615cc09e69bbd9323bcbed70 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[EMAIL PROTECTED]>
Date: Sun, 10 Aug 2008 20:04:40 +0200
Subject: [PATCH] kill: Micro grammar nit in description of SIGNAL.
---
src/kill.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/kill.c b/src/kill.c
index 1fd4958..52cf5da 100644
--- a/src/kill.c
+++ b/src/kill.c
@@ -107,7 +107,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\
SIGNAL may be a signal name like `HUP', or a signal number like `1',\n\
-or an exit status of a process terminated by a signal.\n\
+or the exit status of a process terminated by a signal.\n\
PID is an integer; if negative it identifies a process group.\n\
"), stdout);
printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
--
1.5.6.4
_______________________________________________
Bug-coreutils mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-coreutils
