Fix some message typos and xgettext markers.

5 files changed, 16 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4349f3d7..fe6a6e3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-06  Roland McGrath  <[email protected]>
+
+	* ld.c (options): Fix some typos in messages.
+	* elflint.c (check_scn_group, check_group): Likewise.
+	* ldscript.y (add_id_list): Likewise.
+	* readelf.c (print_hash_info): Add xgettext:no-c-format magic comment
+	before translated string containing a literal %.
+
 2010-02-26  Roland McGrath  <[email protected]>
 
 	* readelf.c (process_file): Don't leak an fd in failure case.
diff --git a/src/elflint.c b/src/elflint.c
index 531122bf..afe8bee6 100644
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -571,7 +571,7 @@ section [%2d] '%s': section with SHF_GROUP flag set not part of a section group\
 	       idx, section_name (ebl, idx));
       else
 	ERROR (gettext ("\
-section [%2d] '%s': section group [%2zu] '%s' does not preceed group member\n"),
+section [%2d] '%s': section group [%2zu] '%s' does not precede group member\n"),
 	       idx, section_name (ebl, idx),
 	       cnt, section_name (ebl, cnt));
     }
@@ -2434,7 +2434,7 @@ section [%2d] '%s': cannot get symbol for signature\n"),
       else if (strcmp (elf_strptr (ebl->elf, symshdr->sh_link, sym->st_name),
 		       "") == 0)
 	ERROR (gettext ("\
-section [%2d] '%s': signature symbol canot be empty string\n"),
+section [%2d] '%s': signature symbol cannot be empty string\n"),
 	       idx, section_name (ebl, idx));
 
       if (be_strict
diff --git a/src/ld.c b/src/ld.c
index 989bfaba..932496e1 100644
--- a/src/ld.c
+++ b/src/ld.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Red Hat, Inc.
+/* Copyright (C) 2001-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <[email protected]>, 2001.
 
@@ -88,7 +88,7 @@ static const struct argp_option options[] =
   { "whole-archive", ARGP_whole_archive, NULL, 0,
     N_("Include whole archives in the output from now on."), 0 },
   { "no-whole-archive", ARGP_no_whole_archive, NULL, 0,
-    N_("Stop including the whole arhives in the output."), 0 },
+    N_("Stop including the whole archives in the output."), 0 },
   { NULL, 'l', N_("FILE"), OPTION_HIDDEN, NULL, 0 },
   { "start-group", '(', NULL, 0, N_("Start a group."), 0 },
   { "end-group", ')', NULL, 0, N_("End a group."), 0 },
diff --git a/src/ldscript.y b/src/ldscript.y
index 252f9d4b..85174c7a 100644
--- a/src/ldscript.y
+++ b/src/ldscript.y
@@ -1,6 +1,6 @@
 %{
 /* Parser for linker scripts.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2001-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <[email protected]>, 2001.
 
@@ -743,9 +743,9 @@ add_id_list (const char *versionname, struct id_list *runp, _Bool local)
 	    if (defp != NULL && defp->u.s.local != local)
 	      error (EXIT_FAILURE, 0, versionname[0] == '\0'
 		     ? gettext ("\
-symbol '%s' in declared both local and global for unnamed version")
+symbol '%s' is declared both local and global for unnamed version")
 		     : gettext ("\
-symbol '%s' in declared both local and global for version '%s'"),
+symbol '%s' is declared both local and global for version '%s'"),
 		     runp->id, versionname);
 	  }
 	else
diff --git a/src/readelf.c b/src/readelf.c
index 682fd557..428d24d1 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -2632,6 +2632,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, size_t shstrndx,
     {
       uint64_t success = 0;
 
+      /* xgettext:no-c-format */
       fputs_unlocked (gettext ("\
  Length  Number  % of total  Coverage\n"), stdout);
       printf (gettext ("      0  %6" PRIu32 "      %5.1f%%\n"),