From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 06/14] lsblk: make usage() translator friendly
Date: Tue, 22 Jan 2013 23:27:05 +0000 [thread overview]
Message-ID: <1358897233-6676-7-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/lsblk.c | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 8ee6974..a9674c1 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1325,31 +1325,30 @@ static void __attribute__((__noreturn__)) help(FILE *out)
{
size_t i;
- fprintf(out, _(
- "\nUsage:\n"
- " %s [options] [<device> ...]\n"), program_invocation_short_name);
-
- fprintf(out, _(
- "\nOptions:\n"
- " -a, --all print all devices\n"
- " -b, --bytes print SIZE in bytes rather than in human readable format\n"
- " -d, --nodeps don't print slaves or holders\n"
- " -D, --discard print discard capabilities\n"
- " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
- " -I, --include <list> show only devices with specified major numbers\n"
- " -f, --fs output info about filesystems\n"
- " -h, --help usage information (this)\n"
- " -i, --ascii use ascii characters only\n"
- " -m, --perms output info about permissions\n"
- " -l, --list use list format output\n"
- " -n, --noheadings don't print headings\n"
- " -o, --output <list> output columns\n"
- " -P, --pairs use key=\"value\" output format\n"
- " -r, --raw use raw output format\n"
- " -s, --inverse inverse dependencies\n"
- " -t, --topology output info about topology\n"
- " -S, --scsi output info about SCSI devices\n"
- " -V, --version output version information and exit\n"));
+ fputs(USAGE_HEADER, out);
+ fprintf(out, _(" %s [options] [<device> ...]\n"), program_invocation_short_name);
+ fputs(USAGE_OPTIONS, out);
+ fputs(_(" -a, --all print all devices\n"), out);
+ fputs(_(" -b, --bytes print SIZE in bytes rather than in human readable format\n"), out);
+ fputs(_(" -d, --nodeps don't print slaves or holders\n"), out);
+ fputs(_(" -D, --discard print discard capabilities\n"), out);
+ fputs(_(" -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"), out);
+ fputs(_(" -I, --include <list> show only devices with specified major numbers\n"), out);
+ fputs(_(" -f, --fs output info about filesystems\n"), out);
+ fputs(_(" -h, --help usage information (this)\n"), out);
+ fputs(_(" -i, --ascii use ascii characters only\n"), out);
+ fputs(_(" -m, --perms output info about permissions\n"), out);
+ fputs(_(" -l, --list use list format output\n"), out);
+ fputs(_(" -n, --noheadings don't print headings\n"), out);
+ fputs(_(" -o, --output <list> output columns\n"), out);
+ fputs(_(" -P, --pairs use key=\"value\" output format\n"), out);
+ fputs(_(" -r, --raw use raw output format\n"), out);
+ fputs(_(" -s, --inverse inverse dependencies\n"), out);
+ fputs(_(" -t, --topology output info about topology\n"), out);
+ fputs(_(" -S, --scsi output info about SCSI devices\n"), out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(USAGE_HELP, out);
+ fputs(USAGE_VERSION, out);
fprintf(out, _("\nAvailable columns (for --output):\n"));
--
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 ` Sami Kerola [this message]
2013-01-22 23:27 ` [PATCH 07/14] rename: " Sami Kerola
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-7-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