aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2001-12-06 10:22:36 +0000
committerNick Clifton <nickc@redhat.com>2001-12-06 10:22:36 +0000
commite3c8793a40881c55503b889833d60343ab61584a (patch)
tree12b861d897a5a6283af79fdf583349e914c8cae5 /bfd
parent284a190e5223c2b011878741af6b12178b1da66f (diff)
downloadgdb-e3c8793a40881c55503b889833d60343ab61584a.zip
gdb-e3c8793a40881c55503b889833d60343ab61584a.tar.gz
gdb-e3c8793a40881c55503b889833d60343ab61584a.tar.bz2
Fixes to improve the ability to translate messages in the binutils tools
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-arm.h22
2 files changed, 20 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1e6ba98..6d4a5bb 100644
--- 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
--- 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));
+ }
}
}