Fix some message typos and xgettext markers.

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 1fbdf4c..b6e9f32 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-06  Roland McGrath  <roland@redhat.com>
+
+       * elf_error.c (ELF_E_FD_MISMATCH_IDX): Avoid nonobvious abbreviation
+       in error message.
+
 2010-04-01  Petr Machata  <pmachata@redhat.com>
 
        * elf_getdata.c (__elf_getdata_rdlock): Initialize data.s for data

diff --git a/libelf/elf_error.c b/libelf/elf_error.c
index dc58782..7f7504e 100644 (file)
--- a/libelf/elf_error.c
+++ b/libelf/elf_error.c
@@ -1,5 +1,5 @@
 /* Error handling in libelf.
-   Copyright (C) 1998,1999,2000,2002,2003,2004,2005,2006,2009 Red Hat, Inc.
+   Copyright (C) 1998-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 1998.
 
@@ -185,10 +185,10 @@ static const char msgstr[] =
   "\0"
 #define ELF_E_FD_MISMATCH_IDX \
   (ELF_E_FD_DISABLED_IDX + sizeof "file descriptor disabled")
-  N_("archive/member fildes mismatch")
+  N_("archive/member file descriptor mismatch")
   "\0"
 #define ELF_E_OFFSET_RANGE_IDX \
-  (ELF_E_FD_MISMATCH_IDX + sizeof "archive/member fildes mismatch")
+  (ELF_E_FD_MISMATCH_IDX + sizeof "archive/member file descriptor mismatch")
   N_("offset out of range")
   "\0"
 #define ELF_E_NOT_NUL_SECTION_IDX \

diff --git a/src/ChangeLog b/src/ChangeLog
index 4349f3d..fe6a6e3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-06  Roland McGrath  <roland@redhat.com>
+
+       * 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  <roland@redhat.com>
 
        * readelf.c (process_file): Don't leak an fd in failure case.

diff --git a/src/elflint.c b/src/elflint.c
index 531122b..afe8bee 100644 (file)
--- 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 989bfab..932496e 100644 (file)
--- 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 <drepper@redhat.com>, 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 252f9d4..85174c7 100644 (file)
--- 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 <drepper@redhat.com>, 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 682fd55..428d24d 100644 (file)
--- 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"),