OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for better translation into other languages

Browse Source
This commit is contained in:
Nick Clifton 2002-01-30 16:07:28 +00:00
parent ae1a89b7c4
commit ca09e32bb2
9 changed files with 509 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bfd/ChangeLog
View File

@ -1,3 +1,30 @@
2002-01-30 Nick Clifton <nickc@cambridge.redhat.com>
* vms-tir.c (cmd_name): New function.
(tir_cmd_name): New function.
(etir_sta, etir_sto, etir_opr, etir_stc): Use cmd_name().
(tir_opr, tir_ctl, tir_cmd): use tir_cmd_name().
Fix formatting.
* peXXigen.c (pe_print_idata): Rearrange message to aid in
translation.
(pe_print_pdata): Rearrange message to aid in translation.
* libbfd.c (warn_deprecated): Rearrange error message to aid in
translation.
* ihex.c (ihex_write_object_contents): Fix spelling typo.
* ieee.c (ieee_slurp_external_symbols): Remove spurious space.
* elf64-sparc.c (sparc64_elf_add_symbol_hook): Rearrange error
message to aid in translation.
* elf64-mmix.c (mmix_final_link_relocate): Rearrange error message
to aid in translation.
* elf32-arm.h (elf32_arm_merge_private_bfd_data): Fix typo.
2002-30-01 Philipp Thomas <pthomas@suse.de> 2002-30-01 Philipp Thomas <pthomas@suse.de>
* coff-arm.c, elf32-elf.h: Unify messages. * coff-arm.c, elf32-elf.h: Unify messages.

4
bfd/elf32-arm.h
View File

@ -2301,12 +2301,12 @@ Error: %s passes floats in integer registers, whereas %s passes them in FP regis
{ {
if (in_flags & EF_ARM_VFP_FLOAT) if (in_flags & EF_ARM_VFP_FLOAT)
_bfd_error_handler (_("\ _bfd_error_handler (_("\
Error: %s uses VFP instructions, whereas %s FPA instructions"), Error: %s uses VFP instructions, whereas %s uses FPA instructions"),
bfd_archive_filename (ibfd), bfd_archive_filename (ibfd),
bfd_get_filename (obfd)); bfd_get_filename (obfd));
else else
_bfd_error_handler (_("\ _bfd_error_handler (_("\
Error: %s uses FPA instructions, whereas %s VFP instructions"), Error: %s uses FPA instructions, whereas %s uses VFP instructions"),
bfd_archive_filename (ibfd), bfd_archive_filename (ibfd),
bfd_get_filename (obfd)); bfd_get_filename (obfd));

17
bfd/elf64-mmix.c
View File

@ -1264,11 +1264,18 @@ mmix_final_link_relocate (howto, input_section, contents,
} }
else else
{ {
(*_bfd_error_handler) /* Note: This is seperated out into two messages in order
(_("%s: register relocation against non-register symbol: %s in %s"), to ease the translation into other languages. */
bfd_get_filename (input_section->owner), if (symname == NULL || *symname == 0)
symname == NULL || *symname == 0 ? _("(unknown)") : symname, (*_bfd_error_handler)
bfd_get_section_name (symsec->owner, symsec)); (_("%s: register relocation against non-register symbol: (unknown) in %s"),
bfd_get_filename (input_section->owner),
bfd_get_section_name (symsec->owner, symsec));
else
(*_bfd_error_handler)
(_("%s: register relocation against non-register symbol: %s in %s"),
bfd_get_filename (input_section->owner), symname,
bfd_get_section_name (symsec->owner, symsec));
/* The bfd_reloc_outofrange return value, though intuitively a /* The bfd_reloc_outofrange return value, though intuitively a
better value, will not get us an error. */ better value, will not get us an error. */

20
bfd/elf64-sparc.c
View File

@ -1331,11 +1331,9 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
if (p->name != NULL && strcmp (p->name, *namep)) if (p->name != NULL && strcmp (p->name, *namep))
{ {
(*_bfd_error_handler) (*_bfd_error_handler)
(_("Register %%g%d used incompatibly: %s in %s"), (_("Register %%g%d used incompatibly: %s in %s, previously %s in %s"),
(int) sym->st_value, (int) sym->st_value,
**namep ? *namep : "#scratch", bfd_archive_filename (abfd)); **namep ? *namep : "#scratch", bfd_archive_filename (abfd),
(*_bfd_error_handler)
(_(" previously %s in %s"),
*p->name ? p->name : "#scratch", bfd_archive_filename (p->abfd)); *p->name ? p->name : "#scratch", bfd_archive_filename (p->abfd));
return false; return false;
} }
@ -1356,10 +1354,8 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
if (type > STT_FUNC) if (type > STT_FUNC)
type = 0; type = 0;
(*_bfd_error_handler) (*_bfd_error_handler)
(_("Symbol `%s' has differing types: %s in %s"), (_("Symbol `%s' has differing types: REGISTER in %s, previously %s in %s"),
*namep, "REGISTER", bfd_archive_filename (abfd)); *namep, bfd_archive_filename (abfd),
(*_bfd_error_handler)
(_(" previously %s in %s"),
stt_types[type], bfd_archive_filename (p->abfd)); stt_types[type], bfd_archive_filename (p->abfd));
return false; return false;
} }
@ -1405,11 +1401,9 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
if (type > STT_FUNC) if (type > STT_FUNC)
type = 0; type = 0;
(*_bfd_error_handler) (*_bfd_error_handler)
(_("Symbol `%s' has differing types: %s in %s"), (_("Symbol `%s' has differing types: %s in %s, previously REGISTER in %s"),
*namep, stt_types[type], bfd_archive_filename (abfd)); *namep, stt_types[type], bfd_archive_filename (abfd),
(*_bfd_error_handler) bfd_archive_filename (p->abfd));
(_(" previously %s in %s"),
"REGISTER", bfd_archive_filename (p->abfd));
return false; return false;
} }
} }

28
bfd/ieee.c
View File

@ -1,25 +1,25 @@
/* BFD back-end for ieee-695 objects. /* BFD back-end for ieee-695 objects.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001 2000, 2001, 2002
Free Software Foundation, Inc. Free Software Foundation, Inc.
Written by Steve Chamberlain of Cygnus Support. Written by Steve Chamberlain of Cygnus Support.
This file is part of BFD, the Binary File Descriptor library. This file is part of BFD, the Binary File Descriptor library.
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define KEEPMINUSPCININST 0 #define KEEPMINUSPCININST 0
@ -874,7 +874,7 @@ ieee_slurp_external_symbols (abfd)
break; break;
default: default:
(*_bfd_error_handler) (*_bfd_error_handler)
(_("%s: unimplemented ATI record %u for symbol %u"), (_("%s: unimplemented ATI record %u for symbol %u"),
bfd_archive_filename (abfd), symbol_attribute_def, bfd_archive_filename (abfd), symbol_attribute_def,
symbol_name_index); symbol_name_index);
bfd_set_error (bfd_error_bad_value); bfd_set_error (bfd_error_bad_value);

2
bfd/ihex.c
View File

@ -860,7 +860,7 @@ ihex_write_object_contents (abfd)
sprintf_vma (buf, where); sprintf_vma (buf, where);
(*_bfd_error_handler) (*_bfd_error_handler)
(_("%s: address 0x%s out of range for Intex Hex file"), (_("%s: address 0x%s out of range for Intel Hex file"),
bfd_get_filename (abfd), buf); bfd_get_filename (abfd), buf);
bfd_set_error (bfd_error_bad_value); bfd_set_error (bfd_error_bad_value);
return false; return false;

35
bfd/libbfd.c
View File

@ -1,24 +1,24 @@
/* Assorted BFD support routines, only used internally. /* Assorted BFD support routines, only used internally.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001 2000, 2001, 2002
Free Software Foundation, Inc. Free Software Foundation, Inc.
Written by Cygnus Support. Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library. This file is part of BFD, the Binary File Descriptor library.
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h" #include "bfd.h"
#include "sysdep.h" #include "sysdep.h"
@ -1448,6 +1448,7 @@ _bfd_generic_verify_endian_match (ibfd, obfd)
/* Give a warning at runtime if someone compiles code which calls /* Give a warning at runtime if someone compiles code which calls
old routines. */ old routines. */
void void
warn_deprecated (what, file, line, func) warn_deprecated (what, file, line, func)
const char *what; const char *what;
@ -1460,11 +1461,13 @@ warn_deprecated (what, file, line, func)
if (~(size_t) func & ~mask) if (~(size_t) func & ~mask)
{ {
fprintf (stderr, _("Deprecated %s called"), what); /* Note: seperate sentances in order to allow
for translation into other languages. */
if (func) if (func)
fprintf (stderr, _(" at %s line %d in %s\n"), file, line, func); fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"),
what, file, line, func);
else else
fprintf (stderr, "\n"); fprintf (stderr, _("Deprecated %s called\n"), what);
mask |= ~(size_t) func; mask |= ~(size_t) func;
} }
} }

21
bfd/peXXigen.c
View File

@ -1,5 +1,5 @@
/* Support for the generic parts of PE/PEI; the common executable parts. /* Support for the generic parts of PE/PEI; the common executable parts.
Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc. Free Software Foundation, Inc.
Written by Cygnus Solutions. Written by Cygnus Solutions.
@ -22,8 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>. /* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.
PE/PEI rearrangement (and code added): Donn Terry PE/PEI rearrangement (and code added): Donn Terry
Softway Systems, Inc. Softway Systems, Inc. */
*/
/* Hey look, some documentation [and in a place you expect to find it]! /* Hey look, some documentation [and in a place you expect to find it]!
@ -51,8 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
FIXME: Please add more docs here so the next poor fool that has to hack FIXME: Please add more docs here so the next poor fool that has to hack
on this code has a chance of getting something accomplished without on this code has a chance of getting something accomplished without
wasting too much time. wasting too much time. */
*/
/* This expands into COFF_WITH_pe or COFF_WITH_pep depending on whether /* This expands into COFF_WITH_pe or COFF_WITH_pep depending on whether
we're compiling for straight PE or PE+. */ we're compiling for straight PE or PE+. */
@ -1129,9 +1127,9 @@ pe_print_idata (abfd, vfile)
_("\nThe Import Tables (interpreted %s section contents)\n"), _("\nThe Import Tables (interpreted %s section contents)\n"),
section->name); section->name);
fprintf (file, fprintf (file,
_(" vma: Hint Time Forward DLL First\n")); _("\
fprintf (file, vma: Hint Time Forward DLL First\n\
_(" Table Stamp Chain Name Thunk\n")); Table Stamp Chain Name Thunk\n"));
amt = dataoff + datasize; amt = dataoff + datasize;
data = (bfd_byte *) bfd_malloc (amt); data = (bfd_byte *) bfd_malloc (amt);
@ -1539,10 +1537,9 @@ pe_print_pdata (abfd, vfile)
fprintf (file, fprintf (file,
_(" vma:\t\t\tBegin Address End Address Unwind Info\n")); _(" vma:\t\t\tBegin Address End Address Unwind Info\n"));
#else #else
fprintf (file, fprintf (file, _("\
_(" vma:\t\tBegin End EH EH PrologEnd Exception\n")); vma:\t\tBegin End EH EH PrologEnd Exception\n\
fprintf (file, \t\tAddress Address Handler Data Address Mask\n"));
_(" \t\tAddress Address Handler Data Address Mask\n"));
#endif #endif
datasize = bfd_section_size (abfd, section); datasize = bfd_section_size (abfd, section);

953
bfd/vms-tir.c
View File

File diff suppressed because it is too large Load Diff