Fixes to improve the ability to translate messages in the binutils tools

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1e6ba98..6d4a5bb 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-05  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * elf32-arm.h (elf32_arm_merge_private_bfd_data): Combine
+       fragmented sentence parts into a whole sentence to permit
+       better translation into foreign languages.
+
 2001-12-06  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * configure: Regenerate.

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 6bd1fbb..3ef2c19 100644 (file)
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -2282,14 +2282,20 @@ Error: %s uses %s floating point, whereas %s uses %s floating point"),
       /* Interworking mismatch is only a warning.  */
       if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
        {
-         char *s1 = (in_flags & EF_ARM_INTERWORK
-                     ? _("supports") : _("does not support"));
-         char *s2 = out_flags & EF_ARM_INTERWORK ? _("does") : _("does not");
-
-         _bfd_error_handler (_("\
-Warning: %s %s interworking, whereas %s %s"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
+         if (in_flags & EF_ARM_INTERWORK)
+           {
+             _bfd_error_handler (_("\
+Warning: %s supports interworking, whereas %s does not"),
+                                 bfd_archive_filename (ibfd),
+                                 bfd_get_filename (obfd));    
+           }
+         else
+           {
+             _bfd_error_handler (_("\
+Warning: %s does not support interworking, whereas %s does"),
+                                 bfd_archive_filename (ibfd),
+                                 bfd_get_filename (obfd));
+           }
        }
     }
 

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7fe3154..3a9cbf5 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-05  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * dllwrap.c (main) Replace multiple strings describing a
+       single error with a single, newline escaped sentence to permit
+       better translation into foreign languages.
+
+       * readelf.c (get_elf_class): Remove internalionalisation of ELF
+       class names.
+
 2001-12-04  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
        * strings.c (get_char): Initialize value.

diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index fb92cb2..f90ab7f 100644 (file)
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -849,8 +849,8 @@ main (argc, argv)
       delete_def_file = 1;
       free (fileprefix);
       delete_def_file = 1;
-      warn (_("no export definition file provided"));
-      warn (_("creating one, but that may not be what you want"));
+      warn (_("no export definition file provided.\n\
+Creating one, but that may not be what you want"));
     }
   
   /* set the target platform. */

diff --git a/binutils/readelf.c b/binutils/readelf.c
index a566cd2..9030639 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2318,8 +2318,8 @@ get_elf_class (elf_class)
   switch (elf_class)
     {
     case ELFCLASSNONE: return _("none");
-    case ELFCLASS32:   return _("ELF32");
-    case ELFCLASS64:   return _("ELF64");
+    case ELFCLASS32:   return "ELF32";
+    case ELFCLASS64:   return "ELF64";
     default:
       sprintf (buff, _("<unknown: %x>"), elf_class);
       return buff;
@@ -2351,20 +2351,20 @@ get_osabi_name (osabi)
 
   switch (osabi)
     {
-    case ELFOSABI_NONE:       return _("UNIX - System V");
-    case ELFOSABI_HPUX:       return _("UNIX - HP-UX");
-    case ELFOSABI_NETBSD:     return _("UNIX - NetBSD");
-    case ELFOSABI_LINUX:      return _("UNIX - Linux");
-    case ELFOSABI_HURD:       return _("GNU/Hurd");
-    case ELFOSABI_SOLARIS:    return _("UNIX - Solaris");
-    case ELFOSABI_AIX:        return _("UNIX - AIX");
-    case ELFOSABI_IRIX:       return _("UNIX - IRIX");
-    case ELFOSABI_FREEBSD:    return _("UNIX - FreeBSD");
-    case ELFOSABI_TRU64:      return _("UNIX - TRU64");
-    case ELFOSABI_MODESTO:    return _("Novell - Modesto");
-    case ELFOSABI_OPENBSD:    return _("UNIX - OpenBSD");
+    case ELFOSABI_NONE:       return "UNIX - System V";
+    case ELFOSABI_HPUX:       return "UNIX - HP-UX";
+    case ELFOSABI_NETBSD:     return "UNIX - NetBSD";
+    case ELFOSABI_LINUX:      return "UNIX - Linux";
+    case ELFOSABI_HURD:       return "GNU/Hurd";
+    case ELFOSABI_SOLARIS:    return "UNIX - Solaris";
+    case ELFOSABI_AIX:        return "UNIX - AIX";
+    case ELFOSABI_IRIX:       return "UNIX - IRIX";
+    case ELFOSABI_FREEBSD:    return "UNIX - FreeBSD";
+    case ELFOSABI_TRU64:      return "UNIX - TRU64";
+    case ELFOSABI_MODESTO:    return "Novell - Modesto";
+    case ELFOSABI_OPENBSD:    return "UNIX - OpenBSD";
     case ELFOSABI_STANDALONE: return _("Standalone App");
-    case ELFOSABI_ARM:        return _("ARM");
+    case ELFOSABI_ARM:        return "ARM";
     default:
       sprintf (buff, _("<unknown: %x>"), osabi);
       return buff;
@@ -2706,7 +2706,7 @@ process_program_headers (file)
 
   if (loadaddr == -1)
     {
-      /* Very strange. */
+      /* Very strange.  */
       loadaddr = 0;
     }
 
@@ -3018,7 +3018,7 @@ process_section_headers (file)
     }
 
   /* Scan the sections for the dynamic symbol table
-     and dynamic string table and debug sections. */
+     and dynamic string table and debug sections.  */
   dynamic_symbols = NULL;
   dynamic_strings = NULL;
   dynamic_syminfo = NULL;
@@ -3190,10 +3190,10 @@ process_section_headers (file)
        }
     }
 
-  printf (_("Key to Flags:\n"));
-  printf (_("  W (write), A (alloc), X (execute), M (merge), S (strings)\n"));
-  printf (_("  I (info), L (link order), G (group), x (unknown)\n"));
-  printf (_("  O (extra OS processing required) o (OS specific), p (processor specific)\n"));
+  printf (_("Key to Flags:\n\
+  W (write), A (alloc), X (execute), M (merge), S (strings)\n\
+  I (info), L (link order), G (group), x (unknown)\n\
+  O (extra OS processing required) o (OS specific), p (processor specific)\n"));
 
   return 1;
 }
@@ -4047,7 +4047,7 @@ process_dynamic_segment (file)
          /* Since we do not know how big the symbol table is,
             we default to reading in the entire file (!) and
             processing that.  This is overkill, I know, but it
-            should work. */
+            should work.  */
          offset = entry->d_un.d_val - loadaddr;
 
          if (fseek (file, 0, SEEK_END))
@@ -4086,7 +4086,7 @@ process_dynamic_segment (file)
          /* Since we do not know how big the string table is,
             we default to reading in the entire file (!) and
             processing that.  This is overkill, I know, but it
-            should work. */
+            should work.  */
 
          offset = entry->d_un.d_val - loadaddr;
          if (fseek (file, 0, SEEK_END))
@@ -5107,7 +5107,7 @@ get_dynamic_data (file, number)
   return i_data;
 }
 
-/* Dump the symbol table */
+/* Dump the symbol table.  */
 static int
 process_symbol_table (file)
      FILE * file;
@@ -7190,7 +7190,7 @@ read_and_display_attr_value (attribute, form, data, cu_offset, pointer_size)
       break;
 
     case DW_FORM_indirect:
-      /* handled above */
+      /* Handled above.  */
       break;
 
     default:
@@ -8933,7 +8933,7 @@ get_note_type (e_type)
    terminated, and namesz includes the terminating null byte.
    I.E. the value of namesz for the name "FSF" is 4.
 
-   If the value of namesz is zero, there is no name present. */
+   If the value of namesz is zero, there is no name present.  */
 static int
 process_note (pnote)
   Elf32_Internal_Note * pnote;
@@ -9156,8 +9156,8 @@ get_file_header (file)
         overwritting things.  */
       if (sizeof (bfd_vma) < 8)
        {
-         error (_("This instance of readelf has been built without support for a\n"));
-         error (_("64 bit data type and so it cannot read 64 bit ELF files.\n"));
+         error (_("This instance of readelf has been built without support for a\n\
+64 bit data type and so it cannot read 64 bit ELF files.\n"));
          return 0;
        }
 
@@ -9289,7 +9289,7 @@ process_file (file_name)
 #ifdef SUPPORT_DISASSEMBLY
 /* Needed by the i386 disassembler.  For extra credit, someone could
    fix this so that we insert symbolic addresses here, esp for GOT/PLT
-   symbols */
+   symbols.  */
 
 void
 print_address (unsigned int addr, FILE * outfile)
@@ -9297,7 +9297,7 @@ print_address (unsigned int addr, FILE * outfile)
   fprintf (outfile,"0x%8.8x", addr);
 }
 
-/* Needed by the i386 disassembler. */
+/* Needed by the i386 disassembler.  */
 void
 db_task_printsym (unsigned int addr)
 {

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a3e238b..4381547 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-05  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * emultempl/pe.em (..._list_options): Replace multiple fprintf
+       statements describing a single option with a single, newline
+       escaped fprintf.  This allows better translation into other
+       languages.
+        
+        * ldmain.c (add_archive_element): Combine multiple strings
+        into a single string to permit better translation into other
+        languages.
+
 2001-12-05  Tom Rix  <trix@redhat.com>
 
        * Makefile.am: Remove eaixppc64.

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 8b3919c..49e946b 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -338,19 +338,19 @@ gld_${EMULATION_NAME}_list_options (file)
   fprintf (file, _("  --out-implib <file>                Generate import library\n"));
   fprintf (file, _("  --output-def <file>                Generate a .DEF file for the built DLL\n"));
   fprintf (file, _("  --warn-duplicate-exports           Warn about duplicate exports.\n"));
-  fprintf (file, _("  --compat-implib                    Create backward compatible import libs;\n"));
-  fprintf (file, _("                                       create __imp_<SYMBOL> as well.\n"));
-  fprintf (file, _("  --enable-auto-image-base           Automatically choose image base for DLLs\n"));
-  fprintf (file, _("                                       unless user specifies one\n"));
+  fprintf (file, _("  --compat-implib                    Create backward compatible import libs;\n\
+                                       create __imp_<SYMBOL> as well.\n"));
+  fprintf (file, _("  --enable-auto-image-base           Automatically choose image base for DLLs\n\
+                                       unless user specifies one\n"));
   fprintf (file, _("  --disable-auto-image-base          Do not auto-choose image base. (default)\n"));
-  fprintf (file, _("  --dll-search-prefix=<string>       When linking dynamically to a dll witout an\n"));
-  fprintf (file, _("                                       importlib, use <string><basename>.dll \n"));
-  fprintf (file, _("                                       in preference to lib<basename>.dll \n"));
-  fprintf (file, _("  --enable-auto-import               Do sophistcated linking of _sym to \n"));
-  fprintf (file, _("                                       __imp_sym for DATA references\n"));
+  fprintf (file, _("  --dll-search-prefix=<string>       When linking dynamically to a dll witout an\n\
+                                       importlib, use <string><basename>.dll \n\
+                                       in preference to lib<basename>.dll \n"));
+  fprintf (file, _("  --enable-auto-import               Do sophistcated linking of _sym to \n\
+                                       __imp_sym for DATA references\n"));
   fprintf (file, _("  --disable-auto-import              Do not auto-import DATA items from DLLs\n"));
-  fprintf (file, _("  --enable-extra-pe-debug            Enable verbose debug output when building\n"));
-  fprintf (file, _("                                       or linking to DLLs (esp. auto-import)\n"));
+  fprintf (file, _("  --enable-extra-pe-debug            Enable verbose debug output when building\n\
+                                       or linking to DLLs (esp. auto-import)\n"));
 #endif
 }
 

diff --git a/ld/ldmain.c b/ld/ldmain.c
index eacc739..e9fcc6a 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -836,8 +836,7 @@ add_archive_element (info, abfd, name)
        {
          char buf[100];
 
-         sprintf (buf, "%-29s %s\n\n", _("Archive member included"),
-                  _("because of file (symbol)"));
+         sprintf (buf, _("Archive member included because of file (symbol)\n\n"));
          minfo ("%s", buf);
          header_printed = true;
        }