From 424a39a881486b9e3f5883a4f3996cc38c4f36d6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 6 Dec 2001 10:22:36 +0000 Subject: [PATCH] Fixes to improve the ability to translate messages in the binutils tools --- bfd/ChangeLog | 6 ++++++ bfd/elf32-arm.h | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1e6ba986c0..6d4a5bb565 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2001-12-05 Nick Clifton + + * 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 * configure: Regenerate. diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index 6bd1fbb5cd..3ef2c197d9 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)); + } } } -- 2.11.0