* ar.c (print_contents): Don't internationalize strings without words.

	* dwarf.c (process_extended_line_op): Likewise.
	(process_debug_info): Likwise.
	(display_debug_lines_raw): Likewise.
	(display_debug_lines_decoded): Likewise.
	(display_debug_abbrev): Likewise.
	* readelf.c (process_file_header): Likewise.
	(GET_OP): Likewise.
	(decode_arm_unwind): Likewise.
	(process_mips_specific): Likewise.
	* resrc.c (run_cmd): Likewise.
	(rcparse_warning): Likewise.
	* objdump.c (dump_headers): Don't print "Pg".

6 files changed, 54 insertions, 44 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index abe5db4..b5f0e10 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-17  Alan Modra  <amodra@gmail.com>
+
+	* ar.c (print_contents): Don't internationalize strings without words.
+	* dwarf.c (process_extended_line_op): Likewise.
+	(process_debug_info): Likwise.
+	(display_debug_lines_raw): Likewise.
+	(display_debug_lines_decoded): Likewise.
+	(display_debug_abbrev): Likewise.
+	* readelf.c (process_file_header): Likewise.
+	(GET_OP): Likewise.
+	(decode_arm_unwind): Likewise.
+	(process_mips_specific): Likewise.
+	* resrc.c (run_cmd): Likewise.
+	(rcparse_warning): Likewise.
+	* objdump.c (dump_headers): Don't print "Pg".
+
 2010-11-16  Jorma Karvonen  <karvonen.jorma@gmail.com>
 
 	* windmc.c: ,%s' -> `%s' in a number of strings.
diff --git a/binutils/ar.c b/binutils/ar.c
index 5fe43bc..a08a991 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -820,8 +820,7 @@ print_contents (bfd *abfd)
     fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
 
   if (verbose)
-    /* xgettext:c-format */
-    printf (_("\n<%s>\n\n"), bfd_get_filename (abfd));
+    printf ("\n<%s>\n\n", bfd_get_filename (abfd));
 
   bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
 
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 60aa7d1..369304b 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -336,15 +336,15 @@ process_extended_line_op (unsigned char *data, int is_stmt)
       printf (_("  define new File Table entry\n"));
       printf (_("  Entry\tDir\tTime\tSize\tName\n"));
 
-      printf (_("   %d\t"), ++state_machine_regs.last_file_entry);
+      printf ("   %d\t", ++state_machine_regs.last_file_entry);
       name = data;
       data += strlen ((char *) data) + 1;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
       data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
       data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-      printf (_("%s\n\n"), name);
+      printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
+      printf ("%s\n\n", name);
       break;
 
     case DW_LNE_set_discriminator:
@@ -2203,7 +2203,7 @@ process_debug_info (struct dwarf_section *section,
 	    }
 
 	  if (!do_loc)
-	    printf (_(" (%s)\n"), get_TAG_name (entry->tag));
+	    printf (" (%s)\n", get_TAG_name (entry->tag));
 
 	  switch (entry->tag)
 	    {
@@ -2413,7 +2413,7 @@ display_debug_lines_raw (struct dwarf_section *section,
 
 	  while (*data != 0)
 	    {
-	      printf (_("  %s\n"), data);
+	      printf ("  %s\n", data);
 
 	      data += strlen ((char *) data) + 1;
 	    }
@@ -2435,18 +2435,18 @@ display_debug_lines_raw (struct dwarf_section *section,
 	      unsigned char *name;
 	      unsigned int bytes_read;
 
-	      printf (_("  %d\t"), ++state_machine_regs.last_file_entry);
+	      printf ("  %d\t", ++state_machine_regs.last_file_entry);
 	      name = data;
 
 	      data += strlen ((char *) data) + 1;
 
-	      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+	      printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
 	      data += bytes_read;
-	      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+	      printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
 	      data += bytes_read;
-	      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+	      printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
 	      data += bytes_read;
-	      printf (_("%s\n"), name);
+	      printf ("%s\n", name);
 	    }
 	}
 
@@ -2824,14 +2824,11 @@ display_debug_lines_decoded (struct dwarf_section *section,
           else
             {
               if (do_wide || strlen ((char *) directory_table[0]) < 76)
-                {
-                  printf (_("CU: %s/%s:\n"), directory_table[0],
-                          file_table[0].name);
-                }
+		printf (_("CU: %s/%s:\n"), directory_table[0],
+			file_table[0].name);
               else
-                {
-                  printf (_("%s:\n"), file_table[0].name);
-                }
+		printf ("%s:\n", file_table[0].name);
+
               printf (_("File name                            Line number    Starting address\n"));
             }
         }
@@ -2915,7 +2912,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
                       op_code_data += bytes_read;
                       read_leb128 (op_code_data, & bytes_read, 0);
 
-                      printf (_("%s:\n"), directory_table[dir_index]);
+                      printf ("%s:\n", directory_table[dir_index]);
                       break;
                     }
                   default:
@@ -2961,13 +2958,13 @@ display_debug_lines_decoded (struct dwarf_section *section,
               if (file_table[state_machine_regs.file - 1].directory_index == 0)
                 {
                   /* If directory index is 0, that means current directory.  */
-                  printf (_("\n./%s:[++]\n"),
+                  printf ("\n./%s:[++]\n",
                           file_table[state_machine_regs.file - 1].name);
                 }
               else
                 {
                   /* The directory index starts counting at 1.  */
-                  printf (_("\n%s/%s:\n"),
+                  printf ("\n%s/%s:\n",
                           directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
                           file_table[state_machine_regs.file - 1].name);
                 }
@@ -3067,11 +3064,11 @@ display_debug_lines_decoded (struct dwarf_section *section,
               if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
                 {
 		  if (linfo.li_max_ops_per_insn == 1)
-		    printf (_("%-35s  %11d  %#18lx\n"), newFileName,
+		    printf ("%-35s  %11d  %#18lx\n", newFileName,
 			    state_machine_regs.line,
 			    state_machine_regs.address);
 		  else
-		    printf (_("%-35s  %11d  %#18lx[%d]\n"), newFileName,
+		    printf ("%-35s  %11d  %#18lx[%d]\n", newFileName,
 			    state_machine_regs.line,
 			    state_machine_regs.address,
 			    state_machine_regs.op_index);
@@ -3079,11 +3076,11 @@ display_debug_lines_decoded (struct dwarf_section *section,
               else
                 {
 		  if (linfo.li_max_ops_per_insn == 1)
-		    printf (_("%s  %11d  %#18lx\n"), newFileName,
+		    printf ("%s  %11d  %#18lx\n", newFileName,
 			    state_machine_regs.line,
 			    state_machine_regs.address);
 		  else
-		    printf (_("%s  %11d  %#18lx[%d]\n"), newFileName,
+		    printf ("%s  %11d  %#18lx[%d]\n", newFileName,
 			    state_machine_regs.line,
 			    state_machine_regs.address,
 			    state_machine_regs.op_index);
@@ -3340,13 +3337,13 @@ display_debug_abbrev (struct dwarf_section *section,
 	{
 	  abbrev_attr *attr;
 
-	  printf (_("   %ld      %s    [%s]\n"),
+	  printf ("   %ld      %s    [%s]\n",
 		  entry->entry,
 		  get_TAG_name (entry->tag),
 		  entry->children ? _("has children") : _("no children"));
 
 	  for (attr = entry->first_attr; attr; attr = attr->next)
-	    printf (_("    %-18s %s\n"),
+	    printf ("    %-18s %s\n",
 		    get_AT_name (attr->attribute),
 		    get_FORM_name (attr->form));
 	}
diff --git a/binutils/objdump.c b/binutils/objdump.c
index c672f15..11a11ae 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -511,8 +511,6 @@ dump_headers (bfd *abfd)
 
   if (wide_output)
     printf (_("  Flags"));
-  if (abfd->flags & HAS_LOAD_PAGE)
-    printf (_("  Pg"));
   printf ("\n");
 
   bfd_map_over_sections (abfd, dump_section_header, NULL);
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 1682e0a..caacb14 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -3564,7 +3564,7 @@ process_file_header (void)
       if (section_headers != NULL
 	  && elf_header.e_phnum == PN_XNUM
 	  && section_headers[0].sh_info != 0)
-	printf (_(" (%ld)"), (long) section_headers[0].sh_info);
+	printf (" (%ld)", (long) section_headers[0].sh_info);
       putc ('\n', stdout);
       printf (_("  Size of section headers:           %ld (bytes)\n"),
 	      (long) elf_header.e_shentsize);
@@ -6442,7 +6442,7 @@ decode_arm_unwind (struct arm_unw_aux_info *aux,
       printf (_("[Truncated opcode]\n"));	\
       return;				\
     }					\
-  printf (_("0x%02x "), OP)
+  printf ("0x%02x ", OP)
 
   if (remaining == 0)
     {
@@ -6528,17 +6528,17 @@ decode_arm_unwind (struct arm_unw_aux_info *aux,
       op = word >> 24;
       word <<= 8;
 
-      printf (_("  0x%02x "), op);
+      printf ("  0x%02x ", op);
 
       if ((op & 0xc0) == 0x00)
 	{
 	  int offset = ((op & 0x3f) << 2) + 4;
-	  printf (_("     vsp = vsp + %d"), offset);
+	  printf ("     vsp = vsp + %d", offset);
 	}
       else if ((op & 0xc0) == 0x40)
 	{
 	  int offset = ((op & 0x3f) << 2) + 4;
-	  printf (_("     vsp = vsp - %d"), offset);
+	  printf ("     vsp = vsp - %d", offset);
 	}
       else if ((op & 0xf0) == 0x80)
 	{
@@ -6569,7 +6569,7 @@ decode_arm_unwind (struct arm_unw_aux_info *aux,
 	  if (op == 0x9d || op == 0x9f)
 	    printf (_("     [Reserved]"));
 	  else
-	    printf (_("     vsp = r%d"), op & 0x0f);
+	    printf ("     vsp = r%d", op & 0x0f);
 	}
       else if ((op & 0xf0) == 0xa0)
 	{
@@ -6633,7 +6633,7 @@ decode_arm_unwind (struct arm_unw_aux_info *aux,
 	  offset = read_uleb128 (buf, &len);
 	  assert (len == i + 1);
 	  offset = offset * 4 + 0x204;
-	  printf (_("vsp = vsp + %ld"), offset);
+	  printf ("vsp = vsp + %ld", offset);
 	}
       else
 	{
@@ -11684,7 +11684,7 @@ process_mips_specific (FILE * file)
       if (ent < local_end)
 	{
 	  printf (_(" Local entries:\n"));
-	  printf (_("  %*s %10s %*s\n"),
+	  printf ("  %*s %10s %*s\n",
 		  addr_size * 2, _("Address"), _("Access"),
 		  addr_size * 2, _("Initial"));
 	  while (ent < local_end)
@@ -11700,7 +11700,7 @@ process_mips_specific (FILE * file)
 	  int sym_width;
 
 	  printf (_(" Global entries:\n"));
-	  printf (_("  %*s %10s %*s %*s %-7s %3s %s\n"),
+	  printf ("  %*s %10s %*s %*s %-7s %3s %s\n",
 		  addr_size * 2, _("Address"), _("Access"),
 		  addr_size * 2, _("Initial"),
 		  addr_size * 2, _("Sym.Val."), _("Type"), _("Ndx"), _("Name"));
@@ -11768,7 +11768,7 @@ process_mips_specific (FILE * file)
       printf ("\n");
 
       printf (_(" Entries:\n"));
-      printf (_("  %*s %*s %*s %-7s %3s %s\n"),
+      printf ("  %*s %*s %*s %-7s %3s %s\n",
 	      addr_size * 2, _("Address"),
 	      addr_size * 2, _("Initial"),
 	      addr_size * 2, _("Sym.Val."), _("Type"), _("Ndx"), _("Name"));
diff --git a/binutils/resrc.c b/binutils/resrc.c
index a72a23f..0a14ad2 100644
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -281,7 +281,7 @@ run_cmd (char *cmd, const char *redir)
 
   if (pid == -1)
     {
-      fatal (_("%s %s: %s"), errmsg_fmt, errmsg_arg, strerror (errno));
+      fatal ("%s %s: %s", errmsg_fmt, errmsg_arg, strerror (errno));
       return 1;
     }
 
@@ -628,7 +628,7 @@ yyerror (const char *msg)
 void
 rcparse_warning (const char *msg)
 {
-  fprintf (stderr, _("%s:%d: %s\n"), rc_filename, rc_lineno, msg);
+  fprintf (stderr, "%s:%d: %s\n", rc_filename, rc_lineno, msg);
 }
 
 /* Die if we get an unexpected end of file.  */