BZ#14812: Add missing translation marker on some argp option argument names in utilities.

6 files changed, 29 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index aca9c8bba3..f389131cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-18  Roland McGrath  <roland@hack.frob.com>
+
+	[BZ #14812]
+	* argp/argp-parse.c (argp_default_options): Put N_ translation marker
+	on argument names, not just descriptions.
+	* iconv/iconv_prog.c (options): Likewise.
+	* iconv/iconvconfig.c (options): Likewise.
+	* malloc/memusagestat.c (options): Likewise.
+	* nss/getent.c (options): Likewise.
+	Reported by Benno Schulenberg <bensberg@justemail.net>.
+
 2013-03-18  Ondrej Bilka  <neleai@seznam.cz>
 
 	* sysdeps/x86_64/strlen.S: Replace with new SSE2 based
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index e9de396c16..f68ebab0df 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -100,9 +100,10 @@ static const struct argp_option argp_default_options[] =
 {
   {"help",	  '?',	  	0, 0,  N_("Give this help list"), -1},
   {"usage",	  OPT_USAGE,	0, 0,  N_("Give a short usage message")},
-  {"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, N_("Set the program name")},
-  {"HANG",	  OPT_HANG,    "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
-     N_("Hang for SECS seconds (default 3600)")},
+  {"program-name",OPT_PROGNAME, N_("NAME"), OPTION_HIDDEN,
+   N_("Set the program name")},
+  {"HANG",	  OPT_HANG,    N_("SECS"), OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
+   N_("Hang for SECS seconds (default 3600)")},
   {0, 0}
 };
 
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 4142020954..a42cc5b375 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -57,13 +57,13 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
 static const struct argp_option options[] =
 {
   { NULL, 0, NULL, 0, N_("Input/Output format specification:") },
-  { "from-code", 'f', "NAME", 0, N_("encoding of original text") },
-  { "to-code", 't', "NAME", 0, N_("encoding for output") },
+  { "from-code", 'f', N_("NAME"), 0, N_("encoding of original text") },
+  { "to-code", 't', N_("NAME"), 0, N_("encoding for output") },
   { NULL, 0, NULL, 0, N_("Information:") },
   { "list", 'l', NULL, 0, N_("list all known coded character sets") },
   { NULL, 0, NULL, 0, N_("Output control:") },
   { NULL, 'c', NULL, 0, N_("omit invalid characters from output") },
-  { "output", 'o', "FILE", 0, N_("output file") },
+  { "output", 'o', N_("FILE"), 0, N_("output file") },
   { "silent", 's', NULL, 0, N_("suppress warnings") },
   { "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
   { NULL, 0, NULL, 0, NULL }
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 677620b963..9e871d279c 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -123,8 +123,9 @@ static char *more_help (int key, const char *text, void *input);
 #define OPT_NOSTDLIB 301
 static const struct argp_option options[] =
 {
-  { "prefix", OPT_PREFIX, "PATH", 0, N_("Prefix used for all file accesses") },
-  { "output", 'o', "FILE", 0, N_("\
+  { "prefix", OPT_PREFIX, N_("PATH"), 0,
+    N_("Prefix used for all file accesses") },
+  { "output", 'o', N_("FILE"), 0, N_("\
 Put output in FILE instead of installed location\
  (--prefix does not apply to FILE)") },
   { "nostdlib", OPT_NOSTDLIB, NULL, 0,
diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
index 7bbd009967..daeba1dc0a 100644
--- a/malloc/memusagestat.c
+++ b/malloc/memusagestat.c
@@ -52,12 +52,15 @@
 /* Definitions of arguments for argp functions.  */
 static const struct argp_option options[] =
 {
-  { "output", 'o', "FILE", 0, N_("Name output file") },
-  { "string", 's', "STRING", 0, N_("Title string used in output graphic") },
-  { "time", 't', NULL, 0, N_("Generate output linear to time (default is linear to number of function calls)") },
+  { "output", 'o', N_("FILE"), 0, N_("Name output file") },
+  { "string", 's', N_("STRING"), 0, N_("Title string used in output graphic") },
+  { "time", 't', NULL, 0, N_("\
+Generate output linear to time (default is linear to number of function calls)\
+") },
   { "total", 'T', NULL, 0,
     N_("Also draw graph for total memory consumption") },
-  { "x-size", 'x', "VALUE", 0, N_("Make output graphic VALUE pixels wide") },
+  { "x-size", 'x', N_("VALUE"), 0,
+    N_("Make output graphic VALUE pixels wide") },
   { "y-size", 'y', "VALUE", 0, N_("Make output graphic VALUE pixels high") },
   { NULL, 0, NULL, 0, NULL }
 };
diff --git a/nss/getent.c b/nss/getent.c
index 0689859d24..aa4eaf9e0d 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -55,7 +55,7 @@ static const char args_doc[] = N_("database [key ...]");
 /* Supported options. */
 static const struct argp_option args_options[] =
   {
-    { "service", 's', "CONFIG", 0, N_("Service configuration to be used") },
+    { "service", 's', N_("CONFIG"), 0, N_("Service configuration to be used") },
     { "no-idn", 'i', NULL, 0, N_("disable IDN encoding") },
     { NULL, 0, NULL, 0, NULL },
   };