GNU C Library master sources branch master updated. glibc-2.17-447-g912cc4b

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  912cc4b3e4f9752b76d9cd43950fb8f5fa87117d (commit)
      from  44f908d0e99bc9917e44cd80caa149a4b13ae8a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=912cc4b3e4f9752b76d9cd43950fb8f5fa87117d

commit 912cc4b3e4f9752b76d9cd43950fb8f5fa87117d
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Mar 20 14:26:58 2013 -0700

    BZ#14812: Add missing N_ markers in localedef.

diff --git a/ChangeLog b/ChangeLog
index 811ad0f..9ac85ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-20  Roland McGrath  <roland@hack.frob.com>
+
+	[BZ #14812]
+	* locale/programs/localedef.c (options): Put N_ translation marker
+	on argument names, not just descriptions.
+
 2013-03-20  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
 
 	* Makerules ($(inst_libdir)/libc.so): Use $(rtlddir).
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 16129bb..5a14f2c 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -117,17 +117,18 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
 static const struct argp_option options[] =
 {
   { NULL, 0, NULL, 0, N_("Input Files:") },
-  { "charmap", 'f', "FILE", 0,
+  { "charmap", 'f', N_("FILE"), 0,
     N_("Symbolic character names defined in FILE") },
-  { "inputfile", 'i', "FILE", 0, N_("Source definitions are found in FILE") },
-  { "repertoire-map", 'u', "FILE", 0,
+  { "inputfile", 'i', N_("FILE"), 0,
+    N_("Source definitions are found in FILE") },
+  { "repertoire-map", 'u', N_("FILE"), 0,
     N_("FILE contains mapping from symbolic names to UCS4 values") },
 
   { NULL, 0, NULL, 0, N_("Output control:") },
   { "force", 'c', NULL, 0,
     N_("Create output even if warning messages were issued") },
   { "old-style", OPT_OLDSTYLE, NULL, 0, N_("Create old-style tables") },
-  { "prefix", OPT_PREFIX, "PATH", 0, N_("Optional output file prefix") },
+  { "prefix", OPT_PREFIX, N_("PATH"), 0, N_("Optional output file prefix") },
   { "posix", OPT_POSIX, NULL, 0, N_("Strictly conform to POSIX") },
   { "quiet", OPT_QUIET, NULL, 0,
     N_("Suppress warnings and information messages") },
@@ -141,7 +142,7 @@ static const struct argp_option options[] =
   { "delete-from-archive", OPT_DELETE_FROM_ARCHIVE, NULL, 0,
     N_("Remove locales named by parameters from archive") },
   { "list-archive", OPT_LIST_ARCHIVE, NULL, 0, N_("List content of archive") },
-  { "alias-file", 'A', "FILE", 0,
+  { "alias-file", 'A', N_("FILE"), 0,
     N_("locale.alias file to consult when making archive")},
   { NULL, 0, NULL, 0, NULL }
 };

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    6 ++++++
 locale/programs/localedef.c |   11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources