Import of Binutils 2.10 snapshot.

1 files changed, 17 insertions, 13 deletions

diff --git a/contrib/binutils/gas/messages.c b/contrib/binutils/gas/messages.c
index 7dc399d..e4b7ad0 100644
--- a/contrib/binutils/gas/messages.c
+++ b/contrib/binutils/gas/messages.c
@@ -102,7 +102,7 @@ identify (file)
 
   if (file)
     fprintf (stderr, "%s: ", file);
-  fprintf (stderr, "Assembler messages:\n");
+  fprintf (stderr, _("Assembler messages:\n"));
 }
 
 static int warning_count;	/* Count of number of warnings issued */
@@ -219,7 +219,7 @@ as_warn_internal (file, line, buffer)
   identify (file);
   if (file)
     fprintf (stderr, "%s:%u: ", file, line);
-  fprintf (stderr, "Warning: ");
+  fprintf (stderr, _("Warning: "));
   fputs (buffer, stderr);
   (void) putc ('\n', stderr);
 #ifndef NO_LISTING
@@ -328,7 +328,7 @@ as_bad_internal (file, line, buffer)
   identify (file);
   if (file)
     fprintf (stderr, "%s:%u: ", file, line);
-  fprintf (stderr, "Error: ");
+  fprintf (stderr, _("Error: "));
   fputs (buffer, stderr);
   (void) putc ('\n', stderr);
 #ifndef NO_LISTING
@@ -432,7 +432,7 @@ as_fatal (const char *format,...)
 
   as_show_where ();
   va_start (args, format);
-  fprintf (stderr, "Fatal error: ");
+  fprintf (stderr, _("Fatal error: "));
   vfprintf (stderr, format, args);
   (void) putc ('\n', stderr);
   va_end (args);
@@ -449,7 +449,7 @@ as_fatal (format, va_alist)
 
   as_show_where ();
   va_start (args);
-  fprintf (stderr, "Fatal error: ");
+  fprintf (stderr, _("Fatal error: "));
   vfprintf (stderr, format, args);
   (void) putc ('\n', stderr);
   va_end (args);
@@ -468,12 +468,13 @@ as_assert (file, line, fn)
      int line;
 {
   as_show_where ();
-  fprintf (stderr, "Internal error!\n");
-  fprintf (stderr, "Assertion failure");
+  fprintf (stderr, _("Internal error!\n"));
   if (fn)
-    fprintf (stderr, " in %s", fn);
-  fprintf (stderr, " at %s line %d.\n", file, line);
-  fprintf (stderr, "Please report this bug.\n");
+    fprintf (stderr, _("Assertion failure in %s at %s line %d.\n"),
+	     fn, file, line);
+  else
+    fprintf (stderr, _("Assertion failure at %s line %d.\n"), file, line);
+  fprintf (stderr, _("Please report this bug.\n"));
   xexit (EXIT_FAILURE);
 }
 
@@ -485,10 +486,13 @@ as_abort (file, line, fn)
      int line;
 {
   as_show_where ();
-  fprintf (stderr, "Internal error, aborting at %s line %d", file, line);
   if (fn)
-    fprintf (stderr, " in %s", fn);
-  fprintf (stderr, "\nPlease report this bug.\n");
+    fprintf (stderr, _("Internal error, aborting at %s line %d in %s\n"),
+	     file, line, fn);
+  else
+    fprintf (stderr, _("Internal error, aborting at %s line %d\n"),
+	     file, line);
+  fprintf (stderr, _("Please report this bug.\n"));
   xexit (EXIT_FAILURE);
 }