[PATCH 01/10] textual: use angular brackets around each individual argument

[PATCH 01/10] textual: use angular brackets around each individual argument

[Benno Schulenberg]

In usage texts each word that is an argument should be marked
separately with angular brackets.  Also add a translator comment.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/renice.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index 100f6a5..c96e39a 100644
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -66,7 +66,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	fputs(_(" -n, --priority <num>   specify the nice increment value\n"), out);
 	fputs(_(" -p, --pid <id>         interpret argument as process ID (default)\n"), out);
 	fputs(_(" -g, --pgrp <id>        interpret argument as process group ID\n"), out);
-	fputs(_(" -u, --user <name|id>   interpret argument as username or user ID\n"), out);
+	fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out);
 	fputs(USAGE_SEPARATOR, out);
 	fputs(USAGE_HELP, out);
 	fputs(USAGE_VERSION, out);
@@ -176,6 +176,8 @@ int main(int argc, char **argv)
 		} else {
 			who = strtol(*argv, &endptr, 10);
 			if (who < 0 || *endptr) {
+				/* TRANSLATORS: The first %s is one of the above
+				 * three ID names. Read: "bad value for %s: %s" */
 				warnx(_("bad %s value: %s"), idtype[which], *argv);
 				errs = 1;
 				continue;
-- 
1.7.0.4

[PATCH 02/10] textual: "ambivalent" applies to intentions, "ambiguous" to results

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 lib/swapprober.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/swapprober.c b/lib/swapprober.c
index 39697c5..5a4b112 100644
--- a/lib/swapprober.c
+++ b/lib/swapprober.c
@@ -29,7 +29,7 @@ blkid_probe get_swap_prober(const char *devname)
 	if (rc == -1)
 		warn(_("%s: unable to probe device"), devname);
 	else if (rc == -2)
-		warnx(_("%s: ambivalent probing result, use wipefs(8)"), devname);
+		warnx(_("%s: ambiguous probing result; use wipefs(8)"), devname);
 	else if (rc == 1)
 		warnx(_("%s: not a valid swap partition"), devname);
 
-- 
1.7.0.4

[PATCH 03/10] textual: use a somewhat clearer and more standard failure message

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 login-utils/newgrp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index 9c0f8f5..23904fe 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -63,7 +63,7 @@ static char *xgetpass(FILE *input, const char *prompt)
 		if (tcsetattr(fd, TCSANOW, &saved))
 			err(EXIT_FAILURE, _("could not set terminal attributes"));
 	if (len < 0)
-		err(EXIT_FAILURE, _("could not getline"));
+		err(EXIT_FAILURE, _("getline() failed"));
 	if (0 < len && *(pass + len - 1) == '\n')
 		*(pass + len - 1) = '\0';
 	return pass;
-- 
1.7.0.4

[PATCH 04/10] textual: add a comma for clarity, plus some other tweaks

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 libfdisk/src/context.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index 4931145..4031f0b 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -363,10 +363,10 @@ static int warn_wipe(struct fdisk_context *cxt)
 		if (blkid_probe_lookup_value(pr, "TYPE", &name, 0) == 0 ||
 		    blkid_probe_lookup_value(pr, "PTTYPE", &name, 0) == 0) {
 			fdisk_warnx(cxt, _(
-				"%s: device contains a valid '%s' signature, it's "
-				"strongly recommended to wipe the device by command wipefs(8) "
-				"if this setup is unexpected to avoid "
-				"possible collisions."), cxt->dev_path, name);
+				"%s: device contains a valid '%s' signature; it is "
+				"strongly recommended to wipe the device with "
+				"wipefs(8) if this is unexpected, in order to "
+				"avoid possible collisions"), cxt->dev_path, name);
 			rc = 1;
 		}
 	}
-- 
1.7.0.4

[PATCH 05/10] textual: not using angular brackets around literal arguments

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/ctrlaltdel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index df13d08..863632f 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -18,7 +18,7 @@
 static void __attribute__ ((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
-	fprintf(out, _(" %s <hard|soft>\n"), program_invocation_short_name);
+	fprintf(out, _(" %s hard|soft\n"), program_invocation_short_name);
 	fprintf(out, USAGE_OPTIONS);
 	fprintf(out, USAGE_HELP);
 	fprintf(out, USAGE_VERSION);
-- 
1.7.0.4

[PATCH 06/10] textual: grammarize an error message

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/dmesg.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index f95609f..71e6632 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1395,8 +1395,8 @@ int main(int argc, char *argv[])
 		if (ctl.raw
 		    && ctl.method != DMESG_METHOD_KMSG
 		    && (ctl.fltr_lev || ctl.fltr_fac))
-			    errx(EXIT_FAILURE, _("--raw could be used together with --level or "
-				 "--facility only when read messages from /dev/kmsg"));
+			    errx(EXIT_FAILURE, _("--raw can be used together with --level or "
+				 "--facility only when reading messages from /dev/kmsg"));
 		if (ctl.pager)
 			setup_pager();
 		n = read_buffer(&ctl, &buf);
-- 
1.7.0.4

[PATCH 07/10] textual: using angular brackets around individual arguments

[Benno Schulenberg]

And separate short and long options with the standard comma.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/flock.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index f160eac..dabacb8 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -49,19 +49,19 @@ static void __attribute__((__noreturn__)) usage(int ex)
 {
 	fprintf(stderr, USAGE_HEADER);
 	fprintf(stderr,
-		_(" %1$s [options] <file|directory> <command> [<arguments>...]\n"
-		  " %1$s [options] <file|directory> -c <command>\n"
+		_(" %1$s [options] <file>|<directory> <command> [<argument>...]\n"
+		  " %1$s [options] <file>|<directory> -c <command>\n"
 		  " %1$s [options] <file descriptor number>\n"),
 		program_invocation_short_name);
 	fputs(USAGE_OPTIONS, stderr);
-	fputs(_(  " -s  --shared             get a shared lock\n"), stderr);
-	fputs(_(  " -x  --exclusive          get an exclusive lock (default)\n"), stderr);
-	fputs(_(  " -u  --unlock             remove a lock\n"), stderr);
-	fputs(_(  " -n  --nonblock           fail rather than wait\n"), stderr);
-	fputs(_(  " -w  --timeout <secs>     wait for a limited amount of time\n"), stderr);
-	fputs(_(  " -E  --conflict-exit-code <number>  exit code after conflict or timeout\n"), stderr);
-	fputs(_(  " -o  --close              close file descriptor before running command\n"), stderr);
-	fputs(_(  " -c  --command <command>  run a single command string through the shell\n"), stderr);
+	fputs(_(  " -s, --shared             get a shared lock\n"), stderr);
+	fputs(_(  " -x, --exclusive          get an exclusive lock (default)\n"), stderr);
+	fputs(_(  " -u, --unlock             remove a lock\n"), stderr);
+	fputs(_(  " -n, --nonblock           fail rather than wait\n"), stderr);
+	fputs(_(  " -w, --timeout <secs>     wait for a limited amount of time\n"), stderr);
+	fputs(_(  " -E, --conflict-exit-code <number>  exit code after conflict or timeout\n"), stderr);
+	fputs(_(  " -o, --close              close file descriptor before running command\n"), stderr);
+	fputs(_(  " -c, --command <command>  run a single command string through the shell\n"), stderr);
 	fprintf(stderr, USAGE_SEPARATOR);
 	fprintf(stderr, USAGE_HELP);
 	fprintf(stderr, USAGE_VERSION);
-- 
1.7.0.4

[PATCH 08/10] textual: grammarize another error message

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/hwclock-cmos.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-utils/hwclock-cmos.c b/sys-utils/hwclock-cmos.c
index 7ffbf95..ca6ab1c 100644
--- a/sys-utils/hwclock-cmos.c
+++ b/sys-utils/hwclock-cmos.c
@@ -319,7 +319,7 @@ static inline unsigned long cmos_read(unsigned long reg)
 			       clock_ctl_addr);
 		lseek(dev_port_fd, clock_data_addr, 0);
 		if (read(dev_port_fd, &v, 1) == -1 && debug)
-			warn(_("cmos_read(): read data address %X failed"),
+			warn(_("cmos_read(): read from data address %X failed"),
 			       clock_data_addr);
 		return v;
 	} else {
-- 
1.7.0.4

[PATCH 09/10] textual: angular brackets around a non-literal argument, singular

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/nsenter.c |    2 +-
 sys-utils/setpriv.c |    5 ++++-
 sys-utils/unshare.c |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 87c6549..7da44e7 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -62,7 +62,7 @@ static void usage(int status)
 	FILE *out = status == EXIT_SUCCESS ? stdout : stderr;
 
 	fputs(USAGE_HEADER, out);
-	fprintf(out, _(" %s [options] <program> [args...]\n"),
+	fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
 		program_invocation_short_name);
 
 	fputs(USAGE_OPTIONS, out);
diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index ccfa993..06d9fe4 100644
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -90,7 +90,9 @@ struct privctx {
 static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	fputs(USAGE_HEADER, out);
-	fprintf(out, _(" %s [options] <program> [args...]\n"), program_invocation_short_name);
+	fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
+		program_invocation_short_name);
+
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -d, --dump               show current state (and do not exec anything)\n"), out);
 	fputs(_(" --nnp, --no-new-privs    disallow granting new privileges\n"), out);
@@ -108,6 +110,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	fputs(_(" --securebits <bits>      set securebits\n"), out);
 	fputs(_(" --selinux-label <label>  set SELinux label\n"), out);
 	fputs(_(" --apparmor-profile <pr>  set AppArmor profile\n"), out);
+
 	fputs(USAGE_SEPARATOR, out);
 	fputs(USAGE_HELP, out);
 	fputs(USAGE_VERSION, out);
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 95e4afb..933f621 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -60,8 +60,8 @@ static void usage(int status)
 	FILE *out = status == EXIT_SUCCESS ? stdout : stderr;
 
 	fputs(USAGE_HEADER, out);
-	fprintf(out,
-	      _(" %s [options] <program> [args...]\n"),	program_invocation_short_name);
+	fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
+		program_invocation_short_name);
 
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -m, --mount               unshare mounts namespace\n"), out);
-- 
1.7.0.4

[PATCH 10/10] textual: there may be no space between option and optional =arg

[Benno Schulenberg]

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/nsenter.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 7da44e7..c54d63f 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -67,16 +67,16 @@ static void usage(int status)
 
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -t, --target <pid>     target process to get namespaces from\n"), out);
-	fputs(_(" -m, --mount [=<file>]  enter mount namespace\n"), out);
-	fputs(_(" -u, --uts   [=<file>]  enter UTS namespace (hostname etc)\n"), out);
-	fputs(_(" -i, --ipc   [=<file>]  enter System V IPC namespace\n"), out);
-	fputs(_(" -n, --net   [=<file>]  enter network namespace\n"), out);
-	fputs(_(" -p, --pid   [=<file>]  enter pid namespace\n"), out);
-	fputs(_(" -U, --user  [=<file>]  enter user namespace\n"), out);
+	fputs(_(" -m, --mount[=<file>]   enter mount namespace\n"), out);
+	fputs(_(" -u, --uts[=<file>]     enter UTS namespace (hostname etc)\n"), out);
+	fputs(_(" -i, --ipc[=<file>]     enter System V IPC namespace\n"), out);
+	fputs(_(" -n, --net[=<file>]     enter network namespace\n"), out);
+	fputs(_(" -p, --pid[=<file>]     enter pid namespace\n"), out);
+	fputs(_(" -U, --user[=<file>]    enter user namespace\n"), out);
 	fputs(_(" -S, --setuid <uid>     set uid in entered namespace\n"), out);
 	fputs(_(" -G, --setgid <gid>     set gid in entered namespace\n"), out);
-	fputs(_(" -r, --root  [=<dir>]   set the root directory\n"), out);
-	fputs(_(" -w, --wd    [=<dir>]   set the working directory\n"), out);
+	fputs(_(" -r, --root[=<dir>]     set the root directory\n"), out);
+	fputs(_(" -w, --wd[=<dir>]       set the working directory\n"), out);
 	fputs(_(" -F, --no-fork          do not fork before exec'ing <program>\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-- 
1.7.0.4

Re: [PATCH 01/10] textual: use angular brackets around each individual argument

[Benno Schulenberg]

On Mon, Sep 22, 2014, at 22:15, Benno Schulenberg wrote:
> -	fputs(_(" -u, --user <name|id>   interpret argument as username or user ID\n"), out);
> +	fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out);

Sami?  How come that this change, that you seemed to have applied,
wasn't propagated to the github branch that Karel pulled?

Benno

-- 
http://www.fastmail.fm - Email service worth paying for. Try it for free

Re: [PATCH 01/10] textual: use angular brackets around each individual argument

[Sami Kerola]

On 22 September 2014 21:18, Benno Schulenberg <bensberg@justemail.net> wrote:
>
> On Mon, Sep 22, 2014, at 22:15, Benno Schulenberg wrote:
>> -     fputs(_(" -u, --user <name|id>   interpret argument as username or user ID\n"), out);
>> +     fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out);
>
> Sami?  How come that this change, that you seemed to have applied,
> wasn't propagated to the github branch that Karel pulled?

Hi Benno,

I don't know. Maybe Karel did not fetch the latest changes before
merging. Well, at least
writing a patch to correct the angle brackets is easy.

-- 
Sami Kerola
http://www.iki.fi/kerolasa/

Re: [PATCH 01/10] textual: use angular brackets around each individual argument

[Karel Zak]

On Tue, Sep 23, 2014 at 02:26:41PM +0100, Sami Kerola wrote:
> On 22 September 2014 21:18, Benno Schulenberg <bensberg@justemail.net> wrote:
> >
> > On Mon, Sep 22, 2014, at 22:15, Benno Schulenberg wrote:
> >> -     fputs(_(" -u, --user <name|id>   interpret argument as username or user ID\n"), out);
> >> +     fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out);
> >
> > Sami?  How come that this change, that you seemed to have applied,
> > wasn't propagated to the github branch that Karel pulled?
> 
> Hi Benno,
> 
> I don't know. Maybe Karel did not fetch the latest changes before
> merging. Well, at least
> writing a patch to correct the angle brackets is easy.

 git log:

   Merge branch 'renice' of git://github.com/kerolasa/lelux-utiliteetit

 and it seems the latest version of the branch.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 01/10] textual: use angular brackets around each individual argument

[Karel Zak]

On Mon, Sep 22, 2014 at 10:15:31PM +0200, Benno Schulenberg wrote:
> Also add a translator comment.

 All 10 patches applied. Thanks!

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com