From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 07/14] rename: make usage() translator friendly
Date: Tue, 22 Jan 2013 23:27:06 +0000 [thread overview]
Message-ID: <1358897233-6676-8-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1358897233-6676-1-git-send-email-kerolasa@iki.fi>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
misc-utils/rename.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 21bd522..a36caec 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -95,17 +95,17 @@ static int do_rename(char *from, char *to, char *s, int verbose, int symtarget)
static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
- fputs(_("\nUsage:\n"), out);
+ fputs(USAGE_HEADER, out);
fprintf(out,
_(" %s [options] expression replacement file...\n"),
program_invocation_short_name);
-
- fputs(_("\nOptions:\n"), out);
- fputs(_(" -v, --verbose explain what is being done\n"
- " -V, --version output version information and exit\n"
- " -s, --symlink act on symlink target\n"
- " -h, --help display this help and exit\n\n"), out);
-
+ fputs(USAGE_OPTIONS, out);
+ fputs(_(" -v, --verbose explain what is being done\n"), out);
+ fputs(_(" -s, --symlink act on symlink target\n"), out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(USAGE_HELP, out);
+ fputs(USAGE_VERSION, out);
+ fprintf(out, USAGE_MAN_TAIL("rename(1)"));
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}
--
1.8.1.1
next prev parent reply other threads:[~2013-01-22 23:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 23:26 [PATCH 00/14]: usage() fixes for translators Sami Kerola
2013-01-22 23:27 ` [PATCH 01/14] docs: usage function and gettext Sami Kerola
2013-01-22 23:27 ` [PATCH 02/14] nsenter: make usage() translator friendly Sami Kerola
2013-01-22 23:27 ` [PATCH 03/14] partx: " Sami Kerola
2013-01-22 23:27 ` [PATCH 04/14] su-common: " Sami Kerola
2013-01-22 23:27 ` [PATCH 05/14] findmnt: " Sami Kerola
2013-01-22 23:27 ` [PATCH 06/14] lsblk: " Sami Kerola
2013-01-22 23:27 ` Sami Kerola [this message]
2013-01-22 23:27 ` [PATCH 08/14] dmesg: " Sami Kerola
2013-01-22 23:27 ` [PATCH 09/14] hwclock: make usage() change " Sami Kerola
2013-01-22 23:27 ` [PATCH 10/14] losetup: make usage() " Sami Kerola
2013-01-22 23:27 ` [PATCH 11/14] umount: " Sami Kerola
2013-01-22 23:27 ` [PATCH 12/14] unshare: " Sami Kerola
2013-01-22 23:27 ` [PATCH 13/14] agetty: " Sami Kerola
2013-01-22 23:27 ` [PATCH 14/14] column: " Sami Kerola
2013-01-25 15:40 ` [PATCH 00/14]: usage() fixes for translators Karel Zak
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=1358897233-6676-8-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--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