Fix transaltion problems.

5 files changed, 302 insertions, 249 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 535b060..5ddea10 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,17 @@
 2002-05-27  Nick Clifton  <nickc@cambridge.redhat.com>
 
+	* arsup.c: Fix formatting.
+	* debug.c (debug_record_label): Add missing colon to error
+	message.
+	* ieee.c (parse_ieee_ty): Fix spelling typo.
+	* readelf.c (process_program_headers): Remove English assumption
+	about making a plural word.
+	(process_section_headers): Likewise.
+	(process_relocs): Allow quotes to be translated.
+	(process_unwind): Likewise,
+	(process_mips_specific): Improve error message.
+	(get_note_type): Fix spelling typo.
+
 	* configure.in (ALL_LINGUAS): Add sv
 	* po/sv.po: New file.
 
diff --git a/binutils/arsup.c b/binutils/arsup.c
index a09e19a..7b01d37 100644
--- a/binutils/arsup.c
+++ b/binutils/arsup.c
@@ -1,31 +1,29 @@
 /* arsup.c - Archive support for MRI compatibility
-   Copyright 1992, 1994, 1995, 1996, 1997, 2000
+   Copyright 1992, 1994, 1995, 1996, 1997, 2000, 2002
    Free Software Foundation, Inc.
 
-This file is part of GNU Binutils.
+   This file is part of GNU Binutils.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 /* Contributed by Steve Chamberlain
-   		  sac@cygnus.com
+   sac@cygnus.com
 
-This file looks after requests from arparse.y, to provide the MRI
-style librarian command syntax + 1 word LIST
-
-*/
+   This file looks after requests from arparse.y, to provide the MRI
+   style librarian command syntax + 1 word LIST.  */
 
 #include "bfd.h"
 #include "arsup.h"
@@ -98,7 +96,7 @@ ar_directory_doer (abfd, ignore)
      bfd *abfd;
      bfd *ignore ATTRIBUTE_UNUSED;
 {
-    print_arelt_descr(outfile, abfd, verbose);
+  print_arelt_descr(outfile, abfd, verbose);
 }
 
 void
@@ -135,11 +133,12 @@ void
 DEFUN_VOID(prompt)
 {
   extern int interactive;
+
   if (interactive)
-  {
-    printf("AR >");
-    fflush(stdout);
-  }
+    {
+      printf ("AR >");
+      fflush (stdout);
+    }
 }
 
 void
@@ -151,70 +150,83 @@ maybequit ()
 
 
 bfd *obfd;
-char *real_name ;
-void
-DEFUN(ar_open,(name, t),
-      char *name AND
-      int t)
+char *real_name;
 
+void
+ar_open (name, t)
+  char *name;
+  int t;
 {
   char *tname = (char *) xmalloc (strlen (name) + 10);
   const char *bname = lbasename (name);
   real_name = name;
+
   /* Prepend tmp- to the beginning, to avoid file-name clashes after
      truncation on filesystems with limited namespaces (DOS).  */
-  sprintf(tname, "%.*stmp-%s", (int) (bname - name), name, bname);
-  obfd = bfd_openw(tname, NULL);
-
-  if (!obfd) {
-    fprintf(stderr,_("%s: Can't open output archive %s\n"), program_name,
-	    tname);
-
-    maybequit();
-  }
-  else {
-    if (!t) {
-      bfd **ptr;
-      bfd *element;
-      bfd *ibfd;
-      ibfd = bfd_openr(name, NULL);
-      if (!ibfd) {
-	fprintf(stderr,_("%s: Can't open input archive %s\n"),
-		program_name, name);
-	maybequit();
-	return;
-      }
-      if (bfd_check_format(ibfd, bfd_archive) != true) {
-	fprintf(stderr,_("%s: file %s is not an archive\n"), program_name,
-		name);
-	maybequit();
-	return;
-      }
-      ptr = &(obfd->archive_head);
-      element = bfd_openr_next_archived_file(ibfd, NULL);
-
-      while (element) {
-	*ptr = element;
-	ptr = &element->next;
-	element = bfd_openr_next_archived_file(ibfd, element);
-      }
+  sprintf (tname, "%.*stmp-%s", (int) (bname - name), name, bname);
+  obfd = bfd_openw (tname, NULL);
+
+  if (!obfd)
+    {
+      fprintf (stderr,
+	       _("%s: Can't open output archive %s\n"),
+	       program_name,  tname);
+
+      maybequit ();
     }
+  else
+    {
+      if (!t)
+	{
+	  bfd **ptr;
+	  bfd *element;
+	  bfd *ibfd;
 
-    bfd_set_format(obfd, bfd_archive);
+	  ibfd = bfd_openr (name, NULL);
 
-    obfd->has_armap = 1;
-  }
-}
+	  if (!ibfd)
+	    {
+	      fprintf (stderr,_("%s: Can't open input archive %s\n"),
+		       program_name, name);
+	      maybequit ();
+	      return;
+	    }
+
+	  if (bfd_check_format(ibfd, bfd_archive) != true)
+	    {
+	      fprintf (stderr,
+		       _("%s: file %s is not an archive\n"),
+		       program_name, name);
+	      maybequit ();
+	      return;
+	    }
+
+	  ptr = &(obfd->archive_head);
+	  element = bfd_openr_next_archived_file (ibfd, NULL);
+
+	  while (element)
+	    {
+	      *ptr = element;
+	      ptr = &element->next;
+	      element = bfd_openr_next_archived_file (ibfd, element);
+	    }
+	}
+
+      bfd_set_format (obfd, bfd_archive);
 
+      obfd->has_armap = 1;
+    }
+}
 
 static void
 ar_addlib_doer (abfd, prev)
      bfd *abfd;
      bfd *prev;
 {
-  /* Add this module to the output bfd */
+  /* Add this module to the output bfd.  */
   if (prev != NULL)
     prev->next = abfd->next;
+
   abfd->next = obfd->archive_head;
   obfd->archive_head = abfd;
 }
@@ -237,224 +249,248 @@ ar_addlib (name, list)
       if (arch != NULL)
 	map_over_list (arch, ar_addlib_doer, list);
 
-      /* Don't close the bfd, since it will make the elements disasppear */
+      /* Don't close the bfd, since it will make the elements disasppear.  */
     }
 }
 
 void
-DEFUN(ar_addmod, (list),
-      struct list *list)
+ar_addmod (list)
+     struct list *list;
 {
-  if (!obfd) {
-    fprintf(stderr, _("%s: no open output archive\n"), program_name);
-    maybequit();
-  }
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
   else
-  {
-    while (list) {
-      bfd *abfd = bfd_openr(list->name, NULL);
-      if (!abfd)  {
-	fprintf(stderr,_("%s: can't open file %s\n"), program_name,
-		list->name);
-	maybequit();
-      }
-      else {
-	abfd->next = obfd->archive_head;
-	obfd->archive_head = abfd;
-      }
-      list = list->next;
+    {
+      while (list)
+	{
+	  bfd *abfd = bfd_openr (list->name, NULL);
+
+	  if (!abfd)
+	    {
+	      fprintf (stderr, _("%s: can't open file %s\n"),
+		       program_name, list->name);
+	      maybequit ();
+	    }
+	  else
+	    {
+	      abfd->next = obfd->archive_head;
+	      obfd->archive_head = abfd;
+	    }
+	  list = list->next;
+	}
     }
-  }
 }
 
 
-
 void
-DEFUN_VOID(ar_clear)
+ar_clear ()
 {
-if (obfd)
- obfd->archive_head = 0;
+  if (obfd)
+    obfd->archive_head = 0;
 }
 
 void
-DEFUN(ar_delete, (list),
-      struct list *list)
+ar_delete (list)
+     struct list *list;
 {
-  if (!obfd) {
-    fprintf(stderr, _("%s: no open output archive\n"), program_name);
-    maybequit();
-  }
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
   else
-  {
-    while (list) {
-      /* Find this name in the archive */
-      bfd *member = obfd->archive_head;
-      bfd **prev = &(obfd->archive_head);
-      int found = 0;
-      while (member) {
-	if (FILENAME_CMP(member->filename, list->name) == 0) {
-	  *prev = member->next;
-	  found = 1;
-	}
-	else {
-	  prev = &(member->next);
+    {
+      while (list)
+	{
+	  /* Find this name in the archive.  */
+	  bfd *member = obfd->archive_head;
+	  bfd **prev = &(obfd->archive_head);
+	  int found = 0;
+
+	  while (member)
+	    {
+	      if (FILENAME_CMP(member->filename, list->name) == 0)
+		{
+		  *prev = member->next;
+		  found = 1;
+		}
+	      else
+		prev = &(member->next);
+
+	      member = member->next;
+	    }
+
+	  if (!found)
+	    {
+	      fprintf (stderr, _("%s: can't find module file %s\n"),
+		       program_name, list->name);
+	      maybequit ();
+	    }
+
+	  list = list->next;
 	}
-	  member = member->next;
-      }
-      if (!found)  {
-	fprintf(stderr,_("%s: can't find module file %s\n"), program_name,
-		list->name);
-	maybequit();
-      }
-      list = list->next;
     }
-  }
 }
 
-
 void
-DEFUN_VOID(ar_save)
+ar_save ()
 {
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      char *ofilename = xstrdup (bfd_get_filename (obfd));
 
-  if (!obfd) {
-    fprintf(stderr, _("%s: no open output archive\n"), program_name);
-    maybequit();
-  }
-  else {
-    char *ofilename = xstrdup (bfd_get_filename (obfd));
-    bfd_close(obfd);
-
-    rename (ofilename, real_name);
-    obfd = 0;
-    free(ofilename);
-  }
-}
-
+      bfd_close (obfd);
 
+      rename (ofilename, real_name);
+      obfd = 0;
+      free (ofilename);
+    }
+}
 
 void
-DEFUN(ar_replace, (list),
-      struct list *list)
+ar_replace (list)
+     struct list *list;
 {
-  if (!obfd) {
-    fprintf(stderr, _("%s: no open output archive\n"), program_name);
-    maybequit();
-  }
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
   else
-  {
-    while (list) {
-      /* Find this name in the archive */
-      bfd *member = obfd->archive_head;
-      bfd **prev = &(obfd->archive_head);
-      int found = 0;
-      while (member)
-      {
-	if (FILENAME_CMP(member->filename, list->name) == 0)
-	{
-	  /* Found the one to replace */
-	  bfd *abfd = bfd_openr(list->name, 0);
-	  if (!abfd)
-	  {
-	    fprintf(stderr, _("%s: can't open file %s\n"), program_name, list->name);
-	    maybequit();
-	  }
-	  else {
-	    *prev = abfd;
-	    abfd->next = member->next;
-	    found = 1;
-	  }
-	}
-	else {
-	  prev = &(member->next);
-	}
-	member = member->next;
-      }
-      if (!found)  {
-	bfd *abfd = bfd_openr(list->name, 0);
-	fprintf(stderr,_("%s: can't find module file %s\n"), program_name,
-		list->name);
-	if (!abfd)
-	{
-	  fprintf(stderr, _("%s: can't open file %s\n"), program_name, list->name);
-	  maybequit();
-	}
-	else
+    {
+      while (list)
 	{
-	  *prev = abfd;
-	}
-      }
+	  /* Find this name in the archive.  */
+	  bfd *member = obfd->archive_head;
+	  bfd **prev = &(obfd->archive_head);
+	  int found = 0;
+
+	  while (member)
+	    {
+	      if (FILENAME_CMP (member->filename, list->name) == 0)
+		{
+		  /* Found the one to replace.  */
+		  bfd *abfd = bfd_openr (list->name, 0);
+
+		  if (!abfd)
+		    {
+		      fprintf (stderr, _("%s: can't open file %s\n"),
+			       program_name, list->name);
+		      maybequit ();
+		    }
+		  else
+		    {
+		      *prev = abfd;
+		      abfd->next = member->next;
+		      found = 1;
+		    }
+		}
+	      else
+		{
+		  prev = &(member->next);
+		}
+	      member = member->next;
+	    }
+
+	  if (!found)
+	    {
+	      bfd *abfd = bfd_openr (list->name, 0);
 
-    list = list->next;
+	      fprintf (stderr,_("%s: can't find module file %s\n"),
+		       program_name, list->name);
+	      if (!abfd)
+		{
+		  fprintf (stderr, _("%s: can't open file %s\n"),
+			   program_name, list->name);
+		  maybequit ();
+		}
+	      else
+		*prev = abfd;
+	    }
+
+	  list = list->next;
+	}
     }
-  }
 }
 
-/* And I added this one */
+/* And I added this one.  */
 void
-DEFUN_VOID(ar_list)
+ar_list ()
 {
   if (!obfd)
-  {
-    fprintf(stderr, _("%s: no open output archive\n"), program_name);
-    maybequit();
-  }
-  else {
-    bfd *abfd;
-    outfile = stdout;
-    verbose =1 ;
-    printf(_("Current open archive is %s\n"), bfd_get_filename (obfd));
-    for (abfd = obfd->archive_head;
-	 abfd != (bfd *)NULL;
-	 abfd = abfd->next)
     {
-      ar_directory_doer (abfd, (bfd *) NULL);
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
     }
-  }
-}
+  else
+    {
+      bfd *abfd;
+
+      outfile = stdout;
+      verbose =1 ;
+      printf (_("Current open archive is %s\n"), bfd_get_filename (obfd));
 
+      for (abfd = obfd->archive_head;
+	   abfd != (bfd *)NULL;
+	   abfd = abfd->next)
+	ar_directory_doer (abfd, (bfd *) NULL);
+    }
+}
 
 void
-DEFUN_VOID(ar_end)
+ar_end ()
 {
   if (obfd)
-  {
-    fclose((FILE *)(obfd->iostream));
-    unlink(bfd_get_filename (obfd));
-  }
+    {
+      fclose ((FILE *)(obfd->iostream));
+      unlink (bfd_get_filename (obfd));
+    }
 }
+
 void
-DEFUN(ar_extract,(list),
-      struct list *list)
+ar_extract (list)
+     struct list *list;
 {
   if (!obfd)
-  {
-
-    fprintf(stderr, _("%s: no open  archive\n"), program_name);
-    maybequit();
-  }
+    {
+      fprintf (stderr, _("%s: no open archive\n"), program_name);
+      maybequit ();
+    }
   else
-  {
-    while (list) {
-      /* Find this name in the archive */
-      bfd *member = obfd->archive_head;
-      int found = 0;
-      while (member && !found)
-      {
-	if (FILENAME_CMP(member->filename, list->name) == 0)
+    {
+      while (list)
 	{
-	  extract_file(member);
-	  found = 1;
-	  }
-
-	member = member->next;
-      }
-      if (!found)  {
-	bfd_openr(list->name, 0);
-	fprintf(stderr,_("%s: can't find module file %s\n"), program_name,
-		list->name);
-
-      }
-      list = list->next;
+	  /* Find this name in the archive.  */
+	  bfd *member = obfd->archive_head;
+	  int found = 0;
+
+	  while (member && !found)
+	    {
+	      if (FILENAME_CMP (member->filename, list->name) == 0)
+		{
+		  extract_file (member);
+		  found = 1;
+		}
+
+	      member = member->next;
+	    }
+
+	  if (!found)
+	    {
+	      bfd_openr (list->name, 0);
+	      fprintf (stderr, _("%s: can't find module file %s\n"),
+		       program_name, list->name);
+	    }
+
+	  list = list->next;
+	}
     }
-  }
 }
diff --git a/binutils/debug.c b/binutils/debug.c
index bbaf293..3ce609b 100644
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -1,5 +1,5 @@
 /* debug.c -- Handle generic debugging information.
-   Copyright 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
    This file is part of GNU Binutils.
@@ -1149,7 +1149,7 @@ debug_record_label (handle, name, type, addr)
      bfd_vma addr ATTRIBUTE_UNUSED;
 {
   /* FIXME.  */
-  debug_error (_("debug_record_label not implemented"));
+  debug_error (_("debug_record_label: not implemented"));
   return false;
 }
 
diff --git a/binutils/ieee.c b/binutils/ieee.c
index 99c6693..4735fb3 100644
--- a/binutils/ieee.c
+++ b/binutils/ieee.c
@@ -1,5 +1,5 @@
 /* ieee.c -- Read and write IEEE-695 debugging information.
-   Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
    This file is part of GNU Binutils.
@@ -1916,7 +1916,7 @@ parse_ieee_ty (info, pp)
 	switch (kind)
 	  {
 	  default:
-	    ieee_error (info, ty_start, _("unsupported qualifer"));
+	    ieee_error (info, ty_start, _("unsupported qualifier"));
 	    return false;
 
 	  case 1:
diff --git a/binutils/readelf.c b/binutils/readelf.c
index f515a20..d91f3d2 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2764,8 +2764,10 @@ process_program_headers (file)
 
   if (do_segments)
     {
-      printf
-	(_("\nProgram Header%s:\n"), elf_header.e_phnum > 1 ? "s" : "");
+      if (elf_header.e_phnum > 1)
+	printf (_("\nProgram Headers:\n"));
+      else
+	printf (_("\nProgram Headers:\n"));
 
       if (is_32bit_elf)
 	printf
@@ -3342,7 +3344,10 @@ process_section_headers (file)
   if (! do_sections)
     return 1;
 
-  printf (_("\nSection Header%s:\n"), elf_header.e_shnum > 1 ? "s" : "");
+  if (elf_header.e_shnum > 1)
+    printf (_("\nSection Headers:\n"));
+  else
+    printf (_("\nSection Header:\n"));
 
   if (is_32bit_elf)
     printf
@@ -3548,7 +3553,7 @@ process_relocs (file)
 	      if (string_table == NULL)
 		printf ("%d", section->sh_name);
 	      else
-		printf ("'%s'", SECTION_NAME (section));
+		printf (_("'%s'"), SECTION_NAME (section));
 
 	      printf (_(" at offset 0x%lx contains %lu entries:\n"),
 		 rel_offset, (unsigned long) (rel_size / section->sh_entsize));
@@ -3981,7 +3986,7 @@ process_unwind (file)
 	  if (string_table == NULL)
 	    printf ("%d", unwsec->sh_name);
 	  else
-	    printf ("'%s'", SECTION_NAME (unwsec));
+	    printf (_("'%s'"), SECTION_NAME (unwsec));
 	}
       else
 	{
@@ -3995,7 +4000,7 @@ process_unwind (file)
 	  if (string_table == NULL)
 	    printf ("%d", unwsec->sh_name);
 	  else
-	    printf ("'%s'", SECTION_NAME (unwsec));
+	    printf (_("'%s'"), SECTION_NAME (unwsec));
 
 	  printf (_(" at offset 0x%lx contains %lu entries:\n"),
 		  (unsigned long) unwsec->sh_offset,
@@ -9227,7 +9232,7 @@ process_mips_specific (file)
 
       if (dynamic_symbols == NULL)
 	{
-	  error (_("conflict list with without table"));
+	  error (_("conflict list found without a dynamic symbol table"));
 	  return 0;
 	}
 
@@ -9310,7 +9315,7 @@ get_note_type (e_type)
     case NT_PSINFO:	return _("NT_PSINFO (psinfo structure)");
     case NT_LWPSTATUS:	return _("NT_LWPSTATUS (lwpstatus_t structure)");
     case NT_LWPSINFO:	return _("NT_LWPSINFO (lwpsinfo_t structure)");
-    case NT_WIN32PSTATUS: return _("NT_WIN32PSTATUS (win32_pstatus strcuture)");
+    case NT_WIN32PSTATUS: return _("NT_WIN32PSTATUS (win32_pstatus structure)");
     default:
       sprintf (buff, _("Unknown note type: (0x%08x)"), e_type);
       return buff;