Util-Linux package development
 help / color / mirror / Atom feed
From: Benno Schulenberg <bensberg@justemail.net>
To: util-linux@vger.kernel.org
Subject: [PATCH 06/11] setarch: make the usage synopsis comprehensible for translators
Date: Mon, 29 Dec 2014 11:17:01 +0100	[thread overview]
Message-ID: <1419848226-2533-5-git-send-email-bensberg@justemail.net> (raw)
In-Reply-To: <1419848226-2533-1-git-send-email-bensberg@justemail.net>

Use two separate strings for the two different forms of setarch,
instead of filling in an untranslated word into a single string.
Also use the standard angular brackets for nonliteral arguments.

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

diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index 0943038..518eaca 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -91,9 +91,10 @@ enum {
 static void __attribute__((__noreturn__)) show_help(void)
 {
 	fputs(USAGE_HEADER, stdout);
-	printf(_(" %s%s [options] [program [program arguments]]\n"),
-	       program_invocation_short_name,
-	       !strcmp(program_invocation_short_name, "setarch") ? " <arch>" : "");
+	if (!strcmp(program_invocation_short_name, "setarch"))
+		printf(_(" %s <arch> [options] [<program> [<argument>...]]\n"), program_invocation_short_name);
+	else
+		printf(_(" %s [options] [<program> [<argument>...]]\n"), program_invocation_short_name);
 
 	fputs(USAGE_SEPARATOR, stdout);
 	fputs(_("Change the reported architecture and set personality flags.\n"), stdout);
-- 
1.7.0.4


  parent reply	other threads:[~2014-12-29 10:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-29 10:16 [PATCH 02/11] docs: improve some wordings on the man page of wipefs Benno Schulenberg
2014-12-29 10:16 ` [PATCH 03/11] ipcs: in usage show resource option as nonoptional when used with -i Benno Schulenberg
2014-12-29 10:16 ` [PATCH 04/11] ipcrm: gettextize the command synopsis of the usage text Benno Schulenberg
2014-12-29 10:17 ` [PATCH 05/11] docs: restore the alternative form of setarch in its man page Benno Schulenberg
2014-12-29 10:17 ` Benno Schulenberg [this message]
2014-12-29 10:17 ` [PATCH 07/11] textual: list the options of setarch in a more alphabetical order Benno Schulenberg
2014-12-29 10:17 ` [PATCH 08/11] colcrt: slice up the usage text for ease of translation Benno Schulenberg
2014-12-29 10:17 ` [PATCH 09/11] look: " Benno Schulenberg
2014-12-29 10:17 ` [PATCH 10/11] tailf: " Benno Schulenberg
2014-12-29 10:17 ` [PATCH 11/11] ipc*: use customary fputs() instead of fprintf() with the usage macros Benno Schulenberg
2015-01-06 13:13 ` [PATCH 02/11] docs: improve some wordings on the man page of wipefs Karel Zak
2015-01-06 13:26   ` Sami Kerola
2015-01-06 13:30     ` Karel Zak
2015-01-06 22:51       ` Sami Kerola
2015-01-06 21:08   ` Benno Schulenberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419848226-2533-5-git-send-email-bensberg@justemail.net \
    --to=bensberg@justemail.net \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox