From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 10/13] setterm: fix various color option argument lists
Date: Tue, 2 Apr 2013 20:42:54 +0100 [thread overview]
Message-ID: <1364931777-2645-11-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1364931777-2645-1-git-send-email-kerolasa@iki.fi>
The lists did not have correct colors in usage(). Because the usage()
had to be fixed, it is best to make the output easy for translators to
work with.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
term-utils/setterm.c | 74 ++++++++++++++++++++++++++--------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 0e72cf0..310c3fa 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -678,43 +678,43 @@ usage(FILE *out) {
_(" %s [options]\n"), program_invocation_short_name);
fputs(_("\nOptions:\n"), out);
- fputs(_(" -term <terminal_name>\n"
- " -reset\n"
- " -initialize\n"
- " -cursor <on|off>\n"
- " -repeat <on|off>\n"
- " -appcursorkeys <on|off>\n"
- " -linewrap <on|off>\n"
- " -default\n"
- " -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
- " -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
- " -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
- " -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
- " -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
- " -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
- " -inversescreen <on|off>\n"
- " -bold <on|off>\n"
- " -half-bright <on|off>\n"
- " -blink <on|off>\n"
- " -reverse <on|off>\n"
- " -underline <on|off>\n"
- " -store >\n"
- " -clear <all|rest>\n"
- " -tabs < tab1 tab2 tab3 ... > (tabn = 1-160)\n"
- " -clrtabs < tab1 tab2 tab3 ... > (tabn = 1-160)\n"
- " -regtabs <1-160>\n"
- " -blank <0-60|force|poke>\n"
- " -dump <1-NR_CONSOLES>\n"
- " -append <1-NR_CONSOLES>\n"
- " -file dumpfilename\n"
- " -msg <on|off>\n"
- " -msglevel <0-8>\n"
- " -powersave <on|vsync|hsync|powerdown|off>\n"
- " -powerdown <0-60>\n"
- " -blength <0-2000>\n"
- " -bfreq freqnumber\n"
- " -version\n"
- " -help\n"), out);
+ fputs(_(" -term <terminal_name>\n"), out);
+ fputs(_(" -reset\n"), out);
+ fputs(_(" -initialize\n"), out);
+ fputs(_(" -cursor <on|off>\n"), out);
+ fputs(_(" -repeat <on|off>\n"), out);
+ fputs(_(" -appcursorkeys <on|off>\n"), out);
+ fputs(_(" -linewrap <on|off>\n"), out);
+ fputs(_(" -default\n"), out);
+ fputs(_(" -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"), out);
+ fputs(_(" -background <default|black|blue|cyan|green|magenta|red|white|yellow>\n"), out);
+ fputs(_(" -ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
+ fputs(_(" -ulcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
+ fputs(_(" -hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
+ fputs(_(" -hbcolor <black|blue|bright|cyan|green|grey|magenta|red|white|yellow>\n"), out);
+ fputs(_(" -inversescreen <on|off>\n"), out);
+ fputs(_(" -bold <on|off>\n"), out);
+ fputs(_(" -half-bright <on|off>\n"), out);
+ fputs(_(" -blink <on|off>\n"), out);
+ fputs(_(" -reverse <on|off>\n"), out);
+ fputs(_(" -underline <on|off>\n"), out);
+ fputs(_(" -store\n"), out);
+ fputs(_(" -clear <all|rest>\n"), out);
+ fputs(_(" -tabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"), out);
+ fputs(_(" -clrtabs <tab1 tab2 tab3 ...> (tabn = 1-160)\n"), out);
+ fputs(_(" -regtabs <1-160>\n"), out);
+ fputs(_(" -blank <0-60|force|poke>\n"), out);
+ fputs(_(" -dump <1-NR_CONSOLES>\n"), out);
+ fputs(_(" -append <1-NR_CONSOLES>\n"), out);
+ fputs(_(" -file dumpfilename\n"), out);
+ fputs(_(" -msg <on|off>\n"), out);
+ fputs(_(" -msglevel <0-8>\n"), out);
+ fputs(_(" -powersave <on|vsync|hsync|powerdown|off>\n"), out);
+ fputs(_(" -powerdown <0-60>\n"), out);
+ fputs(_(" -blength <0-2000>\n"), out);
+ fputs(_(" -bfreq freqnumber\n"), out);
+ fputs(_(" -version\n"), out);
+ fputs(_(" -help\n"), out);
fprintf(out, USAGE_MAN_TAIL("setterm(1)"));
--
1.8.2
next prev parent reply other threads:[~2013-04-02 19:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 19:42 [PATCH 00/13] pull: fixes in preparation to v2.23 release Sami Kerola
2013-04-02 19:42 ` [PATCH 01/13] docs: fix type in mkfs.8 Sami Kerola
2013-04-02 19:42 ` [PATCH 02/13] newgrp: use xstrdup to check allocation succeeded Sami Kerola
2013-04-02 19:42 ` [PATCH 03/13] agetty: the command does not have -h and -V options Sami Kerola
2013-04-02 19:42 ` [PATCH 04/13] dmesg: fix usage() output consistancy Sami Kerola
2013-04-02 19:42 ` [PATCH 05/13] fsfreeze: tell user when mandatory option is not specified Sami Kerola
2013-04-02 19:42 ` [PATCH 06/13] losetup: allow -j option argument to be relative path Sami Kerola
2013-04-02 19:42 ` [PATCH 07/13] lscpu: fix error message Sami Kerola
2013-04-02 19:42 ` [PATCH 08/13] partx: remove deprecated option from usage() Sami Kerola
2013-04-02 19:42 ` [PATCH 09/13] setarch: add option to list settable architectures Sami Kerola
2013-04-05 12:04 ` Karel Zak
2013-04-02 19:42 ` Sami Kerola [this message]
2013-04-02 19:42 ` [PATCH 11/13] vipw: add usage() function Sami Kerola
2013-04-02 19:42 ` [PATCH 12/13] chrt: make command syntax easier to understand in usage() Sami Kerola
2013-04-02 19:42 ` [PATCH 13/13] logger: make local sockets to try both stream and datagram Sami Kerola
2013-04-05 12:10 ` [PATCH 00/13] pull: fixes in preparation to v2.23 release 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=1364931777-2645-11-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