diff options
| author | Benno Schulenberg | 2011-01-31 22:35:44 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-02-16 15:46:38 +0100 |
| commit | e8ab5ce3d0ea7e63194bf96964c4dc637b998aeb (patch) | |
| tree | 8bd60162296113b294e6345a2d9081159e6566ae /login-utils | |
| parent | textual: fix three typos in message strings and improve consistency (diff) | |
| download | kernel-qcow2-util-linux-e8ab5ce3d0ea7e63194bf96964c4dc637b998aeb.tar.gz kernel-qcow2-util-linux-e8ab5ce3d0ea7e63194bf96964c4dc637b998aeb.tar.xz kernel-qcow2-util-linux-e8ab5ce3d0ea7e63194bf96964c4dc637b998aeb.zip | |
textual: improve the wording of some error and usage messages
[kzak@redhat.com: - cleanup lscpu(1) usage text
- use <disk> rather than <device> in partx(8)
usage text]
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils')
| -rw-r--r-- | login-utils/chsh.c | 6 | ||||
| -rw-r--r-- | login-utils/ttymsg.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/login-utils/chsh.c b/login-utils/chsh.c index fe610726f..4795bdd58 100644 --- a/login-utils/chsh.c +++ b/login-utils/chsh.c @@ -87,9 +87,9 @@ static boolean get_shell_list (char *shell); static void __attribute__((__noreturn__)) usage (FILE *fp) { fprintf (fp, - _("Usage: %s [ -s shell ] [ --list-shells ] " - "[ --help ] [ --version ]\n" - " [ username ]\n"), whoami); + _("Usage: %1$s [-s shell] [username]\n" + " or: %1$s (--list-shells | --help | --version)\n"), + whoami); exit(fp == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/login-utils/ttymsg.c b/login-utils/ttymsg.c index 92282c127..a4df59e6c 100644 --- a/login-utils/ttymsg.c +++ b/login-utils/ttymsg.c @@ -171,7 +171,8 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) { if (forked) _exit(1); if (strlen(strerror(errno)) > 1000) - (void) sprintf(errbuf, _("%s: BAD ERROR"), device); + (void) sprintf(errbuf, _("%s: BAD ERROR, message is " + "far too long"), device); else { errsv = errno; (void) sprintf(errbuf, "%s: %s", device, |