Hi,
The style of some of the lines printed for 'tar --help' appears to
have changed: they begin with an uppercase letter, instead of a
lowercase as most of the others. Attached patch corrects this to a
consistent lowercase. It also removes a few periods, and chops up
some overlong lines.
If however all lines of the help message are intended to begin with
an uppercase letter, then they apparently are meant to be sentences
and should all end in a period. If desired, I can make that patch
too.
The small secondary patch adds a word that was inserted into similar
error messages but not this one.
Benno
--- src/tar.c.orig 2006-03-01 12:45:05.000000000 +0100
+++ src/tar.c 2006-03-08 19:47:41.000000000 +0100
@@ -370,7 +370,7 @@
{"delete", DELETE_OPTION, 0, 0,
N_("delete from the archive (not on mag tapes!)"), GRID+1 },
{"test-label", TEST_LABEL_OPTION, NULL, 0,
- N_("Test archive volume label and exit"), GRID+1 },
+ N_("test the archive volume label and exit"), GRID+1 },
#undef GRID
#define GRID 20
@@ -386,7 +386,11 @@
{"ignore-failed-read", IGNORE_FAILED_READ_OPTION, 0, 0,
N_("do not exit with nonzero on unreadable files"), GRID+1 },
{"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL,
- N_("process only the NUMBERth occurrence of each file in the archive. This option is valid only in conjunction with one of the subcommands --delete, --diff, --extract or --list and when a list of files is given either on the command line or via -T option. NUMBER defaults to 1."), GRID+1 },
+ N_("process only the NUMBERth occurrence of each file in the archive;"
+ " this option is valid only in conjunction with one of the subcommands"
+ " --delete, --diff, --extract or --list and when a list of files"
+ " is given either on the command line or via the -T option;"
+ " NUMBER defaults to 1"), GRID+1 },
{"seek", 'n', NULL, 0,
N_("archive is seekable"), GRID+1 },
#undef GRID
@@ -462,9 +466,10 @@
{"preserve", PRESERVE_OPTION, 0, 0,
N_("same as both -p and -s"), GRID+1 },
{"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,
- N_("Delay setting modification times and permissions of extracted directories until the end of extraction."), GRID+1 },
+ N_("delay setting modification times and permissions of extracted"
+ " directories until the end of extraction"), GRID+1 },
{"no-delay-directory-restore", NO_DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,
- N_("Cancel the effect of --delay-directory-restore option."), GRID+1 },
+ N_("cancel the effect of --delay-directory-restore option"), GRID+1 },
#undef GRID
#define GRID 60
@@ -525,7 +530,7 @@
N_("Archive format selection:"), GRID },
{"format", 'H', N_("FORMAT"), 0,
- N_("create archive of the given format."), GRID+1 },
+ N_("create archive of the given format"), GRID+1 },
{NULL, 0, NULL, 0, N_("FORMAT is one of the following:"), GRID+2 },
{" v7", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("old V7 tar format"),
@@ -545,10 +550,10 @@
{"portability", 0, 0, OPTION_ALIAS, NULL, GRID+8 },
{"posix", POSIX_OPTION, 0, 0,
N_("same as --format=posix"), GRID+8 },
- {"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value], ...]"), 0,
+ {"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value]]..."), 0,
N_("control pax keywords"), GRID+8 },
{"label", 'V', N_("TEXT"), 0,
- N_("create archive with volume name TEXT. At list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 },
+ N_("create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 },
{"bzip2", 'j', 0, 0,
N_("filter the archive through bzip2"), GRID+8 },
{"gzip", 'z', 0, 0,
@@ -649,18 +654,18 @@
N_("ask for confirmation for every action"), GRID+1 },
{"confirmation", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"show-defaults", SHOW_DEFAULTS_OPTION, 0, 0,
- N_("Show tar defaults"), GRID+1 },
+ N_("show tar defaults"), GRID+1 },
{"show-omitted-dirs", SHOW_OMITTED_DIRS_OPTION, 0, 0,
- N_("When listing or extracting, list each directory that does not match search criteria"), GRID+1 },
+ N_("when listing or extracting, list each directory that does not match search criteria"), GRID+1 },
{"show-stored-names", SHOW_STORED_NAMES_OPTION, 0, 0,
- N_("When creating archive in verbose mode, list member names as stored in the archive"),
+ N_("when creating archive in verbose mode, list member names as stored in the archive"),
GRID+1 },
{"quoting-style", QUOTING_STYLE_OPTION, N_("STYLE"), 0,
- N_("Set name quoting style. See below for valid STYLE values."), GRID+1 },
+ N_("set name quoting style; see below for valid STYLE values"), GRID+1 },
{"quote-chars", QUOTE_CHARS_OPTION, N_("STRING"), 0,
- N_("Additionally quote characters from STRING"), GRID+1 },
+ N_("additionally quote characters from STRING"), GRID+1 },
{"no-quote-chars", NO_QUOTE_CHARS_OPTION, N_("STRING"), 0,
- N_("Disable quoting for characters from STRING"), GRID+1 },
+ N_("disable quoting for characters from STRING"), GRID+1 },
#undef GRID
#define GRID 110
@@ -668,7 +673,7 @@
N_("Compatibility options:"), GRID },
{NULL, 'o', 0, 0,
- N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), GRID+1 },
+ N_("when creating, same as --old-archive; when extracting, same as --no-same-owner"), GRID+1 },
#undef GRID
#define GRID 120
@@ -676,15 +681,15 @@
N_("Other options:"), GRID },
{"restrict", RESTRICT_OPTION, 0, 0,
- N_("Restrict use of some potentially harmful options"), -1 },
+ N_("disable use of some potentially harmful options"), -1 },
- {"help", '?', 0, 0, N_("Give this help list"), -1},
- {"usage", USAGE_OPTION, 0, 0, N_("Give a short usage message"), -1},
- {"version", VERSION_OPTION, 0, 0, N_("Print program version"), -1},
+ {"help", '?', 0, 0, N_("give this help list"), -1},
+ {"usage", USAGE_OPTION, 0, 0, N_("give a short usage message"), -1},
+ {"version", VERSION_OPTION, 0, 0, N_("print program version"), -1},
/* FIXME -V (--label) conflicts with the default short option for
--version */
{"HANG", HANG_OPTION, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
- N_("Hang for SECS seconds (default 3600)"), 0},
+ N_("hang for SECS seconds (default 3600)"), 0},
#undef GRID
{0, 0, 0, 0, 0, 0}
--- lib/argp-parse.c.orig 2006-01-20 15:06:55.000000000 +0100
+++ lib/argp-parse.c 2006-03-08 19:57:45.000000000 +0100
@@ -79,11 +79,11 @@
static const struct argp_option argp_default_options[] =
{
- {"help", '?', 0, 0, N_("Give this help list"), -1},
- {"usage", OPT_USAGE, 0, 0, N_("Give a short usage message"), 0},
- {"program-name",OPT_PROGNAME,N_("NAME"), OPTION_HIDDEN, N_("Set the program name"), 0},
+ {"help", '?', 0, 0, N_("give this help list"), -1},
+ {"usage", OPT_USAGE, 0, 0, N_("give a short usage message"), 0},
+ {"program-name",OPT_PROGNAME,N_("NAME"), OPTION_HIDDEN, N_("set the program name"), 0},
{"HANG", OPT_HANG, N_("SECS"), OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
- N_("Hang for SECS seconds (default 3600)"), 0},
+ N_("hang for SECS seconds (default 3600)"), 0},
{NULL, 0, 0, 0, NULL, 0}
};
@@ -140,7 +140,7 @@
static const struct argp_option argp_version_options[] =
{
- {"version", 'V', 0, 0, N_("Print program version"), -1},
+ {"version", 'V', 0, 0, N_("print program version"), -1},
{NULL, 0, 0, 0, NULL, 0}
};
--- lib/paxerror.c.orig 2005-12-01 13:39:47.000000000 +0100
+++ lib/paxerror.c 2006-03-08 20:09:32.000000000 +0100
@@ -208,8 +208,8 @@
char buf[UINTMAX_STRSIZE_BOUND];
int e = errno;
FATAL_ERROR ((0, e,
- ngettext ("%s: Read error at byte %s, reading %lu byte",
- "%s: Read error at byte %s, reading %lu bytes",
+ ngettext ("%s: Read error at byte %s, while reading %lu byte",
+ "%s: Read error at byte %s, while reading %lu bytes",
size),
quotearg_colon (name), STRINGIFY_BIGINT (offset, buf),
(unsigned long) size));
_______________________________________________
Bug-tar mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-tar
