From: Sami Kerola <kerolasa@iki.fi>
Date: Tue, 2 Apr 2013 19:42:54 +0000 (+0100)
Subject: setterm: fix various color option argument lists
X-Git-Tag: v2.23-rc2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dc8716;p=thirdparty%2Futil-linux.git

setterm: fix various color option argument lists

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>
---

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 0e72cf0532..310c3fab03 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)"));