Fix an illegal memory access when copying a PE format file with corrupt debug information.

	PR 23110
	* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Check for
	a negative PE_DEBUG_DATA size before iterating over the debug data.

3 files changed, 2662 insertions, 2984 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3c26f8a..32cd893 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-24  Nick Clifton  <nickc@redhat.com>
+
+	PR 23110
+	* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Check for
+	a negative PE_DEBUG_DATA size before iterating over the debug data.
+
 2018-04-23  Alan Modra  <amodra@gmail.com>
 
 	* elf-linux-core.h: Revert last change.
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index bc97984..32ce195 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -2993,6 +2993,15 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd)
 		 (uint64_t) (section->size - (addr - section->vma)));
 	      return FALSE;
 	    }
+	  /* PR 23110.  */
+	  else if (ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size < 0)
+	    {
+	      /* xgettext:c-format */
+	      _bfd_error_handler
+		(_("%pB: Data Directory size (%#lx) is negative"),
+		 obfd, ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size);
+	      return FALSE;
+	    }
 
 	  for (i = 0; i < ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size
 		 / sizeof (struct external_IMAGE_DEBUG_DIRECTORY); i++)
diff --git a/bfd/po/bfd.pot b/bfd/po/bfd.pot
index 91c21b2..a6b2adb 100644
--- a/bfd/po/bfd.pot
+++ b/bfd/po/bfd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2018-01-13 13:45+0000\n"
+"POT-Creation-Date: 2018-04-24 11:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,175 +18,214 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: aout-adobe.c:126
-#, c-format
-msgid "%B: Unknown section type in a.out.adobe file: %x\n"
-msgstr ""
-
 #: aout-cris.c:200
 #, c-format
-msgid "%B: Invalid relocation type exported: %d"
+msgid "%pB: unsupported relocation type exported: %#x"
 msgstr ""
 
 #: aout-cris.c:244
 #, c-format
-msgid "%B: Invalid relocation type imported: %d"
+msgid "%pB: unsupported relocation type imported: %#x"
 msgstr ""
 
 #: aout-cris.c:256
 #, c-format
-msgid "%B: Bad relocation record imported: %d"
+msgid "%pB: bad relocation record imported: %d"
 msgstr ""
 
-#: aoutx.h:1284 aoutx.h:1636 pdp11.c:1152 pdp11.c:1413
+#: aoutx.h:1264 aoutx.h:1617 pdp11.c:1138 pdp11.c:1399
 #, c-format
-msgid "%B: can not represent section `%A' in a.out object file format"
+msgid "%pB: can not represent section `%pA' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1600 pdp11.c:1385
+#: aoutx.h:1581 pdp11.c:1371
 #, c-format
 msgid ""
-"%B: can not represent section for symbol `%s' in a.out object file format"
+"%pB: can not represent section for symbol `%s' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1603 vms-alpha.c:7853
+#: aoutx.h:1584 vms-alpha.c:7854
 msgid "*unknown*"
 msgstr ""
 
-#: aoutx.h:2422 aoutx.h:2440
-msgid "%B: attempt to write out unknown reloc type"
+#: aoutx.h:1720
+#, c-format
+msgid "%pB: invalid string offset %<PRIu64> >= %<PRIu64>"
 msgstr ""
 
-#: aoutx.h:4093 aoutx.h:4414
-msgid "%P: %B: unexpected relocation type\n"
+#: aoutx.h:2411 aoutx.h:2429
+#, c-format
+msgid "%pB: attempt to write out unknown reloc type"
 msgstr ""
 
-#: aoutx.h:5440 pdp11.c:3708
+#: aoutx.h:4084
 #, c-format
-msgid "%B: relocatable link from %s to %s not supported"
+msgid "%pB: unsupported relocation type"
 msgstr ""
 
-#: archive.c:2305
-msgid "Warning: writing archive was slow: rewriting timestamp\n"
+#. Unknown relocation.
+#: aoutx.h:4405 coff-alpha.c:601 coff-alpha.c:1514 coff-rs6000.c:2773
+#: coff-sh.c:504 coff-tic4x.c:184 coff-tic54x.c:279 elf-hppa.h:1040
+#: elf-hppa.h:1068 elf-m10200.c:226 elf-m10300.c:812 elf32-arc.c:519
+#: elf32-arm.c:1852 elf32-avr.c:959 elf32-bfin.c:1061 elf32-bfin.c:4698
+#: elf32-cr16.c:653 elf32-cr16.c:683 elf32-cr16c.c:186 elf32-cris.c:467
+#: elf32-crx.c:429 elf32-d10v.c:234 elf32-d30v.c:522 elf32-d30v.c:544
+#: elf32-dlx.c:548 elf32-epiphany.c:376 elf32-fr30.c:381 elf32-frv.c:2558
+#: elf32-frv.c:6262 elf32-ft32.c:306 elf32-h8300.c:302 elf32-i386.c:401
+#: elf32-ip2k.c:1245 elf32-iq2000.c:442 elf32-lm32.c:539 elf32-m32c.c:305
+#: elf32-m32r.c:1286 elf32-m32r.c:1311 elf32-m32r.c:2417 elf32-m68hc11.c:390
+#: elf32-m68hc12.c:510 elf32-m68k.c:352 elf32-mcore.c:354 elf32-mcore.c:440
+#: elf32-mep.c:389 elf32-metag.c:878 elf32-microblaze.c:692
+#: elf32-microblaze.c:969 elf32-mips.c:2229 elf32-moxie.c:137
+#: elf32-msp430.c:648 elf32-msp430.c:658 elf32-mt.c:241 elf32-nds32.c:2880
+#: elf32-nds32.c:2904 elf32-nds32.c:4423 elf32-nios2.c:3015 elf32-or1k.c:715
+#: elf32-pj.c:325 elf32-ppc.c:2061 elf32-ppc.c:2074 elf32-pru.c:420
+#: elf32-rl78.c:292 elf32-rx.c:314 elf32-rx.c:323 elf32-s390.c:347
+#: elf32-sh.c:438 elf32-spu.c:160 elf32-tic6x.c:1508 elf32-tic6x.c:1518
+#: elf32-tic6x.c:1537 elf32-tic6x.c:1547 elf32-tic6x.c:2642 elf32-tilepro.c:803
+#: elf32-v850.c:1899 elf32-v850.c:1921 elf32-v850.c:4270 elf32-vax.c:290
+#: elf32-visium.c:482 elf32-wasm32.c:106 elf32-xc16x.c:241 elf32-xgate.c:428
+#: elf32-xstormy16.c:395 elf32-xtensa.c:454 elf32-xtensa.c:488
+#: elf64-alpha.c:1112 elf64-alpha.c:4101 elf64-alpha.c:4249
+#: elf64-ia64-vms.c:254 elf64-ia64-vms.c:3440 elf64-mips.c:3623
+#: elf64-mips.c:3639 elf64-mmix.c:1264 elf64-ppc.c:2281 elf64-ppc.c:2555
+#: elf64-ppc.c:2564 elf64-s390.c:328 elf64-s390.c:378 elf64-x86-64.c:285
+#: elfn32-mips.c:3451 elfxx-ia64.c:325 elfxx-riscv.c:955 elfxx-sparc.c:589
+#: elfxx-sparc.c:639 elfxx-sparc.c:661 elfxx-tilegx.c:912 elfxx-tilegx.c:952
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2126
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2224 elf32-ia64.c:211
+#: elf32-ia64.c:3863 elf64-ia64.c:211 elf64-ia64.c:3863
+#, c-format
+msgid "%pB: unsupported relocation type %#x"
+msgstr ""
+
+#: aoutx.h:5432 pdp11.c:3694
+#, c-format
+msgid "%pB: relocatable link from %s to %s not supported"
+msgstr ""
+
+#: archive.c:2216
+msgid "warning: writing archive was slow: rewriting timestamp"
+msgstr ""
+
+#: archive.c:2332 linker.c:1416
+#, c-format
+msgid "%pB: plugin needed to handle lto object"
+msgstr ""
+
+#: archive.c:2561
+msgid "Reading archive file mod timestamp"
 msgstr ""
 
-#: archive.c:2421 linker.c:1410
-msgid "%B: plugin needed to handle lto object"
+#: archive.c:2585
+msgid "Writing updated armap timestamp"
 msgstr ""
 
-#: archive.c:2650
-msgid "Reading archive file mod timestamp"
+#: bfd.c:448
+msgid "no error"
 msgstr ""
 
-#: archive.c:2674
-msgid "Writing updated armap timestamp"
+#: bfd.c:449
+msgid "system call error"
+msgstr ""
+
+#: bfd.c:450
+msgid "invalid bfd target"
+msgstr ""
+
+#: bfd.c:451
+msgid "file in wrong format"
+msgstr ""
+
+#: bfd.c:452
+msgid "archive object file in wrong format"
+msgstr ""
+
+#: bfd.c:453
+msgid "invalid operation"
 msgstr ""
 
 #: bfd.c:454
-msgid "No error"
+msgid "memory exhausted"
 msgstr ""
 
 #: bfd.c:455
-msgid "System call error"
+msgid "no symbols"
 msgstr ""
 
 #: bfd.c:456
-msgid "Invalid bfd target"
+msgid "archive has no index; run ranlib to add one"
 msgstr ""
 
 #: bfd.c:457
-msgid "File in wrong format"
+msgid "no more archived files"
 msgstr ""
 
 #: bfd.c:458
-msgid "Archive object file in wrong format"
+msgid "malformed archive"
 msgstr ""
 
 #: bfd.c:459
-msgid "Invalid operation"
+msgid "DSO missing from command line"
 msgstr ""
 
 #: bfd.c:460
-msgid "Memory exhausted"
+msgid "file format not recognized"
 msgstr ""
 
 #: bfd.c:461
-msgid "No symbols"
+msgid "file format is ambiguous"
 msgstr ""
 
 #: bfd.c:462
-msgid "Archive has no index; run ranlib to add one"
+msgid "section has no contents"
 msgstr ""
 
 #: bfd.c:463
-msgid "No more archived files"
+msgid "nonrepresentable section on output"
 msgstr ""
 
 #: bfd.c:464
-msgid "Malformed archive"
+msgid "symbol needs debug section which does not exist"
 msgstr ""
 
 #: bfd.c:465
-msgid "DSO missing from command line"
+msgid "bad value"
 msgstr ""
 
 #: bfd.c:466
-msgid "File format not recognized"
+msgid "file truncated"
 msgstr ""
 
 #: bfd.c:467
-msgid "File format is ambiguous"
+msgid "file too big"
 msgstr ""
 
 #: bfd.c:468
-msgid "Section has no contents"
-msgstr ""
-
-#: bfd.c:469
-msgid "Nonrepresentable section on output"
-msgstr ""
-
-#: bfd.c:470
-msgid "Symbol needs debug section which does not exist"
-msgstr ""
-
-#: bfd.c:471
-msgid "Bad value"
-msgstr ""
-
-#: bfd.c:472
-msgid "File truncated"
-msgstr ""
-
-#: bfd.c:473
-msgid "File too big"
-msgstr ""
-
-#: bfd.c:474
 #, c-format
-msgid "Error reading %s: %s"
+msgid "error reading %s: %s"
 msgstr ""
 
-#: bfd.c:475
-msgid "#<Invalid error code>"
+#: bfd.c:469
+msgid "#<invalid error code>"
 msgstr ""
 
-#: bfd.c:1442
+#: bfd.c:1416
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr ""
 
-#: bfd.c:1455
+#: bfd.c:1429
 #, c-format
 msgid "BFD %s internal error, aborting at %s:%d in %s\n"
 msgstr ""
 
-#: bfd.c:1460
+#: bfd.c:1434
 #, c-format
 msgid "BFD %s internal error, aborting at %s:%d\n"
 msgstr ""
 
-#: bfd.c:1462
+#: bfd.c:1436
 msgid "Please report this bug.\n"
 msgstr ""
 
@@ -202,129 +241,110 @@ msgstr ""
 
 #: binary.c:276
 #, c-format
-msgid "warning: writing section `%A' at huge (ie negative) file offset"
-msgstr ""
-
-#: bout.c:1142 elf-m10300.c:2647 elf32-avr.c:2484 elf32-frv.c:5633
-#: elf64-ia64-vms.c:353 elfxx-sparc.c:2817 reloc.c:8059 reloc16.c:156
-#: elf32-ia64.c:351 elf64-ia64.c:351
-msgid "%P%F: --relax and -r may not be used together\n"
+msgid "warning: writing section `%pA' at huge (ie negative) file offset"
 msgstr ""
 
 #: cache.c:273
 #, c-format
-msgid "reopening %B: %s\n"
+msgid "reopening %pB: %s\n"
 msgstr ""
 
 #: coff-alpha.c:450
+#, c-format
 msgid ""
-"%B: Cannot handle compressed Alpha binaries.\n"
-"   Use compiler flags, or objZ, to generate uncompressed binaries."
+"%pB: cannot handle compressed Alpha binaries; use compiler flags, or objZ, "
+"to generate uncompressed binaries"
 msgstr ""
 
-#: coff-alpha.c:602
-msgid "%B: unknown/unsupported relocation type %d"
-msgstr ""
-
-#: coff-alpha.c:851 coff-alpha.c:888 coff-alpha.c:1961 coff-mips.c:950
+#: coff-alpha.c:850 coff-alpha.c:887 coff-alpha.c:1957 coff-mips.c:950
 msgid "GP relative relocation used when GP not defined"
 msgstr ""
 
-#: coff-alpha.c:1444
+#: coff-alpha.c:1443
 msgid "using multiple gp values"
 msgstr ""
 
-#: coff-alpha.c:1503
-msgid "%B: unsupported relocation: ALPHA_R_GPRELHIGH"
-msgstr ""
-
-#: coff-alpha.c:1510
-msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
-msgstr ""
-
-#: coff-alpha.c:1518 elf32-i370.c:1081 elf32-m32r.c:2404 elf32-microblaze.c:932
-#: elf64-alpha.c:4098 elf64-alpha.c:4246 elf64-ia64-vms.c:3430
-#: elf32-ia64.c:3847 elf64-ia64.c:3847
+#: coff-alpha.c:1501 coff-alpha.c:1507 elf.c:8972 elf32-mcore.c:100
+#: elf32-mcore.c:455 elf32-ppc.c:8751 elf32-ppc.c:9883 elf64-ppc.c:14922
 #, c-format
-msgid "%B: unknown relocation type %d"
+msgid "%pB: %s unsupported"
 msgstr ""
 
 #: coff-arm.c:1037
 #, c-format
-msgid "%B: unable to find THUMB glue '%s' for `%s'"
+msgid "%pB: unable to find THUMB glue '%s' for `%s'"
 msgstr ""
 
 #: coff-arm.c:1066
 #, c-format
-msgid "%B: unable to find ARM glue '%s' for `%s'"
+msgid "%pB: unable to find ARM glue '%s' for `%s'"
 msgstr ""
 
-#: coff-arm.c:1368 elf32-arm.c:8896
+#: coff-arm.c:1367
 #, c-format
 msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: arm call to thumb"
+"%pB(%s): warning: interworking not enabled; first occurrence: %pB: arm call "
+"to thumb"
 msgstr ""
 
-#: coff-arm.c:1458
+#: coff-arm.c:1457
 #, c-format
 msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: thumb call to arm\n"
-"  consider relinking with --support-old-code enabled"
+"%pB(%s): warning: interworking not enabled; first occurrence: %pB: thumb "
+"call to arm; consider relinking with --support-old-code enabled"
 msgstr ""
 
 #: coff-arm.c:1751 coff-tic80.c:672 cofflink.c:3127
 #, c-format
-msgid "%B: bad reloc address %#Lx in section `%A'"
+msgid "%pB: bad reloc address %#<PRIx64> in section `%pA'"
 msgstr ""
 
 #: coff-arm.c:2076
 #, c-format
-msgid "%B: illegal symbol index in reloc: %ld"
+msgid "%pB: illegal symbol index in reloc: %ld"
 msgstr ""
 
 #: coff-arm.c:2208
 #, c-format
-msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
+msgid "error: %pB is compiled for APCS-%d, whereas %pB is compiled for APCS-%d"
 msgstr ""
 
-#: coff-arm.c:2221 elf32-arm.c:19582
+#: coff-arm.c:2221 elf32-arm.c:19614
 #, c-format
 msgid ""
-"error: %B passes floats in float registers, whereas %B passes them in "
+"error: %pB passes floats in float registers, whereas %pB passes them in "
 "integer registers"
 msgstr ""
 
-#: coff-arm.c:2226 elf32-arm.c:19586
+#: coff-arm.c:2226 elf32-arm.c:19618
 #, c-format
 msgid ""
-"error: %B passes floats in integer registers, whereas %B passes them in "
+"error: %pB passes floats in integer registers, whereas %pB passes them in "
 "float registers"
 msgstr ""
 
 #: coff-arm.c:2238
 #, c-format
 msgid ""
-"error: %B is compiled as position independent code, whereas target %B is "
+"error: %pB is compiled as position independent code, whereas target %pB is "
 "absolute position"
 msgstr ""
 
 #: coff-arm.c:2243
 #, c-format
 msgid ""
-"error: %B is compiled as absolute position code, whereas target %B is "
+"error: %pB is compiled as absolute position code, whereas target %pB is "
 "position independent"
 msgstr ""
 
-#: coff-arm.c:2270 elf32-arm.c:19651
+#: coff-arm.c:2270 elf32-arm.c:19683
 #, c-format
-msgid "Warning: %B supports interworking, whereas %B does not"
+msgid "warning: %pB supports interworking, whereas %pB does not"
 msgstr ""
 
-#: coff-arm.c:2275 elf32-arm.c:19657
+#: coff-arm.c:2275 elf32-arm.c:19689
 #, c-format
-msgid "Warning: %B does not support interworking, whereas %B does"
+msgid "warning: %pB does not support interworking, whereas %pB does"
 msgstr ""
 
 #: coff-arm.c:2298
@@ -332,7 +352,7 @@ msgstr ""
 msgid "private flags = %x:"
 msgstr ""
 
-#: coff-arm.c:2306 elf32-arm.c:14160
+#: coff-arm.c:2306 elf32-arm.c:14191
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr ""
@@ -342,7 +362,7 @@ msgstr ""
 msgid " [floats passed in integer registers]"
 msgstr ""
 
-#: coff-arm.c:2311 elf32-arm.c:14163
+#: coff-arm.c:2311 elf32-arm.c:14194
 #, c-format
 msgid " [position independent]"
 msgstr ""
@@ -367,1418 +387,1421 @@ msgstr ""
 msgid " [interworking not supported]"
 msgstr ""
 
-#: coff-arm.c:2366 elf32-arm.c:13021
-msgid ""
-"Warning: Not setting interworking flag of %B since it has already been "
-"specified as non-interworking"
-msgstr ""
-
-#: coff-arm.c:2369 elf32-arm.c:13025
-msgid "Warning: Clearing the interworking flag of %B due to outside request"
-msgstr ""
-
-#: coff-arm.c:2426 elf32-arm.c:13070
+#: coff-arm.c:2366 elf32-arm.c:13052
 #, c-format
 msgid ""
-"Warning: Clearing the interworking flag of %B because non-interworking code "
-"in %B has been linked with it"
-msgstr ""
-
-#: coff-h8300.c:1068
-#, c-format
-msgid "cannot handle R_MEM_INDIRECT reloc when using %s output"
+"warning: not setting interworking flag of %pB since it has already been "
+"specified as non-interworking"
 msgstr ""
 
-#: coff-i860.c:151
+#: coff-arm.c:2369 elf32-arm.c:13056
 #, c-format
-msgid "relocation `%s' not yet implemented"
+msgid "warning: clearing the interworking flag of %pB due to outside request"
 msgstr ""
 
-#: coff-i860.c:613 coff-tic4x.c:227 coff-tic54x.c:365 coffcode.h:5343
+#: coff-arm.c:2426 elf32-arm.c:13101
 #, c-format
-msgid "%B: warning: illegal symbol index %ld in relocs"
-msgstr ""
-
-#: coff-i960.c:122 coff-i960.c:475
-msgid "uncertain calling convention for non-COFF symbol"
-msgstr ""
-
-#: coff-m68k.c:488 elf32-bfin.c:5340 elf32-cr16.c:2801 elf32-m68k.c:4385
-msgid "unsupported reloc type"
+msgid ""
+"warning: clearing the interworking flag of %pB because non-interworking code "
+"in %pB has been linked with it"
 msgstr ""
 
-#: coff-mips.c:640 elf32-mips.c:1744 elf32-score.c:430 elf32-score7.c:330
-#: elf64-mips.c:3135 elfn32-mips.c:2958
+#: coff-mips.c:640 elf32-mips.c:1742 elf32-score.c:430 elf32-score7.c:330
+#: elf64-mips.c:3131 elfn32-mips.c:2956
 msgid "GP relative relocation when _gp not defined"
 msgstr ""
 
-#: coff-rs6000.c:2773
-#, c-format
-msgid "%B: unsupported relocation type 0x%02x"
-msgstr ""
-
 #: coff-rs6000.c:2859
 #, c-format
-msgid "%B: TOC reloc at %#Lx to symbol `%s' with no TOC entry"
+msgid "%pB: TOC reloc at %#<PRIx64> to symbol `%s' with no TOC entry"
 msgstr ""
 
 #: coff-rs6000.c:3605 coff64-rs6000.c:2150
 #, c-format
-msgid "%B: symbol `%s' has unrecognized smclas %d"
+msgid "%pB: symbol `%s' has unrecognized smclas %d"
 msgstr ""
 
-#: coff-sh.c:504
+#: coff-sh.c:780 elf32-sh.c:521
 #, c-format
-msgid "SH Error: unknown reloc type %d"
+msgid "%pB: %#<PRIx64>: warning: bad R_SH_USES offset"
 msgstr ""
 
-#: coff-sh.c:778 elf32-sh.c:580
+#: coff-sh.c:791
 #, c-format
-msgid "%B: %#Lx: warning: bad R_SH_USES offset"
+msgid "%pB: %#<PRIx64>: warning: R_SH_USES points to unrecognized insn %#x"
 msgstr ""
 
-#: coff-sh.c:789
+#: coff-sh.c:809 elf32-sh.c:552
 #, c-format
-msgid "%B: %#Lx: warning: R_SH_USES points to unrecognized insn %#x"
+msgid "%pB: %#<PRIx64>: warning: bad R_SH_USES load offset"
 msgstr ""
 
-#: coff-sh.c:807 elf32-sh.c:610
+#: coff-sh.c:834 elf32-sh.c:568
 #, c-format
-msgid "%B: %#Lx: warning: bad R_SH_USES load offset"
+msgid "%pB: %#<PRIx64>: warning: could not find expected reloc"
 msgstr ""
 
-#: coff-sh.c:832 elf32-sh.c:626
+#: coff-sh.c:851 elf32-sh.c:597
 #, c-format
-msgid "%B: %#Lx: warning: could not find expected reloc"
+msgid "%pB: %#<PRIx64>: warning: symbol in unexpected section"
 msgstr ""
 
-#: coff-sh.c:849 elf32-sh.c:655
+#: coff-sh.c:977 elf32-sh.c:727
 #, c-format
-msgid "%B: %#Lx: warning: symbol in unexpected section"
+msgid "%pB: %#<PRIx64>: warning: could not find expected COUNT reloc"
 msgstr ""
 
-#: coff-sh.c:975 elf32-sh.c:785
+#: coff-sh.c:987 elf32-sh.c:738
 #, c-format
-msgid "%B: %#Lx: warning: could not find expected COUNT reloc"
+msgid "%pB: %#<PRIx64>: warning: bad count"
 msgstr ""
 
-#: coff-sh.c:985 elf32-sh.c:795
+#: coff-sh.c:1359 coff-sh.c:2647 elf32-sh.c:1142 elf32-sh.c:1512
 #, c-format
-msgid "%B: %#Lx: warning: bad count"
+msgid "%pB: %#<PRIx64>: fatal: reloc overflow while relaxing"
 msgstr ""
 
-#: coff-sh.c:1357 coff-sh.c:2645 elf32-sh.c:1199 elf32-sh.c:1570
+#: coff-sh.c:1454
 #, c-format
-msgid "%B: %#Lx: fatal: reloc overflow while relaxing"
-msgstr ""
-
-#: coff-sh.c:1452
-msgid "%B: fatal: generic symbols retrieved before relaxing"
+msgid "%pB: fatal: generic symbols retrieved before relaxing"
 msgstr ""
 
-#: coff-sh.c:2783 cofflink.c:2965
+#: coff-sh.c:2785 cofflink.c:2965
 #, c-format
-msgid "%B: illegal symbol index %ld in relocs"
+msgid "%pB: illegal symbol index %ld in relocs"
 msgstr ""
 
-#: coff-tic4x.c:183 coff-tic54x.c:278 coff-tic80.c:441
+#: coff-tic4x.c:228 coff-tic54x.c:366 coffcode.h:5007
 #, c-format
-msgid "Unrecognized reloc type 0x%x"
+msgid "%pB: warning: illegal symbol index %ld in relocs"
 msgstr ""
 
-#: coff-w65.c:352
+#: coff-tic80.c:441
 #, c-format
-msgid "ignoring reloc %s\n"
+msgid "unsupported relocation type %#x"
 msgstr ""
 
-#: coffcode.h:968
-msgid "%B: unable to load COMDAT section name"
+#: coffcode.h:954
+#, c-format
+msgid "%pB: unable to load COMDAT section name"
 msgstr ""
 
 #. Malformed input files can trigger this test.
 #. cf PR 21781.
-#: coffcode.h:1003
-msgid "%B: error: unexpected symbol '%s' in COMDAT section"
+#: coffcode.h:989
+#, c-format
+msgid "%pB: error: unexpected symbol '%s' in COMDAT section"
 msgstr ""
 
-#: coffcode.h:1015
+#: coffcode.h:1001
 #, c-format
-msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
+msgid "%pB: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr ""
 
-#: coffcode.h:1025
+#: coffcode.h:1011
 #, c-format
-msgid "%B: warning: No symbol for section '%s' found"
+msgid "%pB: warning: no symbol for section '%s' found"
 msgstr ""
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1251
+#: coffcode.h:1237
 #, c-format
-msgid ""
-"%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
+msgid "%pB: warning: ignoring section flag %s in section %s"
 msgstr ""
 
-#: coffcode.h:1320
+#: coffcode.h:1306
 #, c-format
-msgid "%B (%s): Section flag %s (%#lx) ignored"
+msgid "%pB (%s): section flag %s (%#lx) ignored"
 msgstr ""
 
-#: coffcode.h:1950
-msgid "%B: warning: claims to have 0xffff relocs, without overflow"
+#: coffcode.h:1917
+#, c-format
+msgid "%pB: warning: claims to have 0xffff relocs, without overflow"
 msgstr ""
 
-#: coffcode.h:2466
+#: coffcode.h:2315
 #, c-format
-msgid "Unrecognized TI COFF target id '0x%x'"
+msgid "unrecognized TI COFF target id '0x%x'"
 msgstr ""
 
-#: coffcode.h:2784
+#: coffcode.h:2599
 #, c-format
-msgid "%B: reloc against a non-existent symbol index: %ld"
+msgid "%pB: reloc against a non-existent symbol index: %ld"
 msgstr ""
 
-#: coffcode.h:3187
+#: coffcode.h:2910
 #, c-format
-msgid "%B: page size is too large (0x%x)"
+msgid "%pB: page size is too large (0x%x)"
 msgstr ""
 
-#: coffcode.h:3347
+#: coffcode.h:3070
 #, c-format
-msgid "%B: too many sections (%d)"
+msgid "%pB: too many sections (%d)"
 msgstr ""
 
-#: coffcode.h:3768
+#: coffcode.h:3489
 #, c-format
-msgid "%B: section %A: string table overflow at offset %ld"
+msgid "%pB: section %pA: string table overflow at offset %ld"
 msgstr ""
 
-#: coffcode.h:3873
+#: coffcode.h:3589
 #, c-format
-msgid "%B:%s section %s: alignment 2**%u not representable"
+msgid "%pB:%s section %s: alignment 2**%u not representable"
 msgstr ""
 
-#: coffcode.h:4592
-msgid "%B: warning: line number count (%#lx) exceeds section size (%#lx)"
+#: coffcode.h:4273
+#, c-format
+msgid "%pB: warning: line number count (%#lx) exceeds section size (%#lx)"
 msgstr ""
 
-#: coffcode.h:4607
-msgid "%B: warning: line number table read failed"
+#: coffcode.h:4288
+#, c-format
+msgid "%pB: warning: line number table read failed"
 msgstr ""
 
-#: coffcode.h:4641 coffcode.h:4655
+#: coffcode.h:4322 coffcode.h:4336
 #, c-format
-msgid "%B: warning: illegal symbol index 0x%lx in line number entry %d"
+msgid "%pB: warning: illegal symbol index 0x%lx in line number entry %d"
 msgstr ""
 
-#: coffcode.h:4669
+#: coffcode.h:4350
 #, c-format
-msgid "%B: warning: illegal symbol in line number entry %d"
+msgid "%pB: warning: illegal symbol in line number entry %d"
 msgstr ""
 
-#: coffcode.h:4682
+#: coffcode.h:4363
 #, c-format
-msgid "%B: warning: duplicate line number information for `%s'"
+msgid "%pB: warning: duplicate line number information for `%s'"
 msgstr ""
 
-#: coffcode.h:5103
+#: coffcode.h:4771
 #, c-format
-msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
+msgid "%pB: unrecognized storage class %d for %s symbol `%s'"
 msgstr ""
 
-#: coffcode.h:5236
+#: coffcode.h:4901
 #, c-format
-msgid "warning: %B: local symbol `%s' has no section"
+msgid "warning: %pB: local symbol `%s' has no section"
 msgstr ""
 
-#: coffcode.h:5383
+#: coffcode.h:5047
 #, c-format
-msgid "%B: illegal relocation type %d at address %#Lx"
+msgid "%pB: illegal relocation type %d at address %#<PRIx64>"
 msgstr ""
 
-#: coffgen.c:178 elf.c:1198
+#: coffgen.c:178 elf.c:1200
 #, c-format
-msgid "%B: unable to initialize compress status for section %s"
+msgid "%pB: unable to initialize compress status for section %s"
 msgstr ""
 
-#: coffgen.c:202 elf.c:1209
+#: coffgen.c:202 elf.c:1211
 #, c-format
-msgid "%B: unable to initialize decompress status for section %s"
+msgid "%pB: unable to initialize decompress status for section %s"
 msgstr ""
 
-#: coffgen.c:1649
-msgid "%B: corrupt symbol count: %#Lx"
+#: coffgen.c:1652
+#, c-format
+msgid "%pB: corrupt symbol count: %#<PRIx64>"
 msgstr ""
 
 #. PR 21013: Provide an error message when the alloc fails.
-#: coffgen.c:1658
-msgid "%B: not enough memory to allocate space for %#Lx symbols of size %#Lx"
+#: coffgen.c:1661
+#, c-format
+msgid ""
+"%pB: not enough memory to allocate space for %#<PRIx64> symbols of size "
+"%#<PRIx64>"
 msgstr ""
 
-#: coffgen.c:1725
+#: coffgen.c:1730
 #, c-format
-msgid "%B: bad string table size %Lu"
+msgid "%pB: bad string table size %<PRIu64>"
 msgstr ""
 
-#: coffgen.c:1902 coffgen.c:1962 coffgen.c:1980 cofflink.c:2045
-#: xcofflink.c:4507
+#: coffgen.c:1907 coffgen.c:1967 coffgen.c:1985 cofflink.c:2045
+#: xcofflink.c:4508
 msgid "<corrupt>"
 msgstr ""
 
-#: coffgen.c:2104
+#: coffgen.c:2109
 #, c-format
 msgid "<corrupt info> %s"
 msgstr ""
 
-#: coffgen.c:2683 elflink.c:14149 linker.c:2940
+#: coffgen.c:2688 elflink.c:14182 linker.c:2946
 msgid "%F%P: already_linked_table: %E\n"
 msgstr ""
 
-#: coffgen.c:3024 elflink.c:13151
+#: coffgen.c:3029 elflink.c:13184
 #, c-format
-msgid "Removing unused section '%A' in file '%B'"
+msgid "removing unused section '%pA' in file '%pB'"
 msgstr ""
 
-#: coffgen.c:3101 elflink.c:13369
-msgid "Warning: gc-sections option ignored"
+#: coffgen.c:3106 elflink.c:13402
+msgid "warning: gc-sections option ignored"
 msgstr ""
 
 #: cofflink.c:352
 #, c-format
-msgid "Warning: symbol `%s' is both section and non-section"
+msgid "warning: symbol `%s' is both section and non-section"
 msgstr ""
 
-#: cofflink.c:454 elf64-ia64-vms.c:5186 elflink.c:4831
+#: cofflink.c:454 elf64-ia64-vms.c:5203 elflink.c:4846
 #, c-format
-msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
+msgid "warning: type of symbol `%s' changed from %d to %d in %pB"
 msgstr ""
 
 #: cofflink.c:2373
 #, c-format
-msgid "%B: relocs in section `%A', but it has no contents"
+msgid "%pB: relocs in section `%pA', but it has no contents"
 msgstr ""
 
-#: cofflink.c:2436 elflink.c:10664
+#: cofflink.c:2436 elflink.c:10679
 #, c-format
 msgid ""
-"%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' "
-"of %B\n"
+"%X`%s' referenced in section `%pA' of %pB: defined in discarded section `"
+"%pA' of %pB\n"
 msgstr ""
 
 #: cofflink.c:2734
 #, c-format
-msgid "%B: %A: reloc overflow: %#x > 0xffff"
+msgid "%pB: %pA: reloc overflow: %#x > 0xffff"
 msgstr ""
 
 #: cofflink.c:2742
 #, c-format
-msgid "%B: warning: %A: line number overflow: %#x > 0xffff"
+msgid "%pB: warning: %pA: line number overflow: %#x > 0xffff"
 msgstr ""
 
-#: coffswap.h:811
+#: coffswap.h:789
 #, c-format
-msgid "%B: warning: %s: line number overflow: 0x%lx > 0xffff"
+msgid "%pB: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr ""
 
-#: coffswap.h:825
+#: coffswap.h:803
 #, c-format
-msgid "%B: %s: reloc overflow: 0x%lx > 0xffff"
+msgid "%pB: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr ""
 
 #: compress.c:255
 #, c-format
-msgid "error: %B(%A) is too large (%#Lx bytes)"
+msgid "error: %pB(%pA) is too large (%#<PRIx64> bytes)"
 msgstr ""
 
 #: cpu-arm.c:192 cpu-arm.c:204
 #, c-format
-msgid "error: %B is compiled for the EP9312, whereas %B is compiled for XScale"
+msgid ""
+"error: %pB is compiled for the EP9312, whereas %pB is compiled for XScale"
 msgstr ""
 
 #: cpu-arm.c:338
 #, c-format
-msgid "warning: unable to update contents of %s section in %B"
+msgid "warning: unable to update contents of %s section in %pB"
 msgstr ""
 
 #: dwarf2.c:543
 #, c-format
-msgid "Dwarf Error: Can't find %s section."
+msgid "DWARF error: can't find %s section."
 msgstr ""
 
 #: dwarf2.c:572
 #, c-format
-msgid "Dwarf Error: Offset (%llu) greater than or equal to %s size (%Lu)."
+msgid ""
+"DWARF error: offset (%<PRIu64>) greater than or equal to %s size (%<PRIu64>)"
 msgstr ""
 
-#: dwarf2.c:1089
-msgid "Dwarf Error: Info pointer extends beyond end of attributes"
+#: dwarf2.c:1100
+msgid "DWARF error: info pointer extends beyond end of attributes"
 msgstr ""
 
-#: dwarf2.c:1261
+#: dwarf2.c:1268
 #, c-format
-msgid "Dwarf Error: Invalid or unhandled FORM value: %#x."
+msgid "DWARF error: invalid or unhandled FORM value: %#x"
 msgstr ""
 
-#: dwarf2.c:1567
-msgid "Dwarf Error: mangled line number section (bad file number)."
+#: dwarf2.c:1574
+msgid "DWARF error: mangled line number section (bad file number)"
 msgstr ""
 
-#: dwarf2.c:1912
-msgid "Dwarf Error: Zero format count."
+#: dwarf2.c:1919
+msgid "DWARF error: zero format count"
 msgstr ""
 
-#: dwarf2.c:1921
+#: dwarf2.c:1929
 #, c-format
-msgid "Dwarf Error: data count (%Lx) larger than buffer size."
+msgid "DWARF error: data count (%<PRIx64>) larger than buffer size"
 msgstr ""
 
-#: dwarf2.c:1962
+#: dwarf2.c:1970
 #, c-format
-msgid "Dwarf Error: Unknown format content type %Lu."
+msgid "DWARF error: unknown format content type %<PRIu64>"
 msgstr ""
 
-#: dwarf2.c:2042
+#: dwarf2.c:2050
 #, c-format
-msgid "Dwarf Error: Line info section is too small (%Ld)"
+msgid "DWARF error: line info section is too small (%<PRId64>)"
 msgstr ""
 
-#: dwarf2.c:2072
+#: dwarf2.c:2080
 #, c-format
 msgid ""
-"Dwarf Error: Line info data is bigger (%#Lx) than the space remaining in the "
-"section (%#lx)"
+"DWARF error: line info data is bigger (%#<PRIx64>) than the space remaining "
+"in the section (%#lx)"
 msgstr ""
 
-#: dwarf2.c:2085
+#: dwarf2.c:2093
 #, c-format
-msgid "Dwarf Error: Unhandled .debug_line version %d."
+msgid "DWARF error: unhandled .debug_line version %d"
 msgstr ""
 
-#: dwarf2.c:2095
-msgid "Dwarf Error: Ran out of room reading prologue"
+#: dwarf2.c:2103
+msgid "DWARF error: ran out of room reading prologue"
 msgstr ""
 
-#: dwarf2.c:2113
+#: dwarf2.c:2121
 #, c-format
-msgid "Dwarf Error: Line info unsupported segment selector size %u."
+msgid "DWARF error: line info unsupported segment selector size %u"
 msgstr ""
 
-#: dwarf2.c:2140
-msgid "Dwarf Error: Invalid maximum operations per instruction."
+#: dwarf2.c:2148
+msgid "DWARF error: invalid maximum operations per instruction"
 msgstr ""
 
-#: dwarf2.c:2159
-msgid "Dwarf Error: Ran out of room reading opcodes"
+#: dwarf2.c:2167
+msgid "DWARF error: ran out of room reading opcodes"
 msgstr ""
 
-#: dwarf2.c:2332
-msgid "Dwarf Error: mangled line number section."
+#: dwarf2.c:2340
+msgid "DWARF error: mangled line number section"
 msgstr ""
 
-#: dwarf2.c:2833 dwarf2.c:2894
-msgid "Dwarf Error: Invalid abstract instance DIE ref."
+#: dwarf2.c:2843 dwarf2.c:2904
+msgid "DWARF error: invalid abstract instance DIE ref"
 msgstr ""
 
-#: dwarf2.c:2870
+#: dwarf2.c:2880
 #, c-format
-msgid "Dwarf Error: Unable to read alt ref %llu."
+msgid "DWARF error: unable to read alt ref %<PRIu64>"
 msgstr ""
 
-#: dwarf2.c:2911 dwarf2.c:3076 dwarf2.c:3428
+#: dwarf2.c:2921 dwarf2.c:3094 dwarf2.c:3448
 #, c-format
-msgid "Dwarf Error: Could not find abbrev number %u."
+msgid "DWARF error: could not find abbrev number %u"
 msgstr ""
 
-#: dwarf2.c:2928
-msgid "Dwarf Error: Abstract instance recursion detected."
+#: dwarf2.c:2938
+msgid "DWARF error: abstract instance recursion detected"
 msgstr ""
 
-#: dwarf2.c:3347
+#: dwarf2.c:3367
 #, c-format
 msgid ""
-"Dwarf Error: found dwarf version '%u', this reader only handles version 2, "
-"3, 4 and 5 information."
+"DWARF error: found dwarf version '%u', this reader only handles version 2, "
+"3, 4 and 5 information"
 msgstr ""
 
-#: dwarf2.c:3391
+#: dwarf2.c:3411
 #, c-format
 msgid ""
-"Dwarf Error: found address size '%u', this reader can not handle sizes "
-"greater than '%u'."
+"DWARF error: found address size '%u', this reader can not handle sizes "
+"greater than '%u'"
 msgstr ""
 
-#: dwarf2.c:3494
+#: dwarf2.c:3514
 msgid ""
-"Dwarf Error: DW_AT_comp_dir attribute encountered with a non-string form."
+"DWARF error: DW_AT_comp_dir attribute encountered with a non-string form"
 msgstr ""
 
-#: ecoff.c:964
+#: ecoff.c:971
 #, c-format
-msgid "%B: warning: isymMax (%ld) is greater than ifdMax (%ld)"
+msgid "%pB: warning: isymMax (%ld) is greater than ifdMax (%ld)"
 msgstr ""
 
-#: ecoff.c:1261
+#: ecoff.c:1268
 #, c-format
-msgid "Unknown basic type %d"
+msgid "unknown basic type %d"
 msgstr ""
 
-#: ecoff.c:1518
+#: ecoff.c:1525
 #, c-format
 msgid ""
 "\n"
 "      End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1525 ecoff.c:1528
+#: ecoff.c:1532 ecoff.c:1535
 #, c-format
 msgid ""
 "\n"
 "      First symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1541
+#: ecoff.c:1548
 #, c-format
 msgid ""
 "\n"
 "      End+1 symbol: %-7ld   Type:  %s"
 msgstr ""
 
-#: ecoff.c:1548
+#: ecoff.c:1555
 #, c-format
 msgid ""
 "\n"
 "      Local symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1556
+#: ecoff.c:1563
 #, c-format
 msgid ""
 "\n"
 "      struct; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1561
+#: ecoff.c:1568
 #, c-format
 msgid ""
 "\n"
 "      union; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1566
+#: ecoff.c:1573
 #, c-format
 msgid ""
 "\n"
 "      enum; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1572
+#: ecoff.c:1579
 #, c-format
 msgid ""
 "\n"
 "      Type: %s"
 msgstr ""
 
-#: elf-attrs.c:475
-msgid "%B: error: attribute section length too small: %ld"
+#: elf-attrs.c:476
+#, c-format
+msgid "%pB: error: attribute section length too small: %<PRId64>"
 msgstr ""
 
-#: elf-attrs.c:603
+#: elf-attrs.c:604
 #, c-format
 msgid ""
-"error: %B: Object has vendor-specific contents that must be processed by the "
-"'%s' toolchain"
+"error: %pB: object has vendor-specific contents that must be processed by "
+"the '%s' toolchain"
 msgstr ""
 
-#: elf-attrs.c:613
+#: elf-attrs.c:614
 #, c-format
-msgid "error: %B: Object tag '%d, %s' is incompatible with tag '%d, %s'"
+msgid "error: %pB: object tag '%d, %s' is incompatible with tag '%d, %s'"
 msgstr ""
 
 #: elf-eh-frame.c:942
 #, c-format
-msgid "discarding zero address range FDE in %B(%A).\n"
+msgid "discarding zero address range FDE in %pB(%pA).\n"
 msgstr ""
 
 #: elf-eh-frame.c:1047
 #, c-format
-msgid "%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"
+msgid "error in %pB(%pA); no .eh_frame_hdr table will be created"
 msgstr ""
 
 #: elf-eh-frame.c:1537
 #, c-format
-msgid ""
-"%P: FDE encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
+msgid "FDE encoding in %pB(%pA) prevents .eh_frame_hdr table being created"
 msgstr ""
 
 #: elf-eh-frame.c:1544
 msgid ""
-"%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation "
-"dropped.\n"
+"further warnings about FDE encoding preventing .eh_frame_hdr generation "
+"dropped"
 msgstr ""
 
 #: elf-eh-frame.c:1866
 #, c-format
-msgid "%B: %A not in order"
+msgid "%pB: %pA not in order"
 msgstr ""
 
 #: elf-eh-frame.c:1880
 #, c-format
-msgid "%B: %A invalid input section size"
+msgid "%pB: %pA invalid input section size"
 msgstr ""
 
 #: elf-eh-frame.c:1888
 #, c-format
-msgid "%B: %A points past end of text section"
+msgid "%pB: %pA points past end of text section"
 msgstr ""
 
 #: elf-eh-frame.c:2137
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
+msgid "DW_EH_PE_datarel unspecified for this architecture"
 msgstr ""
 
 #: elf-eh-frame.c:2307
 #, c-format
-msgid "Invalid output section for .eh_frame_entry: %A"
+msgid "invalid output section for .eh_frame_entry: %pA"
 msgstr ""
 
 #: elf-eh-frame.c:2330
 #, c-format
-msgid "Invalid contents in %A section"
+msgid "invalid contents in %pA section"
 msgstr ""
 
 #: elf-eh-frame.c:2486
-msgid "%P: .eh_frame_hdr entry overflow.\n"
+msgid ".eh_frame_hdr entry overflow"
 msgstr ""
 
-#: elf-eh-frame.c:2489
-msgid "%P: .eh_frame_hdr refers to overlapping FDEs.\n"
+#: elf-eh-frame.c:2488
+msgid ".eh_frame_hdr refers to overlapping FDEs"
 msgstr ""
 
 #: elf-ifunc.c:142
 #, c-format
 msgid ""
-"%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can "
+"%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%pB' can "
 "not be used when making an executable; recompile with -fPIE and relink with -"
 "pie\n"
 msgstr ""
 
-#: elf-m10200.c:425 elf-m10300.c:2145 elf32-avr.c:1502 elf32-bfin.c:3116
-#: elf32-cr16.c:1462 elf32-cr16c.c:780 elf32-cris.c:2030 elf32-crx.c:924
-#: elf32-d10v.c:509 elf32-epiphany.c:563 elf32-fr30.c:591 elf32-frv.c:4041
-#: elf32-ft32.c:485 elf32-h8300.c:522 elf32-i860.c:1210 elf32-ip2k.c:1475
-#: elf32-iq2000.c:689 elf32-lm32.c:1106 elf32-m32c.c:622 elf32-m32r.c:3031
-#: elf32-m68hc1x.c:1265 elf32-mep.c:524 elf32-metag.c:1985
-#: elf32-microblaze.c:1556 elf32-moxie.c:285 elf32-mt.c:400 elf32-nds32.c:5328
-#: elf32-or1k.c:1238 elf32-score.c:2731 elf32-score7.c:2540 elf32-spu.c:5076
-#: elf32-tilepro.c:3497 elf32-v850.c:2283 elf32-visium.c:677
-#: elf32-xstormy16.c:923 elf64-mmix.c:1538 elfxx-tilegx.c:3857
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2237
+#: elf-m10200.c:434 elf-m10300.c:2147 elf32-avr.c:1505 elf32-bfin.c:3127
+#: elf32-cr16.c:1464 elf32-cr16c.c:783 elf32-cris.c:2033 elf32-crx.c:925
+#: elf32-d10v.c:512 elf32-epiphany.c:566 elf32-fr30.c:594 elf32-frv.c:4049
+#: elf32-ft32.c:494 elf32-h8300.c:523 elf32-ip2k.c:1482 elf32-iq2000.c:693
+#: elf32-lm32.c:1112 elf32-m32c.c:624 elf32-m32r.c:3045 elf32-m68hc1x.c:1266
+#: elf32-mep.c:526 elf32-metag.c:1990 elf32-microblaze.c:1631 elf32-moxie.c:288
+#: elf32-mt.c:402 elf32-nds32.c:5300 elf32-or1k.c:1242 elf32-score.c:2733
+#: elf32-score7.c:2542 elf32-spu.c:5078 elf32-tilepro.c:3506 elf32-v850.c:2291
+#: elf32-visium.c:681 elf32-xstormy16.c:931 elf64-mmix.c:1541
+#: elfxx-tilegx.c:3870
 msgid "internal error: out of range error"
 msgstr ""
 
-#: elf-m10200.c:429 elf-m10300.c:2149 elf32-avr.c:1506 elf32-bfin.c:3120
-#: elf32-cr16.c:1466 elf32-cr16c.c:784 elf32-cris.c:2034 elf32-crx.c:928
-#: elf32-d10v.c:513 elf32-fr30.c:595 elf32-frv.c:4045 elf32-ft32.c:489
-#: elf32-h8300.c:526 elf32-i860.c:1214 elf32-iq2000.c:693 elf32-lm32.c:1110
-#: elf32-m32c.c:626 elf32-m32r.c:3035 elf32-m68hc1x.c:1269 elf32-mep.c:528
-#: elf32-metag.c:1989 elf32-microblaze.c:1560 elf32-moxie.c:289
-#: elf32-msp430.c:1357 elf32-nds32.c:5332 elf32-or1k.c:1242 elf32-score.c:2735
-#: elf32-score7.c:2544 elf32-spu.c:5080 elf32-tilepro.c:3501 elf32-v850.c:2287
-#: elf32-visium.c:681 elf32-xstormy16.c:927 elf64-mmix.c:1542
-#: elfxx-mips.c:10265 elfxx-tilegx.c:3861
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2241
+#: elf-m10200.c:438 elf-m10300.c:2151 elf32-avr.c:1509 elf32-bfin.c:3131
+#: elf32-cr16.c:1468 elf32-cr16c.c:787 elf32-cris.c:2037 elf32-crx.c:929
+#: elf32-d10v.c:516 elf32-fr30.c:598 elf32-frv.c:4053 elf32-ft32.c:498
+#: elf32-h8300.c:527 elf32-iq2000.c:697 elf32-lm32.c:1116 elf32-m32c.c:628
+#: elf32-m32r.c:3049 elf32-m68hc1x.c:1270 elf32-mep.c:530 elf32-metag.c:1994
+#: elf32-microblaze.c:1635 elf32-moxie.c:292 elf32-msp430.c:1362
+#: elf32-nds32.c:5304 elf32-or1k.c:1246 elf32-score.c:2737 elf32-score7.c:2546
+#: elf32-spu.c:5082 elf32-tilepro.c:3510 elf32-v850.c:2295 elf32-visium.c:685
+#: elf32-xstormy16.c:935 elf64-mmix.c:1545 elfxx-mips.c:10288
+#: elfxx-tilegx.c:3874
 msgid "internal error: unsupported relocation error"
 msgstr ""
 
-#: elf-m10200.c:433 elf32-cr16.c:1470 elf32-cr16c.c:788 elf32-crx.c:932
-#: elf32-d10v.c:517 elf32-h8300.c:530 elf32-lm32.c:1114 elf32-m32r.c:3039
-#: elf32-m68hc1x.c:1273 elf32-microblaze.c:1564 elf32-nds32.c:5336
-#: elf32-score.c:2739 elf32-score7.c:2548 elf32-spu.c:5084
+#: elf-m10200.c:442 elf32-cr16.c:1472 elf32-cr16c.c:791 elf32-crx.c:933
+#: elf32-d10v.c:520 elf32-h8300.c:531 elf32-lm32.c:1120 elf32-m32r.c:3053
+#: elf32-m68hc1x.c:1274 elf32-microblaze.c:1639 elf32-nds32.c:5308
+#: elf32-score.c:2741 elf32-score7.c:2550 elf32-spu.c:5086
 msgid "internal error: dangerous error"
 msgstr ""
 
-#: elf-m10200.c:437 elf-m10300.c:2166 elf32-avr.c:1514 elf32-bfin.c:3128
-#: elf32-cr16.c:1474 elf32-cr16c.c:792 elf32-cris.c:2042 elf32-crx.c:936
-#: elf32-d10v.c:521 elf32-epiphany.c:578 elf32-fr30.c:603 elf32-frv.c:4053
-#: elf32-ft32.c:497 elf32-h8300.c:534 elf32-i860.c:1222 elf32-ip2k.c:1490
-#: elf32-iq2000.c:701 elf32-lm32.c:1118 elf32-m32c.c:634 elf32-m32r.c:3043
-#: elf32-m68hc1x.c:1277 elf32-mep.c:536 elf32-metag.c:1997
-#: elf32-microblaze.c:1568 elf32-moxie.c:297 elf32-msp430.c:1365 elf32-mt.c:408
-#: elf32-nds32.c:5340 elf32-or1k.c:1250 elf32-score.c:2748 elf32-score7.c:2552
-#: elf32-spu.c:5088 elf32-tilepro.c:3509 elf32-v850.c:2307 elf32-visium.c:689
-#: elf32-xstormy16.c:935 elf64-mmix.c:1550 elfxx-tilegx.c:3869
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2249
+#: elf-m10200.c:446 elf-m10300.c:2168 elf32-avr.c:1517 elf32-bfin.c:3139
+#: elf32-cr16.c:1476 elf32-cr16c.c:795 elf32-cris.c:2045 elf32-crx.c:937
+#: elf32-d10v.c:524 elf32-epiphany.c:581 elf32-fr30.c:606 elf32-frv.c:4061
+#: elf32-ft32.c:506 elf32-h8300.c:535 elf32-ip2k.c:1497 elf32-iq2000.c:705
+#: elf32-lm32.c:1124 elf32-m32c.c:636 elf32-m32r.c:3057 elf32-m68hc1x.c:1278
+#: elf32-mep.c:538 elf32-metag.c:2002 elf32-microblaze.c:1643 elf32-moxie.c:300
+#: elf32-msp430.c:1370 elf32-mt.c:410 elf32-nds32.c:5312 elf32-or1k.c:1254
+#: elf32-score.c:2750 elf32-score7.c:2554 elf32-spu.c:5090 elf32-tilepro.c:3518
+#: elf32-v850.c:2315 elf32-visium.c:693 elf32-xstormy16.c:943 elf64-mmix.c:1553
+#: elfxx-tilegx.c:3882
 msgid "internal error: unknown error"
 msgstr ""
 
-#: elf-m10300.c:812
-#, c-format
-msgid "%B: unrecognised MN10300 reloc number: %d"
-msgstr ""
-
-#: elf-m10300.c:1028
+#: elf-m10300.c:1029
 #, c-format
-msgid "%B: Unsupported transition from %s to %s"
+msgid "%pB: unsupported transition from %s to %s"
 msgstr ""
 
-#: elf-m10300.c:1197
+#: elf-m10300.c:1198
 #, c-format
-msgid "%B: %s' accessed both as normal and thread local symbol"
+msgid "%pB: %s' accessed both as normal and thread local symbol"
 msgstr ""
 
-#: elf-m10300.c:2093 elf32-arm.c:12536 elf32-i386.c:3433 elf32-m32r.c:2526
-#: elf32-m68k.c:3895 elf32-s390.c:3204 elf32-sh.c:4121 elf32-tilepro.c:3401
-#: elf32-xtensa.c:2939 elf64-s390.c:3118 elf64-sh64.c:1636 elf64-x86-64.c:3790
-#: elfxx-sparc.c:3918 elfxx-tilegx.c:3781
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5001
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6457
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2206
+#: elf-m10300.c:2094 elf32-arm.c:12566 elf32-i386.c:3457 elf32-m32r.c:2539
+#: elf32-m68k.c:3899 elf32-s390.c:3208 elf32-sh.c:3796 elf32-tilepro.c:3409
+#: elf32-xtensa.c:2947 elf64-s390.c:3125 elf64-x86-64.c:3804 elfxx-sparc.c:3908
+#: elfxx-tilegx.c:3793 /work/sources/binutils/current/bfd/elfnn-aarch64.c:5258
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6738
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2226
 #, c-format
-msgid "%B(%A+%#Lx): unresolvable %s relocation against symbol `%s'"
+msgid "%pB(%pA+%#<PRIx64>): unresolvable %s relocation against symbol `%s'"
 msgstr ""
 
-#: elf-m10300.c:2154
+#: elf-m10300.c:2156
 msgid ""
 "error: inappropriate relocation type for shared library (did you forget -"
 "fpic?)"
 msgstr ""
 
-#: elf-m10300.c:2158
+#: elf-m10300.c:2160
 #, c-format
 msgid ""
-"%B: taking the address of protected function '%s' cannot be done when making "
-"a shared library"
+"%pB: taking the address of protected function '%s' cannot be done when "
+"making a shared library"
 msgstr ""
 
-#: elf-m10300.c:2161
+#: elf-m10300.c:2163
 msgid "internal error: suspicious relocation type used in shared library"
 msgstr ""
 
+#: elf-m10300.c:2649 elf32-avr.c:2487 elf32-frv.c:5641 elf64-ia64-vms.c:364
+#: elfxx-sparc.c:2797 reloc.c:8078 reloc16.c:155 elf32-ia64.c:362
+#: elf64-ia64.c:362
+msgid "%P%F: --relax and -r may not be used together\n"
+msgstr ""
+
 #: elf-properties.c:65
-msgid "%B: out of memory in _bfd_elf_get_property"
+#, c-format
+msgid "%pB: out of memory in _bfd_elf_get_property"
 msgstr ""
 
 #: elf-properties.c:91
-msgid "warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx"
+#, c-format
+msgid "warning: %pB: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx"
 msgstr ""
 
 #: elf-properties.c:112
-msgid "warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) type (0x%x) datasz: 0x%x"
+#, c-format
+msgid "warning: %pB: corrupt GNU_PROPERTY_TYPE (%ld) type (0x%x) datasz: 0x%x"
 msgstr ""
 
 #: elf-properties.c:151
-msgid "warning: %B: corrupt stack size: 0x%x"
+#, c-format
+msgid "warning: %pB: corrupt stack size: 0x%x"
 msgstr ""
 
 #: elf-properties.c:169
-msgid "warning: %B: corrupt no copy on protected size: 0x%x"
+#, c-format
+msgid "warning: %pB: corrupt no copy on protected size: 0x%x"
 msgstr ""
 
 #: elf-properties.c:186
-msgid "warning: %B: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"
+#, c-format
+msgid "warning: %pB: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"
 msgstr ""
 
 #. PR 17512: file: f057ec89.
 #: elf.c:343
 #, c-format
-msgid "%B: attempt to load strings from a non-string section (number %d)"
+msgid "%pB: attempt to load strings from a non-string section (number %d)"
 msgstr ""
 
 #: elf.c:358
 #, c-format
-msgid "%B: invalid string offset %u >= %Lu for section `%s'"
+msgid "%pB: invalid string offset %u >= %<PRIu64> for section `%s'"
 msgstr ""
 
-#: elf.c:497 /work/sources/binutils/current/bfd/elfnn-aarch64.c:7535
+#: elf.c:497 /work/sources/binutils/current/bfd/elfnn-aarch64.c:7826
 #, c-format
-msgid "%B symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
+msgid "%pB symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
 msgstr ""
 
 #: elf.c:661
 #, c-format
-msgid "%B: corrupt size field in group section header: %#Lx"
+msgid "%pB: corrupt size field in group section header: %#<PRIx64>"
 msgstr ""
 
-#: elf.c:676
+#: elf.c:677
 #, c-format
-msgid "%B: invalid size field in group section header: %#Lx"
+msgid "%pB: invalid size field in group section header: %#<PRIx64>"
 msgstr ""
 
-#: elf.c:712
-msgid "%B: invalid SHT_GROUP entry"
+#: elf.c:714
+#, c-format
+msgid "%pB: invalid SHT_GROUP entry"
 msgstr ""
 
-#: elf.c:731
-msgid "%B: no valid group sections found"
+#: elf.c:733
+#, c-format
+msgid "%pB: no valid group sections found"
 msgstr ""
 
 #. See PR 21957 for a reproducer.
-#: elf.c:760
+#: elf.c:762
 #, c-format
-msgid "%B: group section '%A' has no contents"
+msgid "%pB: group section '%pA' has no contents"
 msgstr ""
 
-#: elf.c:820
+#: elf.c:822
 #, c-format
-msgid "%B: no group info for section '%A'"
+msgid "%pB: no group info for section '%pA'"
 msgstr ""
 
-#: elf.c:851 elf.c:3862 elflink.c:11252
+#: elf.c:853 elf.c:3864 elflink.c:11267
 #, c-format
-msgid "%B: warning: sh_link not set for section `%A'"
+msgid "%pB: warning: sh_link not set for section `%pA'"
 msgstr ""
 
-#: elf.c:871
+#: elf.c:873
 #, c-format
-msgid "%B: sh_link [%d] in section `%A' is incorrect"
+msgid "%pB: sh_link [%d] in section `%pA' is incorrect"
 msgstr ""
 
-#: elf.c:884
+#: elf.c:886
 #, c-format
-msgid "%B: SHT_GROUP section [index %d] has no SHF_GROUP sections"
+msgid "%pB: SHT_GROUP section [index %d] has no SHF_GROUP sections"
 msgstr ""
 
-#: elf.c:905
+#: elf.c:907
 #, c-format
-msgid "%B: section group entry number %u is corrupt"
+msgid "%pB: section group entry number %u is corrupt"
 msgstr ""
 
-#: elf.c:928
+#: elf.c:930
 #, c-format
-msgid "%B: unknown type [%#x] section `%s' in group [%A]"
+msgid "%pB: unknown type [%#x] section `%s' in group [%pA]"
 msgstr ""
 
-#: elf.c:1390
+#: elf.c:1392
 #, c-format
-msgid "%B: Invalid sh_link field (%d) in section number %d"
+msgid "%pB: invalid sh_link field (%d) in section number %d"
 msgstr ""
 
-#: elf.c:1406
+#: elf.c:1408
 #, c-format
-msgid "%B: Failed to find link section for section %d"
+msgid "%pB: failed to find link section for section %d"
 msgstr ""
 
-#: elf.c:1433
+#: elf.c:1435
 #, c-format
-msgid "%B: Failed to find info section for section %d"
+msgid "%pB: failed to find info section for section %d"
 msgstr ""
 
-#: elf.c:1605
+#: elf.c:1607
 #, c-format
 msgid ""
 "\n"
 "Program Header:\n"
 msgstr ""
 
-#: elf.c:1647
+#: elf.c:1649
 #, c-format
 msgid ""
 "\n"
 "Dynamic Section:\n"
 msgstr ""
 
-#: elf.c:1788
+#: elf.c:1790
 #, c-format
 msgid ""
 "\n"
 "Version definitions:\n"
 msgstr ""
 
-#: elf.c:1813
+#: elf.c:1815
 #, c-format
 msgid ""
 "\n"
 "Version References:\n"
 msgstr ""
 
-#: elf.c:1818
+#: elf.c:1820
 #, c-format
 msgid "  required from %s:\n"
 msgstr ""
 
-#: elf.c:2016
-msgid "%B: warning: loop in section dependencies detected"
+#: elf.c:2018
+#, c-format
+msgid "%pB: warning: loop in section dependencies detected"
 msgstr ""
 
-#: elf.c:2124
+#: elf.c:2126
 #, c-format
 msgid ""
-"%B: warning: multiple symbol tables detected - ignoring the table in section "
-"%u"
+"%pB: warning: multiple symbol tables detected - ignoring the table in "
+"section %u"
 msgstr ""
 
-#: elf.c:2208
+#: elf.c:2210
 #, c-format
 msgid ""
-"%B: warning: multiple dynamic symbol tables detected - ignoring the table in "
-"section %u"
+"%pB: warning: multiple dynamic symbol tables detected - ignoring the table "
+"in section %u"
 msgstr ""
 
-#: elf.c:2321
+#: elf.c:2323
 #, c-format
-msgid "%B: invalid link %u for reloc section %s (index %u)"
+msgid "%pB: invalid link %u for reloc section %s (index %u)"
 msgstr ""
 
-#: elf.c:2480 elf.c:2495 elf.c:2506 elf.c:2519
+#: elf.c:2482 elf.c:2497 elf.c:2508 elf.c:2521
 #, c-format
-msgid "%B: unknown type [%#x] section `%s'"
+msgid "%pB: unknown type [%#x] section `%s'"
 msgstr ""
 
-#: elf.c:3224
+#: elf.c:3226
 #, c-format
-msgid "%B: error: Alignment power %d of section `%A' is too big"
+msgid "%pB: error: alignment power %d of section `%pA' is too big"
 msgstr ""
 
-#: elf.c:3254
+#: elf.c:3256
 #, c-format
-msgid "warning: section `%A' type changed to PROGBITS"
+msgid "warning: section `%pA' type changed to PROGBITS"
 msgstr ""
 
-#: elf.c:3730
+#: elf.c:3732
 #, c-format
-msgid "%B: too many sections: %u"
+msgid "%pB: too many sections: %u"
 msgstr ""
 
-#: elf.c:3815
+#: elf.c:3817
 #, c-format
-msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
+msgid ""
+"%pB: sh_link of section `%pA' points to discarded section `%pA' of `%pB'"
 msgstr ""
 
-#: elf.c:3840
+#: elf.c:3842
 #, c-format
-msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
+msgid "%pB: sh_link of section `%pA' points to removed section `%pA' of `%pB'"
 msgstr ""
 
-#: elf.c:4392
+#: elf.c:4394
 #, c-format
-msgid "%B: GNU_MBIN section `%A' has invalid sh_info field: %d"
+msgid "%pB: GNU_MBIN section `%pA' has invalid sh_info field: %d"
 msgstr ""
 
-#: elf.c:4951
-msgid "%B: TLS sections are not adjacent:"
+#: elf.c:4940
+#, c-format
+msgid "%pB: TLS sections are not adjacent:"
 msgstr ""
 
-#: elf.c:4958
+#: elf.c:4947
 #, c-format
-msgid "\t    TLS: %A"
+msgid "\t    TLS: %pA"
 msgstr ""
 
-#: elf.c:4962
+#: elf.c:4951
 #, c-format
-msgid "\tnon-TLS: %A"
+msgid "\tnon-TLS: %pA"
 msgstr ""
 
-#: elf.c:5458
+#: elf.c:5447
+#, c-format
 msgid ""
-"%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
+"%pB: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr ""
 
-#: elf.c:5486
-msgid "%B: Not enough room for program headers, try linking with -N"
+#: elf.c:5475
+#, c-format
+msgid "%pB: not enough room for program headers, try linking with -N"
 msgstr ""
 
-#: elf.c:5574
+#: elf.c:5563
 #, c-format
-msgid "%B: section %A lma %#Lx adjusted to %#Lx"
+msgid "%pB: section %pA lma %#<PRIx64> adjusted to %#<PRIx64>"
 msgstr ""
 
-#: elf.c:5711
+#: elf.c:5700
 #, c-format
-msgid "%B: section `%A' can't be allocated in segment %d"
+msgid "%pB: section `%pA' can't be allocated in segment %d"
 msgstr ""
 
-#: elf.c:5759
+#: elf.c:5748
 #, c-format
-msgid "%B: warning: allocated section `%s' not in segment"
+msgid "%pB: warning: allocated section `%s' not in segment"
 msgstr ""
 
-#: elf.c:5957
+#: elf.c:5981
+#, c-format
 msgid ""
-"%B: error: non-load segment %d includes file header and/or program header"
+"%pB: error: non-load segment %d includes file header and/or program header"
 msgstr ""
 
 #. The fix for this error is usually to edit the linker script being
 #. used and set up the program headers manually.  Either that or
 #. leave room for the headers at the start of the SECTIONS.
-#: elf.c:6134
-msgid "%B: error: PHDR segment not covered by LOAD segment"
+#: elf.c:6158
+#, c-format
+msgid "%pB: error: PHDR segment not covered by LOAD segment"
 msgstr ""
 
-#: elf.c:6478
+#: elf.c:6503
 #, c-format
-msgid "%B: symbol `%s' required but not present"
+msgid "%pB: symbol `%s' required but not present"
 msgstr ""
 
-#: elf.c:6821
+#: elf.c:6847
 #, c-format
 msgid ""
-"%B: warning: Empty loadable segment detected at vaddr=%#Lx, is this "
+"%pB: warning: empty loadable segment detected at vaddr=%#<PRIx64>, is this "
 "intentional?"
 msgstr ""
 
-#: elf.c:7435
+#: elf.c:7461
 #, c-format
-msgid "%B: warning: segment alignment of %#Lx is too large"
+msgid "%pB: warning: segment alignment of %#<PRIx64> is too large"
 msgstr ""
 
-#: elf.c:7916
+#: elf.c:7960
 #, c-format
 msgid ""
-"Unable to find equivalent output section for symbol '%s' from section '%s'"
-msgstr ""
-
-#: elf.c:8249
-msgid "%B: .gnu.version_r invalid entry"
+"unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr ""
 
-#: elf.c:8376
-msgid "%B: .gnu.version_d invalid entry"
+#: elf.c:8293
+#, c-format
+msgid "%pB: .gnu.version_r invalid entry"
 msgstr ""
 
-#: elf.c:8928
+#: elf.c:8420
 #, c-format
-msgid "%B: unsupported relocation type %s"
+msgid "%pB: .gnu.version_d invalid entry"
 msgstr ""
 
-#: elf32-arc.c:433 elf32-frv.c:6623 elf32-iq2000.c:866 elf32-m32c.c:912
-#: elf32-mt.c:560 elf32-rl78.c:1257 elf32-rx.c:3178 elf32-visium.c:837
-#: elf64-ppc.c:6067
+#: elf32-arc.c:442 elf32-frv.c:6630 elf32-iq2000.c:870 elf32-m32c.c:914
+#: elf32-mt.c:562 elf32-rl78.c:1261 elf32-rx.c:3200 elf32-visium.c:841
+#: elf64-ppc.c:6184
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr ""
 
-#: elf32-arc.c:611
-msgid "Warning: %B: Conflicting platform configuration %s with %s.\n"
+#: elf32-arc.c:629
+#, c-format
+msgid "warning: %pB: conflicting platform configuration %s with %s"
 msgstr ""
 
-#: elf32-arc.c:630
-msgid "error: %B: unable to merge CPU base attributes %s with %s.\n"
+#: elf32-arc.c:648
+#, c-format
+msgid "error: %pB: unable to merge CPU base attributes %s with %s"
 msgstr ""
 
-#: elf32-arc.c:667
-msgid "error: %B: unable to merge ISA extension attributes %s.\n"
+#: elf32-arc.c:685
+#, c-format
+msgid "error: %pB: unable to merge ISA extension attributes %s"
 msgstr ""
 
-#: elf32-arc.c:691
-msgid "error: %B: conflicting ISA extension attributes %s with %s.\n"
+#: elf32-arc.c:709
+#, c-format
+msgid "error: %pB: conflicting ISA extension attributes %s with %s"
 msgstr ""
 
-#: elf32-arc.c:726
-msgid "error: %B: cannot mix rf16 with full register set %B.\n"
+#: elf32-arc.c:744
+#, c-format
+msgid "error: %pB: cannot mix rf16 with full register set %pB"
 msgstr ""
 
-#: elf32-arc.c:752
-msgid "error: %B: conflicting attributes %s: %s with %s.\n"
+#: elf32-arc.c:770
+#, c-format
+msgid "error: %pB: conflicting attributes %s: %s with %s"
 msgstr ""
 
-#: elf32-arc.c:777
-msgid "error: %B: conflicting attributes %s.\n"
+#: elf32-arc.c:795
+#, c-format
+msgid "error: %pB: conflicting attributes %s"
 msgstr ""
 
-#: elf32-arc.c:877
+#: elf32-arc.c:895
 #, c-format
-msgid "ERROR: Attempting to link %B with a binary %B of different architecture"
+msgid ""
+"error: attempting to link %pB with a binary %pB of different architecture"
 msgstr ""
 
-#: elf32-arc.c:891 elf32-i370.c:359 elf32-iq2000.c:842 elf32-m32c.c:887
-#: elf32-m68hc1x.c:1384 elf32-ppc.c:4846 elf64-sparc.c:727 elfxx-mips.c:15082
+#: elf32-arc.c:909 elf32-iq2000.c:846 elf32-m32c.c:889 elf32-m68hc1x.c:1385
+#: elf32-ppc.c:4958 elf64-sparc.c:731 elfxx-mips.c:15118
 #, c-format
-msgid "%B: uses different e_flags (%#x) fields than previous modules (%#x)"
+msgid "%pB: uses different e_flags (%#x) fields than previous modules (%#x)"
 msgstr ""
 
-#: elf32-arc.c:980
-msgid "Error: The ARC4 architecture is no longer supported.\n"
+#: elf32-arc.c:998
+msgid "error: the ARC4 architecture is no longer supported"
 msgstr ""
 
-#: elf32-arc.c:986
-msgid ""
-"Warning: unset or old architecture flags. \n"
-"\t       Use default machine.\n"
+#: elf32-arc.c:1004
+msgid "warning: unset or old architecture flags; use default machine"
 msgstr ""
 
-#: elf32-arc.c:1119
+#: elf32-arc.c:1137
 #, c-format
 msgid ""
-"%B(%A+%#Lx): CMEM relocation to `%s' is invalid, 16 MSB should be %#x (value "
-"is %#Lx)"
+"%pB(%pA+%#<PRIx64>): CMEM relocation to `%s' is invalid, 16 MSB should be "
+"%#x (value is %#<PRIx64>)"
 msgstr ""
 
-#: elf32-arc.c:1130
+#: elf32-arc.c:1148
 #, c-format
 msgid ""
-"%B(%A+%#Lx): CMEM relocation to `%s+%#Lx' is invalid, 16 MSB should be %#x "
-"(value is %#Lx)"
+"%pB(%pA+%#<PRIx64>): CMEM relocation to `%s+%#<PRIx64>' is invalid, 16 MSB "
+"should be %#x (value is %#<PRIx64>)"
 msgstr ""
 
-#: elf32-arc.c:1836
-msgid "GOT and PLT relocations cannot be fixed with a non dynamic linker."
+#: elf32-arc.c:1853
+msgid "GOT and PLT relocations cannot be fixed with a non dynamic linker"
 msgstr ""
 
-#: elf32-arc.c:1860 elf32-rl78.c:1095 elf32-rx.c:1449
+#: elf32-arc.c:1877 elf32-rl78.c:1099 elf32-rx.c:1471
 #, c-format
-msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
+msgid ""
+"%pB(%pA): warning: unaligned access to symbol '%s' in the small data area"
 msgstr ""
 
-#: elf32-arc.c:1865 elf32-rl78.c:1100 elf32-rx.c:1454
+#: elf32-arc.c:1882 elf32-rl78.c:1104 elf32-rx.c:1476
 #, c-format
-msgid "%B(%A): internal error: out of range error"
+msgid "%pB(%pA): internal error: out of range error"
 msgstr ""
 
-#: elf32-arc.c:1870 elf32-rl78.c:1105 elf32-rx.c:1459
+#: elf32-arc.c:1887 elf32-rl78.c:1109 elf32-rx.c:1481
 #, c-format
-msgid "%B(%A): internal error: unsupported relocation error"
+msgid "%pB(%pA): internal error: unsupported relocation error"
 msgstr ""
 
-#: elf32-arc.c:1875 elf32-rl78.c:1110 elf32-rx.c:1464
+#: elf32-arc.c:1892 elf32-rl78.c:1114 elf32-rx.c:1486
 #, c-format
-msgid "%B(%A): internal error: dangerous relocation"
+msgid "%pB(%pA): internal error: dangerous relocation"
 msgstr ""
 
-#: elf32-arc.c:1880 elf32-rl78.c:1115 elf32-rx.c:1469
+#: elf32-arc.c:1897 elf32-rl78.c:1119 elf32-rx.c:1491
 #, c-format
-msgid "%B(%A): internal error: unknown error"
+msgid "%pB(%pA): internal error: unknown error"
 msgstr ""
 
-#: elf32-arc.c:1968 elf32-arm.c:14521 elf32-metag.c:2252 elfxx-mips.c:8889
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7103
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:471
+#: elf32-arc.c:1985 elf32-arm.c:14552 elf32-metag.c:2257 elfxx-mips.c:8905
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7394
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:474
 #, c-format
 msgid ""
-"%B: relocation %s against `%s' can not be used when making a shared object; "
+"%pB: relocation %s against `%s' can not be used when making a shared object; "
 "recompile with -fPIC"
 msgstr ""
 
-#: elf32-arc.c:2860
-msgid "%B: Unknown mandatory ARC object attribute %d."
+#: elf32-arc.c:2877
+#, c-format
+msgid "%pB: unknown mandatory ARC object attribute %d"
 msgstr ""
 
-#: elf32-arc.c:2868
-msgid "Warning: %B: Unknown ARC object attribute %d."
+#: elf32-arc.c:2885
+#, c-format
+msgid "warning: %pB: unknown ARC object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:4022 elf32-arm.c:4056 elf32-arm.c:4075 elf32-arm.c:4127
+#: elf32-arm.c:4030 elf32-arm.c:4064 elf32-arm.c:4083 elf32-arm.c:4135
+#, c-format
 msgid ""
-"%B(%A): warning: long branch veneers used in section with SHF_ARM_PURECODE "
+"%pB(%pA): warning: long branch veneers used in section with SHF_ARM_PURECODE "
 "section attribute is only supported for M-profile targets that implement the "
-"movw instruction."
-msgstr ""
-
-#: elf32-arm.c:4087 elf32-arm.c:8806
-msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: Thumb call to ARM"
+"movw instruction"
 msgstr ""
 
-#: elf32-arm.c:4141
+#: elf32-arm.c:4095 elf32-arm.c:4149 elf32-arm.c:8813 elf32-arm.c:8903
+#, c-format
 msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: ARM call to Thumb"
+"%pB(%s): warning: interworking not enabled; first occurrence: %pB: %s call "
+"to %s"
 msgstr ""
 
-#: elf32-arm.c:4415
+#: elf32-arm.c:4423
 #, c-format
-msgid "No address assigned to the veneers output section %s"
+msgid "no address assigned to the veneers output section %s"
 msgstr ""
 
-#: elf32-arm.c:4490 elf32-arm.c:6627 elf32-hppa.c:577 elf32-m68hc1x.c:165
-#: elf32-metag.c:1183 elf32-nios2.c:2207
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2854
+#: elf32-arm.c:4498 elf32-arm.c:6634 elf32-hppa.c:577 elf32-m68hc1x.c:165
+#: elf32-metag.c:1186 elf32-nios2.c:2208 elf64-ppc.c:4737
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:3099
 #, c-format
-msgid "%B: cannot create stub entry %s"
-msgstr ""
-
-#: elf32-arm.c:5675
-msgid "%B: Special symbol `%s' only allowed for ARMv8-M architecture or later."
-msgstr ""
-
-#: elf32-arm.c:5684
-msgid "%B: invalid special symbol `%s'."
+msgid "%pB: cannot create stub entry %s"
 msgstr ""
 
-#: elf32-arm.c:5686 elf32-arm.c:5726
-msgid "It must be a global or weak function symbol."
+#: elf32-arm.c:5683
+#, c-format
+msgid "%pB: special symbol `%s' only allowed for ARMv8-M architecture or later"
 msgstr ""
 
-#: elf32-arm.c:5724
-msgid "%B: invalid standard symbol `%s'."
+#: elf32-arm.c:5692
+#, c-format
+msgid ""
+"%pB: invalid special symbol `%s'; it must be a global or weak function symbol"
 msgstr ""
 
-#: elf32-arm.c:5730
-msgid "%B: absent standard symbol `%s'."
+#: elf32-arm.c:5731
+#, c-format
+msgid ""
+"%pB: invalid standard symbol `%s'; it must be a global or weak function "
+"symbol"
 msgstr ""
 
-#: elf32-arm.c:5742
-msgid "%B: `%s' and its special symbol are in different sections."
+#: elf32-arm.c:5737
+#, c-format
+msgid "%pB: absent standard symbol `%s'"
 msgstr ""
 
-#: elf32-arm.c:5754
-msgid "%B: entry function `%s' not output."
+#: elf32-arm.c:5749
+#, c-format
+msgid "%pB: `%s' and its special symbol are in different sections"
 msgstr ""
 
 #: elf32-arm.c:5761
-msgid "%B: entry function `%s' is empty."
+#, c-format
+msgid "%pB: entry function `%s' not output"
 msgstr ""
 
-#: elf32-arm.c:5890
-msgid "%B: --in-implib only supported for Secure Gateway import libraries."
+#: elf32-arm.c:5768
+#, c-format
+msgid "%pB: entry function `%s' is empty"
 msgstr ""
 
-#: elf32-arm.c:5936
-msgid "%B: invalid import library entry: `%s'."
+#: elf32-arm.c:5897
+#, c-format
+msgid "%pB: --in-implib only supported for Secure Gateway import libraries"
 msgstr ""
 
-#: elf32-arm.c:5938
-msgid "Symbol should be absolute, global and refer to Thumb functions."
+#: elf32-arm.c:5943
+#, c-format
+msgid ""
+"%pB: invalid import library entry: `%s'; symbol should be absolute, global "
+"and refer to Thumb functions"
 msgstr ""
 
-#: elf32-arm.c:5958
+#: elf32-arm.c:5965
 #, c-format
-msgid "Entry function `%s' disappeared from secure code."
+msgid "entry function `%s' disappeared from secure code"
 msgstr ""
 
-#: elf32-arm.c:5982
+#: elf32-arm.c:5989
 #, c-format
-msgid "`%s' refers to a non entry function."
+msgid "`%s' refers to a non entry function"
 msgstr ""
 
-#: elf32-arm.c:5997
-msgid "%B: visibility of symbol `%s' has changed."
+#: elf32-arm.c:6004
+#, c-format
+msgid "%pB: visibility of symbol `%s' has changed"
 msgstr ""
 
-#: elf32-arm.c:6006
-msgid "%B: incorrect size for symbol `%s'."
+#: elf32-arm.c:6013
+#, c-format
+msgid "%pB: incorrect size for symbol `%s'"
 msgstr ""
 
-#: elf32-arm.c:6025
+#: elf32-arm.c:6032
 #, c-format
-msgid "Offset of veneer for entry function `%s' not a multiple of its size."
+msgid "offset of veneer for entry function `%s' not a multiple of its size"
 msgstr ""
 
-#: elf32-arm.c:6045
+#: elf32-arm.c:6052
 msgid ""
 "new entry function(s) introduced but no output import library specified:"
 msgstr ""
 
-#: elf32-arm.c:6053
+#: elf32-arm.c:6060
 #, c-format
-msgid "Start address of `%s' is different from previous link."
+msgid "start address of `%s' is different from previous link"
 msgstr ""
 
-#: elf32-arm.c:6760
+#: elf32-arm.c:6767 elf32-arm.c:6803
 #, c-format
-msgid "unable to find THUMB glue '%s' for '%s'"
+msgid "unable to find %s glue '%s' for '%s'"
 msgstr ""
 
-#: elf32-arm.c:6796
+#: elf32-arm.c:7518
 #, c-format
-msgid "unable to find ARM glue '%s' for '%s'"
-msgstr ""
-
-#: elf32-arm.c:7511
-msgid "%B: BE8 images only valid in big-endian mode."
+msgid "%pB: BE8 images only valid in big-endian mode"
 msgstr ""
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:7742
+#: elf32-arm.c:7749
+#, c-format
 msgid ""
-"%B: warning: selected VFP11 erratum workaround is not necessary for target "
+"%pB: warning: selected VFP11 erratum workaround is not necessary for target "
 "architecture"
 msgstr ""
 
-#: elf32-arm.c:7769
+#: elf32-arm.c:7776
+#, c-format
 msgid ""
-"%B: warning: selected STM32L4XX erratum workaround is not necessary for "
+"%pB: warning: selected STM32L4XX erratum workaround is not necessary for "
 "target architecture"
 msgstr ""
 
-#: elf32-arm.c:8306 elf32-arm.c:8326
-msgid "%B: unable to find VFP11 veneer `%s'"
-msgstr ""
-
-#: elf32-arm.c:8392 elf32-arm.c:8411
-msgid "%B: unable to find STM32L4XX veneer `%s'"
+#: elf32-arm.c:8313 elf32-arm.c:8333 elf32-arm.c:8399 elf32-arm.c:8418
+#, c-format
+msgid "%pB: unable to find %s veneer `%s'"
 msgstr ""
 
-#: elf32-arm.c:8618
+#: elf32-arm.c:8625
 #, c-format
 msgid ""
-"%B(%A+%#x): error: multiple load detected in non-last IT block instruction : "
-"STM32L4XX veneer cannot be generated.\n"
-"Use gcc option -mrestrict-it to generate only one instruction per IT block.\n"
+"%pB(%pA+%#x): error: multiple load detected in non-last IT block "
+"instruction: STM32L4XX veneer cannot be generated; use gcc option -mrestrict-"
+"it to generate only one instruction per IT block"
 msgstr ""
 
-#: elf32-arm.c:8716
+#: elf32-arm.c:8723
 #, c-format
-msgid "Invalid TARGET2 relocation type '%s'."
+msgid "invalid TARGET2 relocation type '%s'"
 msgstr ""
 
 #. FIXME: We ought to be able to generate thumb-1 PLT
 #. instructions...
-#: elf32-arm.c:9458
-msgid "%B: Warning: thumb-1 mode PLT generation not currently supported"
-msgstr ""
-
-#: elf32-arm.c:9723
+#: elf32-arm.c:9465
 #, c-format
-msgid "%B(%A+%#Lx): unexpected Thumb instruction '%#lx' in TLS trampoline"
+msgid "%pB: warning: thumb-1 mode PLT generation not currently supported"
 msgstr ""
 
-#: elf32-arm.c:9763
+#: elf32-arm.c:9730 elf32-arm.c:9772
 #, c-format
-msgid "%B(%A+%#Lx): unexpected ARM instruction '%#lx' in TLS trampoline"
+msgid "%pB(%pA+%#<PRIx64>): unexpected %s instruction '%#lx' in TLS trampoline"
 msgstr ""
 
-#: elf32-arm.c:10103
+#: elf32-arm.c:10114
 msgid "shared object"
 msgstr ""
 
-#: elf32-arm.c:10106
+#: elf32-arm.c:10117
 msgid "PIE executable"
 msgstr ""
 
-#: elf32-arm.c:10109
+#: elf32-arm.c:10120
+#, c-format
 msgid ""
-"%B: relocation %s against external or undefined symbol `%s' can not be used "
+"%pB: relocation %s against external or undefined symbol `%s' can not be used "
 "when making a %s; recompile with -fPIC"
 msgstr ""
 
-#: elf32-arm.c:10240
-msgid "%B: Warning: Arm BLX instruction targets Arm function '%s'."
-msgstr ""
-
-#: elf32-arm.c:10666
-msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
-msgstr ""
-
-#: elf32-arm.c:11534
+#: elf32-arm.c:10251 elf32-arm.c:10678
 #, c-format
-msgid ""
-"%B(%A+%#Lx): unexpected Thumb instruction '%#lx' referenced by TLS_GOTDESC"
+msgid "%pB: warning: %s BLX instruction targets %s function '%s'"
 msgstr ""
 
-#: elf32-arm.c:11557
+#: elf32-arm.c:11547 elf32-arm.c:11573
 #, c-format
 msgid ""
-"%B(%A+%#Lx): unexpected ARM instruction '%#lx' referenced by TLS_GOTDESC"
+"%pB(%pA+%#<PRIx64>): unexpected %s instruction '%#lx' referenced by "
+"TLS_GOTDESC"
 msgstr ""
 
-#: elf32-arm.c:11586 elf32-m68k.c:3701 elf32-metag.c:1916 elf32-nios2.c:4358
+#: elf32-arm.c:11605 elf32-m68k.c:3703 elf32-metag.c:1919 elf32-nios2.c:4366
 #, c-format
-msgid "%B(%A+%#Lx): %s relocation not permitted in shared object"
+msgid "%pB(%pA+%#<PRIx64>): %s relocation not permitted in shared object"
 msgstr ""
 
-#: elf32-arm.c:11799
+#: elf32-arm.c:11819
 #, c-format
 msgid ""
-"%B(%A+%#Lx): Only ADD or SUB instructions are allowed for ALU group "
+"%pB(%pA+%#<PRIx64>): only ADD or SUB instructions are allowed for ALU group "
 "relocations"
 msgstr ""
 
-#: elf32-arm.c:11839 elf32-arm.c:11929 elf32-arm.c:12015 elf32-arm.c:12103
+#: elf32-arm.c:11860 elf32-arm.c:11952 elf32-arm.c:12040 elf32-arm.c:12130
 #, c-format
-msgid "%B(%A+%#Lx): Overflow whilst splitting %#Lx for group relocation %s"
+msgid ""
+"%pB(%pA+%#<PRIx64>): overflow whilst splitting %#<PRIx64> for group "
+"relocation %s"
 msgstr ""
 
-#: elf32-arm.c:12369 elf32-sh.c:4003 elf64-sh64.c:1539
+#: elf32-arm.c:12398 elf32-sh.c:3685
 #, c-format
-msgid "%B(%A+%#Lx): %s relocation against SEC_MERGE section"
+msgid "%pB(%pA+%#<PRIx64>): %s relocation against SEC_MERGE section"
 msgstr ""
 
-#: elf32-arm.c:12481 elf32-m68k.c:3931 elf32-xtensa.c:2681
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6185
+#: elf32-arm.c:12511 elf32-m68k.c:3936 elf32-xtensa.c:2689
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6466
 #, c-format
-msgid "%B(%A+%#Lx): %s used with TLS symbol %s"
+msgid "%pB(%pA+%#<PRIx64>): %s used with TLS symbol %s"
 msgstr ""
 
-#: elf32-arm.c:12483 elf32-m68k.c:3933 elf32-xtensa.c:2683
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6187
+#: elf32-arm.c:12513 elf32-m68k.c:3938 elf32-xtensa.c:2691
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6468
 #, c-format
-msgid "%B(%A+%#Lx): %s used with non-TLS symbol %s"
+msgid "%pB(%pA+%#<PRIx64>): %s used with non-TLS symbol %s"
 msgstr ""
 
-#: elf32-arm.c:12565 elf32-tic6x.c:2674
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6520
+#: elf32-arm.c:12596 elf32-tic6x.c:2708
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6802
 msgid "out of range"
 msgstr ""
 
-#: elf32-arm.c:12569 elf32-nios2.c:4492 elf32-pru.c:821 elf32-tic6x.c:2678
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6524
+#: elf32-arm.c:12600 elf32-nios2.c:4500 elf32-pru.c:835 elf32-tic6x.c:2712
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6806
 msgid "unsupported relocation"
 msgstr ""
 
-#: elf32-arm.c:12577 elf32-nios2.c:4502 elf32-pru.c:831 elf32-tic6x.c:2686
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6532
+#: elf32-arm.c:12608 elf32-nios2.c:4510 elf32-pru.c:845 elf32-tic6x.c:2720
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6814
 msgid "unknown error"
 msgstr ""
 
-#: elf32-arm.c:13157
-msgid "%B: Unknown mandatory EABI object attribute %d"
+#: elf32-arm.c:13188
+#, c-format
+msgid "%pB: unknown mandatory EABI object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:13165
-msgid "Warning: %B: Unknown EABI object attribute %d"
+#: elf32-arm.c:13196
+#, c-format
+msgid "warning: %pB: unknown EABI object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:13432
-msgid "error: %B: Unknown CPU architecture"
+#: elf32-arm.c:13463
+#, c-format
+msgid "error: %pB: unknown CPU architecture"
 msgstr ""
 
-#: elf32-arm.c:13470 elf32-nios2.c:2945
+#: elf32-arm.c:13501 elf32-nios2.c:2946
 #, c-format
-msgid "error: %B: Conflicting CPU architectures %d/%d"
+msgid "error: %pB: conflicting CPU architectures %d/%d"
 msgstr ""
 
-#: elf32-arm.c:13567
+#: elf32-arm.c:13598
+#, c-format
 msgid ""
-"Error: %B has both the current and legacy Tag_MPextension_use attributes"
+"Error: %pB has both the current and legacy Tag_MPextension_use attributes"
 msgstr ""
 
-#: elf32-arm.c:13596
-msgid "error: %B uses VFP register arguments, %B does not"
+#: elf32-arm.c:13627
+#, c-format
+msgid "error: %pB uses VFP register arguments, %pB does not"
 msgstr ""
 
-#: elf32-arm.c:13754
-msgid "error: %B: unable to merge virtualization attributes with %B"
+#: elf32-arm.c:13785
+#, c-format
+msgid "error: %pB: unable to merge virtualization attributes with %pB"
 msgstr ""
 
-#: elf32-arm.c:13780
-msgid "error: %B: Conflicting architecture profiles %c/%c"
+#: elf32-arm.c:13811
+#, c-format
+msgid "error: %pB: conflicting architecture profiles %c/%c"
 msgstr ""
 
-#: elf32-arm.c:13919
-msgid "Warning: %B: Conflicting platform configuration"
+#: elf32-arm.c:13950
+#, c-format
+msgid "warning: %pB: conflicting platform configuration"
 msgstr ""
 
-#: elf32-arm.c:13928
-msgid "error: %B: Conflicting use of R9"
+#: elf32-arm.c:13959
+#, c-format
+msgid "error: %pB: conflicting use of R9"
 msgstr ""
 
-#: elf32-arm.c:13940
-msgid "error: %B: SB relative addressing conflicts with use of R9"
+#: elf32-arm.c:13971
+#, c-format
+msgid "error: %pB: SB relative addressing conflicts with use of R9"
 msgstr ""
 
-#: elf32-arm.c:13953
+#: elf32-arm.c:13984
+#, c-format
 msgid ""
-"warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; "
+"warning: %pB uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; "
 "use of wchar_t values across objects may fail"
 msgstr ""
 
-#: elf32-arm.c:13984
+#: elf32-arm.c:14015
+#, c-format
 msgid ""
-"warning: %B uses %s enums yet the output is to use %s enums; use of enum "
+"warning: %pB uses %s enums yet the output is to use %s enums; use of enum "
 "values across objects may fail"
 msgstr ""
 
-#: elf32-arm.c:13996
-msgid "error: %B uses iWMMXt register arguments, %B does not"
+#: elf32-arm.c:14027
+#, c-format
+msgid "error: %pB uses iWMMXt register arguments, %pB does not"
 msgstr ""
 
-#: elf32-arm.c:14013
-msgid "error: fp16 format mismatch between %B and %B"
+#: elf32-arm.c:14044
+#, c-format
+msgid "error: fp16 format mismatch between %pB and %pB"
 msgstr ""
 
-#: elf32-arm.c:14049
-msgid "%B has both the current and legacy Tag_MPextension_use attributes"
+#: elf32-arm.c:14080
+#, c-format
+msgid "%pB has both the current and legacy Tag_MPextension_use attributes"
 msgstr ""
 
 #. Ignore init flag - it may not be set, despite the flags field
@@ -1786,235 +1809,234 @@ msgstr ""
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
-#: elf32-arm.c:14136 elf32-bfin.c:4729 elf32-cris.c:3905 elf32-m68hc1x.c:1409
-#: elf32-m68k.c:1199 elf32-score.c:3998 elf32-score7.c:3803 elf32-vax.c:536
-#: elf32-xgate.c:669 elfxx-mips.c:15756
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6686
+#: elf32-arm.c:14167 elf32-bfin.c:4740 elf32-cris.c:3908 elf32-m68hc1x.c:1410
+#: elf32-m68k.c:1201 elf32-score.c:4000 elf32-score7.c:3805 elf32-vax.c:537
+#: elf32-xgate.c:672 elfxx-mips.c:15792
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6968
 #, c-format
 msgid "private flags = %lx:"
 msgstr ""
 
-#: elf32-arm.c:14145
+#: elf32-arm.c:14176
 #, c-format
 msgid " [interworking enabled]"
 msgstr ""
 
-#: elf32-arm.c:14153
+#: elf32-arm.c:14184
 #, c-format
 msgid " [VFP float format]"
 msgstr ""
 
-#: elf32-arm.c:14155
+#: elf32-arm.c:14186
 #, c-format
 msgid " [Maverick float format]"
 msgstr ""
 
-#: elf32-arm.c:14157
+#: elf32-arm.c:14188
 #, c-format
 msgid " [FPA float format]"
 msgstr ""
 
-#: elf32-arm.c:14166
+#: elf32-arm.c:14197
 #, c-format
 msgid " [new ABI]"
 msgstr ""
 
-#: elf32-arm.c:14169
+#: elf32-arm.c:14200
 #, c-format
 msgid " [old ABI]"
 msgstr ""
 
-#: elf32-arm.c:14172
+#: elf32-arm.c:14203
 #, c-format
 msgid " [software FP]"
 msgstr ""
 
-#: elf32-arm.c:14181
+#: elf32-arm.c:14212
 #, c-format
 msgid " [Version1 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14184 elf32-arm.c:14195
+#: elf32-arm.c:14215 elf32-arm.c:14226
 #, c-format
 msgid " [sorted symbol table]"
 msgstr ""
 
-#: elf32-arm.c:14186 elf32-arm.c:14197
+#: elf32-arm.c:14217 elf32-arm.c:14228
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr ""
 
-#: elf32-arm.c:14192
+#: elf32-arm.c:14223
 #, c-format
 msgid " [Version2 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14200
+#: elf32-arm.c:14231
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr ""
 
-#: elf32-arm.c:14203
+#: elf32-arm.c:14234
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr ""
 
-#: elf32-arm.c:14210
+#: elf32-arm.c:14241
 #, c-format
 msgid " [Version3 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14214
+#: elf32-arm.c:14245
 #, c-format
 msgid " [Version4 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14218
+#: elf32-arm.c:14249
 #, c-format
 msgid " [Version5 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14221
+#: elf32-arm.c:14252
 #, c-format
 msgid " [soft-float ABI]"
 msgstr ""
 
-#: elf32-arm.c:14224
+#: elf32-arm.c:14255
 #, c-format
 msgid " [hard-float ABI]"
 msgstr ""
 
-#: elf32-arm.c:14230
+#: elf32-arm.c:14261
 #, c-format
 msgid " [BE8]"
 msgstr ""
 
-#: elf32-arm.c:14233
+#: elf32-arm.c:14264
 #, c-format
 msgid " [LE8]"
 msgstr ""
 
-#: elf32-arm.c:14239
+#: elf32-arm.c:14270
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr ""
 
-#: elf32-arm.c:14246
+#: elf32-arm.c:14277
 #, c-format
 msgid " [relocatable executable]"
 msgstr ""
 
-#: elf32-arm.c:14251 /work/sources/binutils/current/bfd/elfnn-aarch64.c:6689
+#: elf32-arm.c:14282 /work/sources/binutils/current/bfd/elfnn-aarch64.c:6971
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr ""
 
-#: elf32-arm.c:14368 elf32-i386.c:1510 elf32-s390.c:956 elf32-tic6x.c:2749
-#: elf32-tilepro.c:1471 elf32-xtensa.c:1018 elf64-s390.c:875
-#: elf64-x86-64.c:1823 elfxx-sparc.c:1420 elfxx-tilegx.c:1688
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6978
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:513
+#: elf32-arm.c:14399 elf32-i386.c:1517 elf32-s390.c:960 elf32-tic6x.c:2783
+#: elf32-tilepro.c:1479 elf32-xtensa.c:1024 elf64-s390.c:882
+#: elf64-x86-64.c:1826 elfxx-sparc.c:1424 elfxx-tilegx.c:1700
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7260
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:516
 #, c-format
-msgid "%B: bad symbol index: %d"
+msgid "%pB: bad symbol index: %d"
 msgstr ""
 
-#: elf32-arm.c:15636 elf32-hppa.c:2082 elf32-lm32.c:1989 elf32-m32r.c:2097
-#: elf32-metag.c:2792 elf32-nds32.c:3844 elf32-or1k.c:2281 elf32-ppc.c:6156
-#: elf32-s390.c:1851 elf32-sh.c:3289 elf32-tic6x.c:3205 elf32-tilepro.c:2237
-#: elf64-ppc.c:9893 elf64-s390.c:1785 elfxx-sparc.c:2457 elfxx-tilegx.c:2479
-#: elfxx-x86.c:563 /work/sources/binutils/current/bfd/elfnn-aarch64.c:8319
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:1112
+#: elf32-arm.c:15667 elf32-hppa.c:2088 elf32-lm32.c:1998 elf32-m32r.c:2110
+#: elf32-metag.c:2797 elf32-nds32.c:3840 elf32-or1k.c:2285 elf32-ppc.c:6550
+#: elf32-s390.c:1855 elf32-sh.c:2975 elf32-tic6x.c:3239 elf32-tilepro.c:2245
+#: elf64-ppc.c:10249 elf64-s390.c:1792 elfxx-sparc.c:2437 elfxx-tilegx.c:2491
+#: elfxx-x86.c:571 /work/sources/binutils/current/bfd/elfnn-aarch64.c:8610
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:1117
 #, c-format
-msgid "%B: dynamic relocation against `%T' in read-only section `%A'\n"
+msgid "%pB: dynamic relocation against `%pT' in read-only section `%pA'\n"
 msgstr ""
 
-#: elf32-arm.c:15881
-msgid "Errors encountered processing file %B"
+#: elf32-arm.c:15912
+#, c-format
+msgid "errors encountered processing file %pB"
 msgstr ""
 
-#: elf32-arm.c:16318 elflink.c:12394 elflink.c:12441
+#: elf32-arm.c:16349 elflink.c:12416 elflink.c:12463
 #, c-format
 msgid "could not find section %s"
 msgstr ""
 
-#: elf32-arm.c:17494
-msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
+#: elf32-arm.c:17525
+#, c-format
+msgid "%pB: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr ""
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:17521
-msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
+#: elf32-arm.c:17552
+#, c-format
+msgid "%pB: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr ""
 
-#: elf32-arm.c:18348 elf32-arm.c:18370
-msgid "%B: error: VFP11 veneer out of range"
+#: elf32-arm.c:18379 elf32-arm.c:18401
+#, c-format
+msgid "%pB: error: VFP11 veneer out of range"
 msgstr ""
 
-#: elf32-arm.c:18421
+#: elf32-arm.c:18452
+#, c-format
 msgid ""
-"%B(%#Lx): error: Cannot create STM32L4XX veneer. Jump out of range by %Ld "
-"bytes. Cannot encode branch instruction. "
+"%pB(%#<PRIx64>): error: cannot create STM32L4XX veneer; jump out of range by "
+"%<PRId64> bytes; cannot encode branch instruction"
 msgstr ""
 
-#: elf32-arm.c:18459
-msgid "%B: error: Cannot create STM32L4XX veneer."
+#: elf32-arm.c:18491
+#, c-format
+msgid "%pB: error: cannot create STM32L4XX veneer"
 msgstr ""
 
-#: elf32-arm.c:19481
-msgid "error: %B is already in final BE8 format"
+#: elf32-arm.c:19513
+#, c-format
+msgid "error: %pB is already in final BE8 format"
 msgstr ""
 
-#: elf32-arm.c:19557
+#: elf32-arm.c:19589
+#, c-format
 msgid ""
-"error: Source object %B has EABI version %d, but target %B has EABI version "
-"%d"
-msgstr ""
-
-#: elf32-arm.c:19572
-msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
+"error: source object %pB has EABI version %d, but target %pB has EABI "
+"version %d"
 msgstr ""
 
-#: elf32-arm.c:19596
-msgid "error: %B uses VFP instructions, whereas %B does not"
-msgstr ""
-
-#: elf32-arm.c:19600
-msgid "error: %B uses FPA instructions, whereas %B does not"
-msgstr ""
-
-#: elf32-arm.c:19610
-msgid "error: %B uses Maverick instructions, whereas %B does not"
+#: elf32-arm.c:19604
+#, c-format
+msgid "error: %pB is compiled for APCS-%d, whereas target %pB uses APCS-%d"
 msgstr ""
 
-#: elf32-arm.c:19614
-msgid "error: %B does not use Maverick instructions, whereas %B does"
+#: elf32-arm.c:19628 elf32-arm.c:19632 elf32-arm.c:19642
+#, c-format
+msgid "error: %pB uses %s instructions, whereas %pB does not"
 msgstr ""
 
-#: elf32-arm.c:19633
-msgid "error: %B uses software FP, whereas %B uses hardware FP"
+#: elf32-arm.c:19646
+#, c-format
+msgid "error: %pB does not use %s instructions, whereas %pB does"
 msgstr ""
 
-#: elf32-arm.c:19637
-msgid "error: %B uses hardware FP, whereas %B uses software FP"
+#: elf32-arm.c:19665
+#, c-format
+msgid "error: %pB uses software FP, whereas %pB uses hardware FP"
 msgstr ""
 
-#: elf32-avr.c:959
+#: elf32-arm.c:19669
 #, c-format
-msgid "%B: invalid AVR reloc number: %d"
+msgid "error: %pB uses hardware FP, whereas %pB uses software FP"
 msgstr ""
 
-#: elf32-avr.c:1510 elf32-bfin.c:3124 elf32-cris.c:2038 elf32-epiphany.c:574
-#: elf32-fr30.c:599 elf32-frv.c:4049 elf32-ft32.c:493 elf32-i860.c:1218
-#: elf32-ip2k.c:1486 elf32-iq2000.c:697 elf32-m32c.c:630 elf32-mep.c:532
-#: elf32-metag.c:1993 elf32-moxie.c:293 elf32-msp430.c:1361 elf32-mt.c:404
-#: elf32-or1k.c:1246 elf32-tilepro.c:3505 elf32-v850.c:2291 elf32-visium.c:685
-#: elf32-xstormy16.c:931 elf64-mmix.c:1546 elfxx-tilegx.c:3865
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2245
+#: elf32-avr.c:1513 elf32-bfin.c:3135 elf32-cris.c:2041 elf32-epiphany.c:577
+#: elf32-fr30.c:602 elf32-frv.c:4057 elf32-ft32.c:502 elf32-ip2k.c:1493
+#: elf32-iq2000.c:701 elf32-m32c.c:632 elf32-mep.c:534 elf32-metag.c:1998
+#: elf32-moxie.c:296 elf32-msp430.c:1366 elf32-mt.c:406 elf32-or1k.c:1250
+#: elf32-tilepro.c:3514 elf32-v850.c:2299 elf32-visium.c:689
+#: elf32-xstormy16.c:939 elf64-mmix.c:1549 elfxx-tilegx.c:3878
 msgid "internal error: dangerous relocation"
 msgstr ""
 
-#: elf32-avr.c:3319 /work/sources/binutils/current/bfd/elfnn-aarch64.c:2882
+#: elf32-avr.c:3322 /work/sources/binutils/current/bfd/elfnn-aarch64.c:3127
 #, c-format
 msgid "cannot create stub entry %s"
 msgstr ""
@@ -2023,536 +2045,464 @@ msgstr ""
 msgid "relocation should be even number"
 msgstr ""
 
-#: elf32-bfin.c:1577
+#: elf32-bfin.c:1585
 #, c-format
-msgid "%B(%A+%#Lx): unresolvable relocation against symbol `%s'"
+msgid "%pB(%pA+%#<PRIx64>): unresolvable relocation against symbol `%s'"
 msgstr ""
 
-#: elf32-bfin.c:1608 elf32-i386.c:3473 elf32-m68k.c:3971 elf32-s390.c:3261
-#: elf64-s390.c:3175 elf64-x86-64.c:3839
+#: elf32-bfin.c:1617 elf32-i386.c:3497 elf32-m68k.c:3976 elf32-s390.c:3266
+#: elf64-s390.c:3183 elf64-x86-64.c:3854
 #, c-format
-msgid "%B(%A+%#Lx): reloc against `%s': error %d"
+msgid "%pB(%pA+%#<PRIx64>): reloc against `%s': error %d"
 msgstr ""
 
-#: elf32-bfin.c:2628
+#: elf32-bfin.c:2638
 #, c-format
-msgid "%B: relocation at `%A+%#Lx' references symbol `%s' with nonzero addend"
+msgid ""
+"%pB: relocation at `%pA+%#<PRIx64>' references symbol `%s' with nonzero "
+"addend"
 msgstr ""
 
-#: elf32-bfin.c:2644
+#: elf32-bfin.c:2655
 msgid "relocation references symbol not defined in the module"
 msgstr ""
 
-#: elf32-bfin.c:2741
+#: elf32-bfin.c:2752
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:2782 elf32-bfin.c:2905
+#: elf32-bfin.c:2793 elf32-bfin.c:2916
 msgid "cannot emit fixups in read-only section"
 msgstr ""
 
-#: elf32-bfin.c:2813 elf32-bfin.c:2943 elf32-lm32.c:1044 elf32-sh.c:4926
+#: elf32-bfin.c:2824 elf32-bfin.c:2954 elf32-lm32.c:1049 elf32-sh.c:4507
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr ""
 
-#: elf32-bfin.c:2863
+#: elf32-bfin.c:2874
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:3028
+#: elf32-bfin.c:3039
 msgid "relocations between different segments are not supported"
 msgstr ""
 
-#: elf32-bfin.c:3029
+#: elf32-bfin.c:3040
 msgid "warning: relocation references a different segment"
 msgstr ""
 
-#: elf32-bfin.c:4687
+#: elf32-bfin.c:4787 elf32-frv.c:6603
 #, c-format
-msgid "%B: unsupported relocation type %d"
-msgstr ""
-
-#: elf32-bfin.c:4776 elf32-frv.c:6596
-msgid "%B: cannot link non-fdpic object file into fdpic executable"
+msgid "%pB: cannot link non-fdpic object file into fdpic executable"
 msgstr ""
 
-#: elf32-bfin.c:4780 elf32-frv.c:6600
-msgid "%B: cannot link fdpic object file into non-fdpic executable"
+#: elf32-bfin.c:4791 elf32-frv.c:6607
+#, c-format
+msgid "%pB: cannot link fdpic object file into non-fdpic executable"
 msgstr ""
 
-#: elf32-bfin.c:4930
+#: elf32-bfin.c:4941
 #, c-format
 msgid "*** check this relocation %s"
 msgstr ""
 
-#: elf32-bfin.c:5046
+#: elf32-bfin.c:5057
 msgid ""
 "the bfin target does not currently support the generation of copy relocations"
 msgstr ""
 
-#: elf32-cr16.c:653
-#, c-format
-msgid "Unsupported CR16 relocation type: 0x%x\n"
-msgstr ""
-
-#: elf32-cr16.c:682
-#, c-format
-msgid "%B: unrecognised CR16 reloc number: %d"
-msgstr ""
-
-#: elf32-cr16c.c:186
-#, c-format
-msgid "%B: invalid CR16C reloc number: %d"
-msgstr ""
-
-#: elf32-cris.c:467
-#, c-format
-msgid "%B: invalid CRIS reloc number: %d"
+#: elf32-bfin.c:5351 elf32-cr16.c:2803 elf32-m68k.c:4390
+msgid "unsupported relocation type"
 msgstr ""
 
-#: elf32-cris.c:1116
+#: elf32-cris.c:1119
 #, c-format
-msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
+msgid "%pB, section %pA: unresolvable relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1181
+#: elf32-cris.c:1184
 #, c-format
-msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'"
+msgid "%pB, section %pA: no PLT nor GOT for relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1184
+#: elf32-cris.c:1187
 #, c-format
-msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
+msgid "%pB, section %pA: no PLT for relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1190 elf32-cris.c:1323 elf32-cris.c:1588 elf32-cris.c:1671
-#: elf32-cris.c:1824 elf32-tic6x.c:2586
+#: elf32-cris.c:1193 elf32-cris.c:1326 elf32-cris.c:1591 elf32-cris.c:1674
+#: elf32-cris.c:1827 elf32-tic6x.c:2619
 msgid "[whose name is lost]"
 msgstr ""
 
-#: elf32-cris.c:1308 elf32-tic6x.c:2570
+#: elf32-cris.c:1311 elf32-tic6x.c:2603
 #, c-format
 msgid ""
-"%B, section %A: relocation %s with non-zero addend %Ld against local symbol"
+"%pB, section %pA: relocation %s with non-zero addend %<PRId64> against local "
+"symbol"
 msgstr ""
 
-#: elf32-cris.c:1317 elf32-cris.c:1665 elf32-cris.c:1818 elf32-tic6x.c:2579
+#: elf32-cris.c:1320 elf32-cris.c:1668 elf32-cris.c:1821 elf32-tic6x.c:2612
 #, c-format
 msgid ""
-"%B, section %A: relocation %s with non-zero addend %Ld against symbol `%s'"
+"%pB, section %pA: relocation %s with non-zero addend %<PRId64> against "
+"symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1344
+#: elf32-cris.c:1347
 #, c-format
-msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'"
+msgid "%pB, section %pA: relocation %s is not allowed for global symbol: `%s'"
 msgstr ""
 
-#: elf32-cris.c:1361
+#: elf32-cris.c:1364
 #, c-format
-msgid "%B, section %A: relocation %s with no GOT created"
+msgid "%pB, section %pA: relocation %s with no GOT created"
 msgstr ""
 
 #. We shouldn't get here for GCC-emitted code.
-#: elf32-cris.c:1578
+#: elf32-cris.c:1581
 #, c-format
 msgid ""
-"%B, section %A: relocation %s has an undefined reference to `%s', perhaps a "
-"declaration mixup?"
+"%pB, section %pA: relocation %s has an undefined reference to `%s', perhaps "
+"a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:1581
+#: elf32-cris.c:1584
 #, c-format
 msgid ""
-"%B, section %A: relocation %s is not allowed for `%s', a global symbol with "
-"default visibility, perhaps a declaration mixup?"
+"%pB, section %pA: relocation %s is not allowed for `%s', a global symbol "
+"with default visibility, perhaps a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:1952
+#: elf32-cris.c:1955
 #, c-format
 msgid ""
-"%B, section %A: relocation %s is not allowed for symbol: `%s' which is "
+"%pB, section %pA: relocation %s is not allowed for symbol: `%s' which is "
 "defined outside the program, perhaps a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:2005
+#: elf32-cris.c:2008
 msgid "(too many global variables for -fpic: recompile with -fPIC)"
 msgstr ""
 
-#: elf32-cris.c:2012
+#: elf32-cris.c:2015
 msgid ""
 "(thread-local data too big for -fpic or -msmall-tls: recompile with -fPIC or "
 "-mno-small-tls)"
 msgstr ""
 
-#: elf32-cris.c:3047
+#: elf32-cris.c:3050
 #, c-format
 msgid ""
-"%B, section %A:\n"
-"  v10/v32 compatible object must not contain a PIC relocation"
+"%pB, section %pA: v10/v32 compatible object must not contain a PIC relocation"
 msgstr ""
 
-#: elf32-cris.c:3101
+#: elf32-cris.c:3104
 #, c-format
 msgid ""
-"%B, section %A:\n"
+"%pB, section %pA:\n"
 "  relocation %s not valid in a shared object; typically an option mixup, "
 "recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3319
+#: elf32-cris.c:3322
 #, c-format
 msgid ""
-"%B, section %A:\n"
-"  relocation %s should not be used in a shared object; recompile with -fPIC"
+"%pB, section %pA: relocation %s should not be used in a shared object; "
+"recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3744
+#: elf32-cris.c:3747
 #, c-format
 msgid ""
-"%B, section `%A', to symbol `%s':\n"
-"  relocation %s should not be used in a shared object; recompile with -fPIC"
+"%pB, section `%pA', to symbol `%s': relocation %s should not be used in a "
+"shared object; recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3857
-msgid "Unexpected machine number"
+#: elf32-cris.c:3860
+msgid "unexpected machine number"
 msgstr ""
 
-#: elf32-cris.c:3908
+#: elf32-cris.c:3911
 #, c-format
 msgid " [symbols have a _ prefix]"
 msgstr ""
 
-#: elf32-cris.c:3911
+#: elf32-cris.c:3914
 #, c-format
 msgid " [v10 and v32]"
 msgstr ""
 
-#: elf32-cris.c:3914
+#: elf32-cris.c:3917
 #, c-format
 msgid " [v32]"
 msgstr ""
 
-#: elf32-cris.c:3958
-msgid "%B: uses _-prefixed symbols, but writing file with non-prefixed symbols"
-msgstr ""
-
-#: elf32-cris.c:3959
-msgid "%B: uses non-prefixed symbols, but writing file with _-prefixed symbols"
-msgstr ""
-
-#: elf32-cris.c:3978
-msgid "%B contains CRIS v32 code, incompatible with previous objects"
-msgstr ""
-
-#: elf32-cris.c:3980
-msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
+#: elf32-cris.c:3961
+#, c-format
+msgid ""
+"%pB: uses _-prefixed symbols, but writing file with non-prefixed symbols"
 msgstr ""
 
-#: elf32-crx.c:429
+#: elf32-cris.c:3962
 #, c-format
-msgid "%B: unrecognised CRX reloc number: %d"
+msgid ""
+"%pB: uses non-prefixed symbols, but writing file with _-prefixed symbols"
 msgstr ""
 
-#: elf32-d10v.c:234
+#: elf32-cris.c:3981
 #, c-format
-msgid "%B: invalid D10V reloc number: %d"
+msgid "%pB contains CRIS v32 code, incompatible with previous objects"
 msgstr ""
 
-#: elf32-d30v.c:522 elf32-d30v.c:541
+#: elf32-cris.c:3983
 #, c-format
-msgid "%B: invalid D30V reloc number: %d"
+msgid "%pB contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr ""
 
 #: elf32-dlx.c:141
 #, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
+msgid "branch (PC rel16) to section (%s) not supported"
 msgstr ""
 
 #: elf32-dlx.c:204
 #, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr ""
-
-#: elf32-dlx.c:548
-#, c-format
-msgid "Invalid DLX reloc number: %d"
-msgstr ""
-
-#: elf32-epiphany.c:376
-#, c-format
-msgid "%B: invalid Epiphany reloc number: %d"
+msgid "jump (PC rel26) to section (%s) not supported"
 msgstr ""
 
 #. Only if it's not an unresolved symbol.
-#: elf32-epiphany.c:570 elf32-ip2k.c:1482
+#: elf32-epiphany.c:573 elf32-ip2k.c:1489
 msgid "unsupported relocation between data/insn address spaces"
 msgstr ""
 
-#: elf32-fr30.c:381
-#, c-format
-msgid "%B: invalid FR30 reloc number: %d"
-msgstr ""
-
-#: elf32-frv.c:1451 elf32-frv.c:1602
+#: elf32-frv.c:1452 elf32-frv.c:1603
 msgid "relocation requires zero addend"
 msgstr ""
 
-#: elf32-frv.c:2557
-#, c-format
-msgid "%B: invalid FRV reloc number: %d"
-msgstr ""
-
-#: elf32-frv.c:2823
+#: elf32-frv.c:2829
 #, c-format
 msgid "%H: relocation to `%s+%v' may have caused the error above\n"
 msgstr ""
 
-#: elf32-frv.c:2840
+#: elf32-frv.c:2846
 msgid "%H: relocation references symbol not defined in the module\n"
 msgstr ""
 
-#: elf32-frv.c:2916
+#: elf32-frv.c:2922
 msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
 msgstr ""
 
-#: elf32-frv.c:2957
+#: elf32-frv.c:2963
 msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3028
+#: elf32-frv.c:3034
 msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3065
+#: elf32-frv.c:3071
 msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3112
+#: elf32-frv.c:3118
 msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3196
+#: elf32-frv.c:3202
 msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3250
+#: elf32-frv.c:3256
 msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3280
+#: elf32-frv.c:3286
 msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3309
+#: elf32-frv.c:3315
 msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3339
+#: elf32-frv.c:3345
 msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3384
+#: elf32-frv.c:3390
 msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3411
+#: elf32-frv.c:3417
 msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3532
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
+#: elf32-frv.c:3538 elf32-frv.c:3660
+msgid "%H: %s references dynamic symbol with nonzero addend\n"
 msgstr ""
 
-#: elf32-frv.c:3573 elf32-frv.c:3695
+#: elf32-frv.c:3580 elf32-frv.c:3703
 msgid "%H: cannot emit fixups in read-only section\n"
 msgstr ""
 
-#: elf32-frv.c:3604 elf32-frv.c:3738
+#: elf32-frv.c:3611 elf32-frv.c:3746
 msgid "%H: cannot emit dynamic relocations in read-only section\n"
 msgstr ""
 
-#: elf32-frv.c:3653
-msgid ""
-"%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
-msgstr ""
-
-#: elf32-frv.c:3910
+#: elf32-frv.c:3918
 #, c-format
 msgid "%H: reloc against `%s' references a different segment\n"
 msgstr ""
 
-#: elf32-frv.c:4061
+#: elf32-frv.c:4069
 #, c-format
 msgid "%H: reloc against `%s': %s\n"
 msgstr ""
 
-#: elf32-frv.c:6255
-#, c-format
-msgid "%B: unsupported relocation type %i\n"
-msgstr ""
-
-#: elf32-frv.c:6507
+#: elf32-frv.c:6514
 #, c-format
 msgid ""
-"%B: compiled with %s and linked with modules that use non-pic relocations"
+"%pB: compiled with %s and linked with modules that use non-pic relocations"
 msgstr ""
 
-#: elf32-frv.c:6561 elf32-iq2000.c:828 elf32-m32c.c:874
+#: elf32-frv.c:6568 elf32-iq2000.c:832 elf32-m32c.c:876
 #, c-format
-msgid "%B: compiled with %s and linked with modules compiled with %s"
+msgid "%pB: compiled with %s and linked with modules compiled with %s"
 msgstr ""
 
-#: elf32-frv.c:6574
+#: elf32-frv.c:6581
 #, c-format
 msgid ""
-"%B: uses different unknown e_flags (%#x) fields than previous modules (%#x)"
+"%pB: uses different unknown e_flags (%#x) fields than previous modules (%#x)"
 msgstr ""
 
-#: elf32-gen.c:69 elf64-gen.c:69
+#: elf32-gen.c:71
 #, c-format
-msgid "%B: Relocations in generic ELF (EM: %d)"
+msgid "%pB: relocations in generic ELF (EM: %d)"
 msgstr ""
 
-#: elf32-hppa.c:829 elf32-hppa.c:3499
+#: elf32-hppa.c:832 elf32-hppa.c:3506
 #, c-format
-msgid "%B(%A+%#Lx): cannot reach %s, recompile with -ffunction-sections"
+msgid ""
+"%pB(%pA+%#<PRIx64>): cannot reach %s, recompile with -ffunction-sections"
 msgstr ""
 
-#: elf32-hppa.c:1242
+#: elf32-hppa.c:1246
 #, c-format
 msgid ""
-"%B: relocation %s can not be used when making a shared object; recompile "
+"%pB: relocation %s can not be used when making a shared object; recompile "
 "with -fPIC"
 msgstr ""
 
-#: elf32-hppa.c:2680
+#: elf32-hppa.c:2686
 #, c-format
-msgid "%B: duplicate export stub %s"
+msgid "%pB: duplicate export stub %s"
 msgstr ""
 
-#: elf32-hppa.c:3333
+#: elf32-hppa.c:3339
 #, c-format
 msgid ""
-"%B(%A+%#Lx): %s fixup for insn %#x is not supported in a non-shared link"
+"%pB(%pA+%#<PRIx64>): %s fixup for insn %#x is not supported in a non-shared "
+"link"
 msgstr ""
 
-#: elf32-hppa.c:4124
+#: elf32-hppa.c:4135
 #, c-format
 msgid "%s has both normal and TLS relocs"
 msgstr ""
 
-#: elf32-hppa.c:4142
-msgid "%B:%s has both normal and TLS relocs"
-msgstr ""
-
-#: elf32-hppa.c:4201
+#: elf32-hppa.c:4153
 #, c-format
-msgid "%B(%A+%#Lx): cannot handle %s for %s"
-msgstr ""
-
-#: elf32-hppa.c:4505
-msgid ".got section not immediately after .plt section"
+msgid "%pB:%s has both normal and TLS relocs"
 msgstr ""
 
-#: elf32-i370.c:307
+#: elf32-hppa.c:4212
 #, c-format
-msgid "%B: unrecognised I370 reloc number: %d"
-msgstr ""
-
-#: elf32-i370.c:1164
-msgid "%B: unknown relocation type %d for symbol %s"
+msgid "%pB(%pA+%#<PRIx64>): cannot handle %s for %s"
 msgstr ""
 
-#: elf32-i370.c:1306
-#, c-format
-msgid "%B: Relocation %s is not yet supported for symbol %s."
+#: elf32-hppa.c:4516
+msgid ".got section not immediately after .plt section"
 msgstr ""
 
-#. Unknown relocation.
-#: elf32-i386.c:384 elf32-m68k.c:352 elf32-ppc.c:2039 elf32-s390.c:346
-#: elf32-tic6x.c:2609 elf32-wasm32.c:106 elf64-ppc.c:2516 elf64-s390.c:373
-#: elf64-x86-64.c:285
+#: elf32-i386.c:351
 #, c-format
-msgid "%B: invalid relocation type %d"
+msgid "%pB: unsupported relocation type: %#x"
 msgstr ""
 
-#: elf32-i386.c:1159 elf64-x86-64.c:1335
+#: elf32-i386.c:1166 elf64-x86-64.c:1338
 #, c-format
 msgid ""
-"%B: TLS transition from %s to %s against `%s' at %#Lx in section `%A' failed"
+"%pB: TLS transition from %s to %s against `%s' at %#<PRIx64> in section `"
+"%pA' failed"
 msgstr ""
 
-#: elf32-i386.c:1250
+#: elf32-i386.c:1257
 #, c-format
 msgid ""
-"%B: direct GOT relocation R_386_GOT32X against `%s' without base register "
+"%pB: direct GOT relocation R_386_GOT32X against `%s' without base register "
 "can not be used when making a shared object"
 msgstr ""
 
-#: elf32-i386.c:1703 elf32-s390.c:1184 elf32-sh.c:6057 elf32-tilepro.c:1584
-#: elf32-xtensa.c:1192 elf64-s390.c:1113 elfxx-sparc.c:1601 elfxx-tilegx.c:1793
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:427
+#: elf32-i386.c:1714 elf32-s390.c:1188 elf32-sh.c:5570 elf32-tilepro.c:1592
+#: elf32-xtensa.c:1198 elf64-s390.c:1120 elfxx-sparc.c:1593 elfxx-tilegx.c:1805
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:428
 #, c-format
-msgid "%B: `%s' accessed both as normal and thread local symbol"
+msgid "%pB: `%s' accessed both as normal and thread local symbol"
 msgstr ""
 
-#: elf32-i386.c:1767
+#: elf32-i386.c:1786
 #, c-format
-msgid "%B: unsupported non-PIC call to IFUNC `%s'"
+msgid "%pB: unsupported non-PIC call to IFUNC `%s'"
 msgstr ""
 
-#: elf32-i386.c:2345 elf64-x86-64.c:2625
+#: elf32-i386.c:2368 elf64-x86-64.c:2628
 #, c-format
-msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't supported"
+msgid "%pB: relocation %s against STT_GNU_IFUNC symbol `%s' isn't supported"
 msgstr ""
 
-#: elf32-i386.c:2378 elf32-i386.c:3684 elf32-i386.c:3823 elf64-x86-64.c:2682
-#: elf64-x86-64.c:4012 elf64-x86-64.c:4166
-msgid "Local IFUNC function `%s' in %B\n"
+#: elf32-i386.c:2401 elf32-i386.c:3708 elf32-i386.c:3847 elf64-x86-64.c:2685
+#: elf64-x86-64.c:4027 elf64-x86-64.c:4181
+#, c-format
+msgid "Local IFUNC function `%s' in %pB\n"
 msgstr ""
 
-#: elf32-i386.c:2593
+#: elf32-i386.c:2617
 #, c-format
 msgid ""
-"%B: direct GOT relocation %s against `%s' without base register can not be "
+"%pB: direct GOT relocation %s against `%s' without base register can not be "
 "used when making a shared object"
 msgstr ""
 
-#: elf32-i386.c:2628 elf64-x86-64.c:2873
+#: elf32-i386.c:2652 elf64-x86-64.c:2877
 msgid "hidden symbol"
 msgstr ""
 
-#: elf32-i386.c:2631 elf64-x86-64.c:2876
+#: elf32-i386.c:2655 elf64-x86-64.c:2880
 msgid "internal symbol"
 msgstr ""
 
-#: elf32-i386.c:2634 elf64-x86-64.c:2879
+#: elf32-i386.c:2658 elf64-x86-64.c:2883
 msgid "protected symbol"
 msgstr ""
 
-#: elf32-i386.c:2637 elf64-x86-64.c:2882
+#: elf32-i386.c:2661 elf64-x86-64.c:2886
 msgid "symbol"
 msgstr ""
 
-#: elf32-i386.c:2643
+#: elf32-i386.c:2667
 #, c-format
 msgid ""
-"%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when "
+"%pB: relocation R_386_GOTOFF against undefined %s `%s' can not be used when "
 "making a shared object"
 msgstr ""
 
-#: elf32-i386.c:2656
+#: elf32-i386.c:2680
 #, c-format
 msgid ""
-"%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when "
+"%pB: relocation R_386_GOTOFF against protected %s `%s' can not be used when "
 "making a shared object"
 msgstr ""
 
-#: elf32-i960.c:140
-#, c-format
-msgid "%B: invalid i960 reloc number: %d"
-msgstr ""
-
 #: elf32-ip2k.c:856 elf32-ip2k.c:862 elf32-ip2k.c:929 elf32-ip2k.c:935
 msgid ""
 "ip2k relaxer: switch table without complete matching relocation information."
@@ -2562,224 +2512,180 @@ msgstr ""
 msgid "ip2k relaxer: switch table header corrupt."
 msgstr ""
 
-#: elf32-ip2k.c:1245
+#: elf32-ip2k.c:1302
 #, c-format
-msgid "%B: invalid IP2K reloc number: %d"
+msgid "ip2k linker: missing page instruction at %#<PRIx64> (dest = %#<PRIx64>)"
 msgstr ""
 
-#: elf32-ip2k.c:1298
+#: elf32-ip2k.c:1321
 #, c-format
-msgid "ip2k linker: missing page instruction at %#Lx (dest = %#Lx)"
-msgstr ""
-
-#: elf32-ip2k.c:1315
-#, c-format
-msgid "ip2k linker: redundant page instruction at %#Lx (dest = %#Lx)"
-msgstr ""
-
-#: elf32-iq2000.c:441
-#, c-format
-msgid "%B: invalid IQ2000 reloc number: %d"
-msgstr ""
-
-#: elf32-lm32.c:539
-#, c-format
-msgid "%B: invalid LM32 reloc number: %d"
+msgid ""
+"ip2k linker: redundant page instruction at %#<PRIx64> (dest = %#<PRIx64>)"
 msgstr ""
 
-#: elf32-lm32.c:648 elf32-nios2.c:3133
+#: elf32-lm32.c:651 elf32-nios2.c:3141
 msgid "global pointer relative relocation when _gp not defined"
 msgstr ""
 
-#: elf32-lm32.c:703 elf32-nios2.c:3570
+#: elf32-lm32.c:706 elf32-nios2.c:3578
 msgid "global pointer relative address out of range"
 msgstr ""
 
-#: elf32-lm32.c:998
-msgid "internal error: addend should be zero for R_LM32_16_GOT"
-msgstr ""
-
-#: elf32-m32c.c:306
-#, c-format
-msgid "%B: invalid M32C reloc number: %d"
-msgstr ""
-
-#: elf32-m32r.c:1286
+#: elf32-lm32.c:1002 elf32-or1k.c:968
 #, c-format
-msgid "%B: invalid M32R reloc number: %d"
+msgid "internal error: addend should be zero for %s"
 msgstr ""
 
-#: elf32-m32r.c:1458
+#: elf32-m32r.c:1471
 msgid "SDA relocation when _SDA_BASE_ not defined"
 msgstr ""
 
-#: elf32-m32r.c:2971 elf32-microblaze.c:1064 elf32-microblaze.c:1112
+#: elf32-m32r.c:2984 elf32-microblaze.c:1101 elf32-microblaze.c:1149
 #, c-format
-msgid "%B: The target (%s) of an %s relocation is in the wrong section (%A)"
+msgid "%pB: the target (%s) of an %s relocation is in the wrong section (%pA)"
 msgstr ""
 
-#: elf32-m32r.c:3473
-msgid "%B: Instruction set mismatch with previous modules"
+#: elf32-m32r.c:3487
+#, c-format
+msgid "%pB: instruction set mismatch with previous modules"
 msgstr ""
 
-#: elf32-m32r.c:3494 elf32-nds32.c:6037
+#: elf32-m32r.c:3508 elf32-nds32.c:6010
 #, c-format
 msgid "private flags = %lx"
 msgstr ""
 
-#: elf32-m32r.c:3499
+#: elf32-m32r.c:3513
 #, c-format
 msgid ": m32r instructions"
 msgstr ""
 
-#: elf32-m32r.c:3500
+#: elf32-m32r.c:3514
 #, c-format
 msgid ": m32rx instructions"
 msgstr ""
 
-#: elf32-m32r.c:3501
+#: elf32-m32r.c:3515
 #, c-format
 msgid ": m32r2 instructions"
 msgstr ""
 
-#: elf32-m68hc11.c:390
-#, c-format
-msgid "%B: invalid M68HC11 reloc number: %d"
-msgstr ""
-
-#: elf32-m68hc12.c:510
-#, c-format
-msgid "%B: invalid M68HC12 reloc number: %d"
-msgstr ""
-
-#: elf32-m68hc1x.c:1115
+#: elf32-m68hc1x.c:1116
 #, c-format
 msgid ""
-"Reference to the far symbol `%s' using a wrong relocation may result in "
+"reference to the far symbol `%s' using a wrong relocation may result in "
 "incorrect execution"
 msgstr ""
 
-#: elf32-m68hc1x.c:1149
+#: elf32-m68hc1x.c:1150
 #, c-format
 msgid ""
 "XGATE address (%lx) is not within shared RAM(0xE000-0xFFFF), therefore you "
 "must manually offset the address, and possibly manage the page, in your code."
 msgstr ""
 
-#: elf32-m68hc1x.c:1167
+#: elf32-m68hc1x.c:1168
 #, c-format
 msgid ""
 "banked address [%lx:%04lx] (%lx) is not in the same bank as current banked "
 "address [%lx:%04lx] (%lx)"
 msgstr ""
 
-#: elf32-m68hc1x.c:1183
+#: elf32-m68hc1x.c:1184
 #, c-format
 msgid ""
 "reference to a banked address [%lx:%04lx] in the normal address space at "
 "%04lx"
 msgstr ""
 
-#: elf32-m68hc1x.c:1224
+#: elf32-m68hc1x.c:1225
 #, c-format
 msgid ""
 "S12 address (%lx) is not within shared RAM(0x2000-0x4000), therefore you "
 "must manually offset the address in your code"
 msgstr ""
 
-#: elf32-m68hc1x.c:1351
+#: elf32-m68hc1x.c:1352
+#, c-format
 msgid ""
-"%B: linking files compiled for 16-bit integers (-mshort) and others for 32-"
+"%pB: linking files compiled for 16-bit integers (-mshort) and others for 32-"
 "bit integers"
 msgstr ""
 
-#: elf32-m68hc1x.c:1358
+#: elf32-m68hc1x.c:1359
+#, c-format
 msgid ""
-"%B: linking files compiled for 32-bit double (-fshort-double) and others for "
-"64-bit double"
+"%pB: linking files compiled for 32-bit double (-fshort-double) and others "
+"for 64-bit double"
 msgstr ""
 
-#: elf32-m68hc1x.c:1367
-msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
+#: elf32-m68hc1x.c:1368
+#, c-format
+msgid "%pB: linking files compiled for HCS12 with others compiled for HC12"
 msgstr ""
 
-#: elf32-m68hc1x.c:1412 elf32-xgate.c:672
+#: elf32-m68hc1x.c:1413 elf32-xgate.c:675
 #, c-format
 msgid "[abi=32-bit int, "
 msgstr ""
 
-#: elf32-m68hc1x.c:1414 elf32-xgate.c:674
+#: elf32-m68hc1x.c:1415 elf32-xgate.c:677
 #, c-format
 msgid "[abi=16-bit int, "
 msgstr ""
 
-#: elf32-m68hc1x.c:1417 elf32-xgate.c:677
+#: elf32-m68hc1x.c:1418 elf32-xgate.c:680
 #, c-format
 msgid "64-bit double, "
 msgstr ""
 
-#: elf32-m68hc1x.c:1419 elf32-xgate.c:679
+#: elf32-m68hc1x.c:1420 elf32-xgate.c:682
 #, c-format
 msgid "32-bit double, "
 msgstr ""
 
-#: elf32-m68hc1x.c:1422
+#: elf32-m68hc1x.c:1423
 #, c-format
 msgid "cpu=HC11]"
 msgstr ""
 
-#: elf32-m68hc1x.c:1424
+#: elf32-m68hc1x.c:1425
 #, c-format
 msgid "cpu=HCS12]"
 msgstr ""
 
-#: elf32-m68hc1x.c:1426
+#: elf32-m68hc1x.c:1427
 #, c-format
 msgid "cpu=HC12]"
 msgstr ""
 
-#: elf32-m68hc1x.c:1429
+#: elf32-m68hc1x.c:1430
 #, c-format
 msgid " [memory=bank-model]"
 msgstr ""
 
-#: elf32-m68hc1x.c:1431
+#: elf32-m68hc1x.c:1432
 #, c-format
 msgid " [memory=flat]"
 msgstr ""
 
-#: elf32-m68hc1x.c:1434
+#: elf32-m68hc1x.c:1435
 #, c-format
 msgid " [XGATE RAM offsetting]"
 msgstr ""
 
-#: elf32-m68k.c:1214 elf32-m68k.c:1215 vms-alpha.c:7477 vms-alpha.c:7493
+#: elf32-m68k.c:1216 elf32-m68k.c:1217 vms-alpha.c:7478 vms-alpha.c:7494
 msgid "unknown"
 msgstr ""
 
-#: elf32-m68k.c:1658
-#, c-format
-msgid "%B: GOT overflow: Number of relocations with 8-bit offset > %d"
-msgstr ""
-
-#: elf32-m68k.c:1665
-#, c-format
-msgid "%B: GOT overflow: Number of relocations with 8- or 16-bit offset > %d"
-msgstr ""
-
-#: elf32-mcore.c:100 elf32-mcore.c:455
-#, c-format
-msgid "%B: Relocation %s (%d) is not currently supported.\n"
-msgstr ""
-
-#: elf32-mcore.c:355
+#: elf32-m68k.c:1660
 #, c-format
-msgid "%B: unrecognised MCore reloc number: %d"
+msgid "%pB: GOT overflow: number of relocations with 8-bit offset > %d"
 msgstr ""
 
-#: elf32-mcore.c:440
+#: elf32-m68k.c:1667
 #, c-format
-msgid "%B: Unknown relocation type %d\n"
+msgid "%pB: GOT overflow: number of relocations with 8- or 16-bit offset > %d"
 msgstr ""
 
 #. Pacify gcc -Wall.
@@ -2793,460 +2699,374 @@ msgstr ""
 msgid "MeP: howto %d has type %d"
 msgstr ""
 
-#: elf32-mep.c:390
-#, c-format
-msgid "%B: invalid MEP reloc number: %d"
-msgstr ""
-
-#: elf32-mep.c:620
+#: elf32-mep.c:622
 #, c-format
-msgid "%B and %B are for different cores"
+msgid "%pB and %pB are for different cores"
 msgstr ""
 
-#: elf32-mep.c:639
+#: elf32-mep.c:641
 #, c-format
-msgid "%B and %B are for different configurations"
+msgid "%pB and %pB are for different configurations"
 msgstr ""
 
-#: elf32-mep.c:677
+#: elf32-mep.c:679
 #, c-format
 msgid "private flags = 0x%lx"
 msgstr ""
 
-#: elf32-metag.c:878
+#: elf32-metag.c:1863
 #, c-format
-msgid "%B: invalid METAG reloc number: %d"
+msgid "%pB(%pA): multiple TLS models are not supported"
 msgstr ""
 
-#: elf32-metag.c:1860
-msgid "%B(%A): multiple TLS models are not supported"
-msgstr ""
-
-#: elf32-metag.c:1863
+#: elf32-metag.c:1866
+#, c-format
 msgid ""
-"%B(%A): shared library symbol %s encountered whilst performing a static link"
+"%pB(%pA): shared library symbol %s encountered whilst performing a static "
+"link"
 msgstr ""
 
-#: elf32-microblaze.c:656
+#: elf32-microblaze.c:1544 elf32-or1k.c:1056 elf32-tilepro.c:3155
+#: elfxx-sparc.c:3540 elfxx-tilegx.c:3543
 #, c-format
-msgid "%B: unrecognised MicroBlaze reloc number: %d"
+msgid "%pB: probably compiled without -fPIC?"
 msgstr ""
 
-#: elf32-microblaze.c:1482 elf32-or1k.c:1052 elf32-tilepro.c:3147
-#: elfxx-sparc.c:3537 elfxx-tilegx.c:3531
-msgid "%B: probably compiled without -fPIC?"
-msgstr ""
-
-#: elf32-mips.c:1777 elf64-mips.c:3200 elfn32-mips.c:3014
+#: elf32-mips.c:1775 elf64-mips.c:3196 elfn32-mips.c:3012
 msgid "literal relocation occurs for an external symbol"
 msgstr ""
 
-#: elf32-mips.c:1824 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:3243
-#: elfn32-mips.c:3055
+#: elf32-mips.c:1822 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:3239
+#: elfn32-mips.c:3053
 msgid "32bits gp relative relocation occurs for an external symbol"
 msgstr ""
 
-#: elf32-mips.c:2225
-#, c-format
-msgid "Unrecognised MIPS reloc number: %d"
-msgstr ""
-
-#: elf32-moxie.c:137
-#, c-format
-msgid "%B: invalid Moxie reloc number: %d"
-msgstr ""
-
-#: elf32-msp430.c:648
-#, c-format
-msgid "%B: invalid MSP430X reloc number: %d"
-msgstr ""
-
-#: elf32-msp430.c:658
-#, c-format
-msgid "%B: invalid MSP430 reloc number: %d"
-msgstr ""
-
-#: elf32-msp430.c:832 elf32-msp430.c:1146
-msgid "Try enabling relaxation to avoid relocation truncations"
+#: elf32-msp430.c:837 elf32-msp430.c:1151
+msgid "try enabling relaxation to avoid relocation truncations"
 msgstr ""
 
-#: elf32-msp430.c:1353
+#: elf32-msp430.c:1358
 msgid "internal error: branch/jump to an odd address detected"
 msgstr ""
 
-#: elf32-msp430.c:2352
+#: elf32-msp430.c:2357
 #, c-format
-msgid "Warning: %B: Unknown MSPABI object attribute %d"
+msgid "warning: %pB: unknown MSPABI object attribute %d"
 msgstr ""
 
-#: elf32-msp430.c:2445
+#: elf32-msp430.c:2450
 #, c-format
-msgid "error: %B uses %s instructions but %B uses %s"
+msgid "error: %pB uses %s instructions but %pB uses %s"
 msgstr ""
 
-#: elf32-msp430.c:2457
+#: elf32-msp430.c:2462
 #, c-format
-msgid "error: %B uses the %s code model whereas %B uses the %s code model"
+msgid "error: %pB uses the %s code model whereas %pB uses the %s code model"
 msgstr ""
 
-#: elf32-msp430.c:2469
+#: elf32-msp430.c:2474
 #, c-format
-msgid "error: %B uses the large code model but %B uses MSP430 instructions"
+msgid "error: %pB uses the large code model but %pB uses MSP430 instructions"
 msgstr ""
 
-#: elf32-msp430.c:2480
+#: elf32-msp430.c:2485
 #, c-format
-msgid "error: %B uses the %s data model whereas %B uses the %s data model"
+msgid "error: %pB uses the %s data model whereas %pB uses the %s data model"
 msgstr ""
 
-#: elf32-msp430.c:2492
+#: elf32-msp430.c:2497
 #, c-format
-msgid "error: %B uses the small code model but %B uses the %s data model"
+msgid "error: %pB uses the small code model but %pB uses the %s data model"
 msgstr ""
 
-#: elf32-msp430.c:2504
+#: elf32-msp430.c:2509
 #, c-format
-msgid "error: %B uses the %s data model but %B only uses MSP430 instructions"
+msgid "error: %pB uses the %s data model but %pB only uses MSP430 instructions"
 msgstr ""
 
-#: elf32-mt.c:242
+#: elf32-nds32.c:3228
 #, c-format
-msgid "%B: invalid MT reloc number: %d"
+msgid "error: can't find symbol: %s"
 msgstr ""
 
-#: elf32-nds32.c:2897
+#: elf32-nds32.c:4869
 #, c-format
-msgid "%B: invalid NDS32 reloc number: %d"
+msgid "%pB: warning: %s unsupported in shared mode"
 msgstr ""
 
-#: elf32-nds32.c:3232
-msgid "error: Can't find symbol: _SDA_BASE_."
-msgstr ""
-
-#: elf32-nds32.c:4410 elf32-nds32.c:11783
-msgid "%B: error: Cannot set _ITB_BASE_"
-msgstr ""
-
-#: elf32-nds32.c:4418
-msgid "error: IFC relocation error."
-msgstr ""
-
-#: elf32-nds32.c:4452
+#: elf32-nds32.c:5003
 #, c-format
-msgid "%B: error: unknown relocation type %d."
-msgstr ""
-
-#: elf32-nds32.c:4898
-msgid "%B: warning: cannot deal R_NDS32_25_ABS_RELA in shared mode."
+msgid "%pB: warning: unaligned access to GOT entry"
 msgstr ""
 
-#: elf32-nds32.c:5032
-msgid "%B: warning: unaligned access to GOT entry."
-msgstr ""
-
-#: elf32-nds32.c:5074
-msgid "%B: warning: relocate SDA_BASE failed."
+#: elf32-nds32.c:5045
+#, c-format
+msgid "%pB: warning: relocate SDA_BASE failed"
 msgstr ""
 
-#: elf32-nds32.c:5096
+#: elf32-nds32.c:5067
 #, c-format
-msgid "%B(%A): warning: unaligned small data access of type %d."
+msgid "%pB(%pA): warning: unaligned small data access of type %d"
 msgstr ""
 
-#: elf32-nds32.c:5844
+#: elf32-nds32.c:5816
 #, c-format
 msgid ""
-"%B: ISR vector size mismatch with previous modules, previous %u-byte, "
+"%pB: ISR vector size mismatch with previous modules, previous %u-byte, "
 "current %u-byte"
 msgstr ""
 
-#: elf32-nds32.c:5888
-msgid "%B: warning: Endian mismatch with previous modules."
+#: elf32-nds32.c:5860
+#, c-format
+msgid "%pB: warning: endian mismatch with previous modules"
 msgstr ""
 
-#: elf32-nds32.c:5898
+#: elf32-nds32.c:5870
+#, c-format
 msgid ""
-"%B: warning: Older version of object file encountered, Please recompile with "
-"current tool chain."
+"%pB: warning: older version of object file encountered, please recompile "
+"with current tool chain"
 msgstr ""
 
-#: elf32-nds32.c:5976
-msgid "%B: error: ABI mismatch with previous modules."
+#: elf32-nds32.c:5948
+#, c-format
+msgid "%pB: error: ABI mismatch with previous modules"
 msgstr ""
 
-#: elf32-nds32.c:5987
-msgid "%B: error: Instruction set mismatch with previous modules."
+#: elf32-nds32.c:5959
+#, c-format
+msgid "%pB: error: instruction set mismatch with previous modules"
 msgstr ""
 
-#: elf32-nds32.c:6013
+#: elf32-nds32.c:5986
 #, c-format
-msgid "%B: warning: Incompatible elf-versions %s and  %s."
+msgid "%pB: warning: incompatible elf-versions %s and %s"
 msgstr ""
 
-#: elf32-nds32.c:6043
+#: elf32-nds32.c:6016
 #, c-format
 msgid ": n1 instructions"
 msgstr ""
 
-#: elf32-nds32.c:6046
+#: elf32-nds32.c:6019
 #, c-format
 msgid ": n1h instructions"
 msgstr ""
 
-#: elf32-nds32.c:8535
-msgid "%B: Error: search_nds32_elf_blank reports wrong node\n"
-msgstr ""
-
-#: elf32-nds32.c:8794
+#: elf32-nds32.c:8508
 #, c-format
-msgid "%B: warning: %s points to unrecognized reloc at %#Lx"
+msgid "%pB: error: search_nds32_elf_blank reports wrong node"
 msgstr ""
 
-#: elf32-nds32.c:11655 elf32-nds32.c:11672
-msgid "error: Jump IFC Fail."
-msgstr ""
-
-#: elf32-nds32.c:12529
+#: elf32-nds32.c:8768
 #, c-format
-msgid "%B: Nested OMIT_FP in %A."
+msgid "%pB: warning: %s points to unrecognized reloc at %#<PRIx64>"
 msgstr ""
 
-#: elf32-nds32.c:12548
+#: elf32-nds32.c:12339
 #, c-format
-msgid "%B: Unmatched OMIT_FP in %A."
+msgid "%pB: nested OMIT_FP in %pA"
 msgstr ""
 
-#: elf32-nds32.c:12831 reloc.c:8273
+#: elf32-nds32.c:12358
 #, c-format
-msgid "%X%P: %B(%A): relocation \"%R\" goes out of range\n"
-msgstr ""
-
-#: elf32-nds32.c:14607
-msgid "Linker: cannot init ex9 hash table error \n"
+msgid "%pB: unmatched OMIT_FP in %pA"
 msgstr ""
 
-#: elf32-nds32.c:15016 elf32-nds32.c:15030
-msgid "Linker: error cannot fixed ex9 relocation \n"
-msgstr ""
-
-#: elf32-nds32.c:15241
+#: elf32-nds32.c:12642 reloc.c:8292
 #, c-format
-msgid ""
-"%B: warning: unaligned small data access for entry: {%Ld, %Ld, %Ld}, addr = "
-"%#Lx, align = %#x"
+msgid "%X%P: %pB(%pA): relocation \"%pR\" goes out of range\n"
 msgstr ""
 
-#: elf32-nds32.c:15274
+#: elf32-nios2.c:2930
 #, c-format
-msgid "failed creating ex9.it %s hash table entry"
+msgid "error: %pB: big-endian R2 is not supported"
 msgstr ""
 
-#: elf32-nios2.c:2929
-msgid "error: %B: Big-endian R2 is not supported."
-msgstr ""
-
-#: elf32-nios2.c:3814
+#: elf32-nios2.c:3822
 #, c-format
 msgid ""
 "global pointer relative relocation at address 0x%08x when _gp not defined\n"
 msgstr ""
 
-#: elf32-nios2.c:3834
+#: elf32-nios2.c:3842
 #, c-format
 msgid ""
-"Unable to reach %s (at 0x%08x) from the global pointer (at 0x%08x) because "
-"the offset (%d) is out of the allowed range, -32678 to 32767.\n"
+"unable to reach %s (at 0x%08x) from the global pointer (at 0x%08x) because "
+"the offset (%d) is out of the allowed range, -32678 to 32767\n"
 msgstr ""
 
-#: elf32-nios2.c:4487 elf32-pru.c:816
+#: elf32-nios2.c:4495 elf32-pru.c:830
 msgid "relocation out of range"
 msgstr ""
 
-#: elf32-nios2.c:4497 elf32-pru.c:826 elf32-tic6x.c:2682
+#: elf32-nios2.c:4505 elf32-pru.c:840 elf32-tic6x.c:2716
 msgid "dangerous relocation"
 msgstr ""
 
-#: elf32-nios2.c:5370
+#: elf32-nios2.c:5378
 #, c-format
 msgid "dynamic variable `%s' is zero size"
 msgstr ""
 
-#: elf32-or1k.c:715
+#: elf32-or1k.c:1078
 #, c-format
-msgid "%B: invalid OR1K reloc number: %d"
+msgid "%pB: support for local dynamic not implemented"
 msgstr ""
 
-#: elf32-or1k.c:965
-msgid "internal error: addend should be zero for R_OR1K_GOT16"
-msgstr ""
-
-#: elf32-or1k.c:1074
-msgid "%B: support for local dynamic not implemented"
-msgstr ""
-
-#: elf32-or1k.c:1209
-msgid "%B: will not resolve runtime TLS relocation"
-msgstr ""
-
-#: elf32-or1k.c:1529
+#: elf32-or1k.c:1213
 #, c-format
-msgid "%B: bad relocation section name `%s'"
-msgstr ""
-
-#: elf32-or1k.c:2641
-msgid "%B: EF_OR1K_NODELAY flag mismatch with previous modules"
+msgid "%pB: will not resolve runtime TLS relocation"
 msgstr ""
 
-#: elf32-pj.c:325
+#: elf32-or1k.c:1533
 #, c-format
-msgid "%B: unrecognised PicoJava reloc number: %d"
+msgid "%pB: bad relocation section name `%s'"
 msgstr ""
 
-#: elf32-ppc.c:2027
+#: elf32-or1k.c:2645
 #, c-format
-msgid "%B: unrecognised PPC reloc number: %d"
+msgid "%pB: %s flag mismatch with previous modules"
 msgstr ""
 
-#: elf32-ppc.c:2112
+#: elf32-ppc.c:2149
 #, c-format
 msgid "generic linker can't handle %s"
 msgstr ""
 
-#: elf32-ppc.c:2732
+#: elf32-ppc.c:2769
 #, c-format
-msgid "corrupt %s section in %B"
+msgid "corrupt %s section in %pB"
 msgstr ""
 
-#: elf32-ppc.c:2752
+#: elf32-ppc.c:2789
 #, c-format
-msgid "unable to read in %s section from %B"
+msgid "unable to read in %s section from %pB"
 msgstr ""
 
-#: elf32-ppc.c:2794
+#: elf32-ppc.c:2831
 #, c-format
-msgid "warning: unable to set size of %s section in %B"
+msgid "warning: unable to set size of %s section in %pB"
 msgstr ""
 
-#: elf32-ppc.c:2844
-msgid "failed to allocate space for new APUinfo section."
+#: elf32-ppc.c:2881
+msgid "failed to allocate space for new APUinfo section"
 msgstr ""
 
-#: elf32-ppc.c:2863
-msgid "failed to compute new APUinfo section."
+#: elf32-ppc.c:2900
+msgid "failed to compute new APUinfo section"
 msgstr ""
 
-#: elf32-ppc.c:2866
-msgid "failed to install new APUinfo section."
+#: elf32-ppc.c:2903
+msgid "failed to install new APUinfo section"
 msgstr ""
 
-#: elf32-ppc.c:3915
+#: elf32-ppc.c:4010
 #, c-format
-msgid "%B: relocation %s cannot be used when making a shared object"
+msgid "%pB: relocation %s cannot be used when making a shared object"
 msgstr ""
 
-#: elf32-ppc.c:4266 elf64-ppc.c:5597
+#: elf32-ppc.c:4740 elf32-ppc.c:4744
 #, c-format
-msgid "%H: %s reloc against local symbol\n"
+msgid "warning: %pB uses hard float, %pB uses soft float"
 msgstr ""
 
-#: elf32-ppc.c:4628 elf32-ppc.c:4632
-#, c-format
-msgid "Warning: %B uses hard float, %B uses soft float"
-msgstr ""
-
-#: elf32-ppc.c:4636 elf32-ppc.c:4641
+#: elf32-ppc.c:4748 elf32-ppc.c:4753
 #, c-format
 msgid ""
-"Warning: %B uses double-precision hard float, %B uses single-precision hard "
-"float"
+"warning: %pB uses double-precision hard float, %pB uses single-precision "
+"hard float"
 msgstr ""
 
-#: elf32-ppc.c:4656 elf32-ppc.c:4661
+#: elf32-ppc.c:4768 elf32-ppc.c:4773
 #, c-format
-msgid "Warning: %B uses 64-bit long double, %B uses 128-bit long double"
+msgid "warning: %pB uses 64-bit long double, %pB uses 128-bit long double"
 msgstr ""
 
-#: elf32-ppc.c:4666 elf32-ppc.c:4671
+#: elf32-ppc.c:4778 elf32-ppc.c:4783
 #, c-format
-msgid "Warning: %B uses IBM long double, %B uses IEEE long double"
+msgid "warning: %pB uses IBM long double, %pB uses IEEE long double"
 msgstr ""
 
-#: elf32-ppc.c:4722 elf32-ppc.c:4727
+#: elf32-ppc.c:4834 elf32-ppc.c:4839
 #, c-format
-msgid "Warning: %B uses AltiVec vector ABI, %B uses SPE vector ABI"
+msgid "warning: %pB uses AltiVec vector ABI, %pB uses SPE vector ABI"
 msgstr ""
 
-#: elf32-ppc.c:4750 elf32-ppc.c:4755
+#: elf32-ppc.c:4862 elf32-ppc.c:4867
 #, c-format
-msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
+msgid "warning: %pB uses r3/r4 for small structure returns, %pB uses memory"
 msgstr ""
 
-#: elf32-ppc.c:4810
+#: elf32-ppc.c:4922
+#, c-format
 msgid ""
-"%B: compiled with -mrelocatable and linked with modules compiled normally"
+"%pB: compiled with -mrelocatable and linked with modules compiled normally"
 msgstr ""
 
-#: elf32-ppc.c:4818
+#: elf32-ppc.c:4930
+#, c-format
 msgid ""
-"%B: compiled normally and linked with modules compiled with -mrelocatable"
+"%pB: compiled normally and linked with modules compiled with -mrelocatable"
 msgstr ""
 
-#: elf32-ppc.c:4887
+#: elf32-ppc.c:4999
 #, c-format
-msgid "%B(%A+0x%lx): expected 16A style relocation on 0x%08x insn"
+msgid "%pB(%pA+0x%lx): expected 16A style relocation on 0x%08x insn"
 msgstr ""
 
-#: elf32-ppc.c:4906
+#: elf32-ppc.c:5018
 #, c-format
-msgid "%B(%A+0x%lx): expected 16D style relocation on 0x%08x insn"
+msgid "%pB(%pA+0x%lx): expected 16D style relocation on 0x%08x insn"
 msgstr ""
 
-#: elf32-ppc.c:4997
-msgid "%P: bss-plt forced due to %B\n"
+#: elf32-ppc.c:5109
+#, c-format
+msgid "bss-plt forced due to %pB"
 msgstr ""
 
-#: elf32-ppc.c:5000
-msgid "%P: bss-plt forced by profiling\n"
+#: elf32-ppc.c:5111
+msgid "bss-plt forced by profiling"
 msgstr ""
 
 #. Uh oh, we didn't find the expected call.  We
 #. could just mark this symbol to exclude it
 #. from tls optimization but it's safer to skip
 #. the entire optimization.
-#: elf32-ppc.c:5322 elf64-ppc.c:8654
+#: elf32-ppc.c:5687 elf64-ppc.c:8949
 #, c-format
 msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
 msgstr ""
 
-#: elf32-ppc.c:6264 elf32-sh.c:3392 elf32-tilepro.c:2331 elfxx-sparc.c:2556
-#: elfxx-tilegx.c:2567
-msgid "%B: dynamic relocation in read-only section `%A'\n"
+#: elf32-ppc.c:6658 elf32-sh.c:3078 elf32-tilepro.c:2339 elfxx-sparc.c:2536
+#: elfxx-tilegx.c:2579
+#, c-format
+msgid "%pB: dynamic relocation in read-only section `%pA'\n"
+msgstr ""
+
+#: elf32-ppc.c:8511
+msgid "%P: %H: error: %s with unexpected instruction %x\n"
 msgstr ""
 
-#: elf32-ppc.c:8100
+#: elf32-ppc.c:8548
 msgid "%H: fixup branch overflow\n"
 msgstr ""
 
-#: elf32-ppc.c:8140 elf32-ppc.c:8175
+#: elf32-ppc.c:8588 elf32-ppc.c:8624
 #, c-format
-msgid "%B(%A+%#Lx): error: %s with unexpected instruction %#x"
+msgid "%pB(%pA+%#<PRIx64>): error: %s with unexpected instruction %#x"
 msgstr ""
 
-#: elf32-ppc.c:8231
+#: elf32-ppc.c:8688
 #, c-format
 msgid "%X%H: unsupported bss-plt -fPIC ifunc %s\n"
 msgstr ""
 
-#: elf32-ppc.c:8294 elf64-ppc.c:15070
+#: elf32-ppc.c:8727 elf64-ppc.c:15724
 msgid "%H: warning: %s unexpected insn %#x.\n"
 msgstr ""
 
-#: elf32-ppc.c:8319
-#, c-format
-msgid "%P: %B: unknown relocation type %d for symbol %s\n"
-msgstr ""
-
-#: elf32-ppc.c:8606
+#: elf32-ppc.c:9039
 #, c-format
 msgid "%H: non-zero addend on %s reloc against `%s'\n"
 msgstr ""
@@ -3259,1334 +3079,1219 @@ msgstr ""
 #. local won't have the +32k reloc addend trick marking
 #. -fPIC code, so the linker won't know whether r30 is
 #. _GLOBAL_OFFSET_TABLE_ or pointing into a .got2 section.
-#: elf32-ppc.c:8638
+#: elf32-ppc.c:9071
 #, c-format
 msgid "%X%H: @local call to ifunc %s\n"
 msgstr ""
 
-#: elf32-ppc.c:8808
+#: elf32-ppc.c:9241
 #, c-format
 msgid "%H: relocation %s for indirect function %s unsupported\n"
 msgstr ""
 
-#: elf32-ppc.c:9077 elf32-ppc.c:9108 elf32-ppc.c:9199
+#: elf32-ppc.c:9569 elf32-ppc.c:9600 elf32-ppc.c:9691 elf32-ppc.c:9779
 #, c-format
 msgid ""
-"%P: %B: the target (%s) of a %s relocation is in the wrong output section "
-"(%s)\n"
+"%pB: the target (%s) of a %s relocation is in the wrong output section (%s)"
 msgstr ""
 
-#: elf32-ppc.c:9287
-#, c-format
-msgid ""
-"%B: the target (%s) of a %s relocation is in the wrong output section (%s)"
+#: elf32-ppc.c:9909 elf32-ppc.c:9927
+msgid "%P: %H: %s relocation unsupported for bss-plt\n"
 msgstr ""
 
-#: elf32-ppc.c:9395
-#, c-format
-msgid "%P: %B: relocation %s is not yet supported for symbol %s\n"
-msgstr ""
-
-#: elf32-ppc.c:9480
+#: elf32-ppc.c:10008
 #, c-format
 msgid "%H: error: %s against `%s' not a multiple of %u\n"
 msgstr ""
 
-#: elf32-ppc.c:9509
+#: elf32-ppc.c:10037
 #, c-format
 msgid "%H: unresolvable %s relocation against symbol `%s'\n"
 msgstr ""
 
-#: elf32-ppc.c:9590
+#: elf32-ppc.c:10118
 #, c-format
 msgid "%H: %s reloc against `%s': error %d\n"
 msgstr ""
 
-#: elf32-ppc.c:10354 elf64-ppc.c:15601
+#: elf32-ppc.c:11013 elf64-ppc.c:16216
 msgid ""
 "%X%P: text relocations and GNU indirect functions will result in a segfault "
 "at runtime\n"
 msgstr ""
 
-#: elf32-ppc.c:10358 elf64-ppc.c:15605
+#: elf32-ppc.c:11017 elf64-ppc.c:16220
 msgid ""
 "%P: warning: text relocations and GNU indirect functions may result in a "
 "segfault at runtime\n"
 msgstr ""
 
-#: elf32-ppc.c:10403
+#: elf32-ppc.c:11062
 #, c-format
-msgid "%P: %s not defined in linker created %s\n"
+msgid "%s not defined in linker created %pA"
 msgstr ""
 
-#: elf32-rl78.c:292
-#, c-format
-msgid "%B: invalid RL78 reloc number: %d"
+#: elf32-rl78.c:373
+msgid "internal error: RL78 reloc stack overflow"
 msgstr ""
 
-#: elf32-rl78.c:370
-msgid "Internal Error: RL78 reloc stack overflow"
+#: elf32-rl78.c:384
+msgid "internal error: RL78 reloc stack underflow"
 msgstr ""
 
-#: elf32-rl78.c:381
-msgid "Internal Error: RL78 reloc stack underflow"
+#: elf32-rl78.c:1054
+msgid "warning: RL78_SYM reloc with an unknown symbol"
 msgstr ""
 
-#: elf32-rl78.c:1050
-msgid "Warning: RL78_SYM reloc with an unknown symbol"
-msgstr ""
-
-#: elf32-rl78.c:1081 elf32-rx.c:1435
+#: elf32-rl78.c:1085 elf32-rx.c:1457
 #, c-format
-msgid "%B(%A): error: call to undefined function '%s'"
+msgid "%pB(%pA): error: call to undefined function '%s'"
 msgstr ""
 
-#: elf32-rl78.c:1202
+#: elf32-rl78.c:1206
 #, c-format
-msgid "RL78 ABI conflict: G10 file %B cannot be linked with %s file %B"
+msgid "RL78 ABI conflict: G10 file %pB cannot be linked with %s file %pB"
 msgstr ""
 
-#: elf32-rl78.c:1219
+#: elf32-rl78.c:1223
 #, c-format
-msgid "RL78 ABI conflict: cannot link %s file %B with %s file %B"
+msgid "RL78 ABI conflict: cannot link %s file %pB with %s file %pB"
 msgstr ""
 
-#: elf32-rl78.c:1228
+#: elf32-rl78.c:1232
 msgid "RL78 merge conflict: cannot link 32-bit and 64-bit objects together"
 msgstr ""
 
-#: elf32-rl78.c:1232 elf32-rl78.c:1236
+#: elf32-rl78.c:1236 elf32-rl78.c:1240
 #, c-format
-msgid "- %B is 64-bit, %B is not"
+msgid "- %pB is 64-bit, %pB is not"
 msgstr ""
 
-#: elf32-rl78.c:1263
+#: elf32-rl78.c:1267
 #, c-format
 msgid " [64-bit doubles]"
 msgstr ""
 
-#: elf32-rx.c:314
-#, c-format
-msgid "%B: invalid RX reloc number: %d"
-msgstr ""
-
-#: elf32-rx.c:595
+#: elf32-rx.c:606
 #, c-format
-msgid "%B:%A: table entry %s outside table"
+msgid "%pB:%pA: table entry %s outside table"
 msgstr ""
 
-#: elf32-rx.c:602
+#: elf32-rx.c:613
 #, c-format
-msgid "%B:%A: table entry %s not word-aligned within table"
+msgid "%pB:%pA: table entry %s not word-aligned within table"
 msgstr ""
 
-#: elf32-rx.c:668
+#: elf32-rx.c:685
 #, c-format
-msgid "%B:%A: Warning: deprecated Red Hat reloc "
+msgid "%pB:%pA: warning: deprecated Red Hat reloc %s detected against: %s"
 msgstr ""
 
 #. Check for unsafe relocs in PID mode.  These are any relocs where
 #. an absolute address is being computed.  There are special cases
 #. for relocs against symbols that are known to be referenced in
 #. crt0.o before the PID base address register has been initialised.
-#: elf32-rx.c:687
+#: elf32-rx.c:705
 #, c-format
-msgid "%B(%A): unsafe PID relocation %s at %#Lx (against %s in %s)"
+msgid "%pB(%pA): unsafe PID relocation %s at %#<PRIx64> (against %s in %s)"
 msgstr ""
 
-#: elf32-rx.c:1267
-msgid "Warning: RX_SYM reloc with an unknown symbol"
+#: elf32-rx.c:1289
+msgid "warning: RX_SYM reloc with an unknown symbol"
 msgstr ""
 
-#: elf32-rx.c:3146
-msgid "There is a conflict merging the ELF header flags from %B"
+#: elf32-rx.c:3168
+#, c-format
+msgid "there is a conflict merging the ELF header flags from %pB"
 msgstr ""
 
-#: elf32-rx.c:3149
+#: elf32-rx.c:3171
 #, c-format
 msgid "  the input  file's flags: %s"
 msgstr ""
 
-#: elf32-rx.c:3151
+#: elf32-rx.c:3173
 #, c-format
 msgid "  the output file's flags: %s"
 msgstr ""
 
-#: elf32-rx.c:3758
+#: elf32-rx.c:3780
 #, c-format
-msgid "%B:%A: table %s missing corresponding %s"
+msgid "%pB:%pA: table %s missing corresponding %s"
 msgstr ""
 
-#: elf32-rx.c:3766
+#: elf32-rx.c:3788
 #, c-format
-msgid "%B:%A: %s and %s must be in the same input section"
+msgid "%pB:%pA: %s and %s must be in the same input section"
 msgstr ""
 
-#: elf32-s390.c:2137 elf64-s390.c:2075
+#: elf32-s390.c:2141 elf64-s390.c:2082
 #, c-format
-msgid "%B(%A+%#Lx): invalid instruction for TLS relocation %s"
+msgid "%pB(%pA+%#<PRIx64>): invalid instruction for TLS relocation %s"
 msgstr ""
 
 #: elf32-score.c:1521 elf32-score7.c:1382 elfxx-mips.c:3756
 msgid "not enough GOT space for local GOT entries"
 msgstr ""
 
-#: elf32-score.c:2744
-msgid "address not word align"
+#: elf32-score.c:2746
+msgid "address not word aligned"
 msgstr ""
 
-#: elf32-score.c:2825 elf32-score7.c:2630
+#: elf32-score.c:2827 elf32-score7.c:2632
 #, c-format
-msgid "%B: Malformed reloc detected for section %A"
+msgid "%pB: malformed reloc detected for section %pA"
 msgstr ""
 
-#: elf32-score.c:2879 elf32-score7.c:2684
+#: elf32-score.c:2881 elf32-score7.c:2686
 #, c-format
-msgid "%B: CALL15 reloc at %#Lx not against global symbol"
+msgid "%pB: CALL15 reloc at %#<PRIx64> not against global symbol"
 msgstr ""
 
-#: elf32-score.c:4001 elf32-score7.c:3806
+#: elf32-score.c:4003 elf32-score7.c:3808
 #, c-format
 msgid " [pic]"
 msgstr ""
 
-#: elf32-score.c:4005 elf32-score7.c:3810
+#: elf32-score.c:4007 elf32-score7.c:3812
 #, c-format
 msgid " [fix dep]"
 msgstr ""
 
-#: elf32-score.c:4048 elf32-score7.c:3853
-msgid "%B: warning: linking PIC files with non-PIC files"
-msgstr ""
-
-#: elf32-sh-symbian.c:130
+#: elf32-score.c:4050 elf32-score7.c:3855
 #, c-format
-msgid "%B: IMPORT AS directive for %s conceals previous IMPORT AS"
+msgid "%pB: warning: linking PIC files with non-PIC files"
 msgstr ""
 
-#: elf32-sh-symbian.c:384
+#: elf32-sh.c:533
 #, c-format
-msgid "%B: Unrecognised .directive command: %s"
+msgid "%pB: %#<PRIx64>: warning: R_SH_USES points to unrecognized insn 0x%x"
 msgstr ""
 
-#: elf32-sh-symbian.c:502
-#, c-format
-msgid "%B: Failed to add renamed symbol %s"
-msgstr ""
-
-#: elf32-sh.c:491
-#, c-format
-msgid "%B: unrecognised SH reloc number: %d"
+#: elf32-sh.c:3629
+msgid "unexpected STO_SH5_ISA32 on local symbol is not handled"
 msgstr ""
 
-#: elf32-sh.c:592
+#: elf32-sh.c:3876
 #, c-format
-msgid "%B: %#Lx: warning: R_SH_USES points to unrecognized insn 0x%x"
-msgstr ""
-
-#: elf32-sh.c:3947 elf64-sh64.c:1508
-msgid "Unexpected STO_SH5_ISA32 on local symbol is not handled"
-msgstr ""
-
-#: elf32-sh.c:4200
-#, c-format
-msgid "%B: %#Lx: fatal: unaligned branch target for relax-support relocation"
+msgid ""
+"%pB: %#<PRIx64>: fatal: unaligned branch target for relax-support relocation"
 msgstr ""
 
-#: elf32-sh.c:4234 elf32-sh.c:4250
+#: elf32-sh.c:3906 elf32-sh.c:3922
 #, c-format
-msgid "%B: %#Lx: fatal: unaligned %s relocation %#Lx"
+msgid "%pB: %#<PRIx64>: fatal: unaligned %s relocation %#<PRIx64>"
 msgstr ""
 
-#: elf32-sh.c:4265
+#: elf32-sh.c:3938
 #, c-format
-msgid "%B: %#Lx: fatal: R_SH_PSHA relocation %Ld not in range -32..32"
+msgid ""
+"%pB: %#<PRIx64>: fatal: R_SH_PSHA relocation %<PRId64> not in range -32..32"
 msgstr ""
 
-#: elf32-sh.c:4280
+#: elf32-sh.c:3954
 #, c-format
-msgid "%B: %#Lx: fatal: R_SH_PSHL relocation %Ld not in range -32..32"
+msgid ""
+"%pB: %#<PRIx64>: fatal: R_SH_PSHL relocation %<PRId64> not in range -32..32"
 msgstr ""
 
-#: elf32-sh.c:4426 elf32-sh.c:4899
+#: elf32-sh.c:4084 elf32-sh.c:4479
 #, c-format
-msgid "%B(%A+%#Lx): cannot emit fixup to `%s' in read-only section"
+msgid "%pB(%pA+%#<PRIx64>): cannot emit fixup to `%s' in read-only section"
 msgstr ""
 
-#: elf32-sh.c:5001
+#: elf32-sh.c:4582
 #, c-format
-msgid "%B(%A+%#Lx): %s relocation against external symbol \"%s\""
+msgid "%pB(%pA+%#<PRIx64>): %s relocation against external symbol \"%s\""
 msgstr ""
 
-#: elf32-sh.c:5465
+#: elf32-sh.c:5047
 #, c-format
 msgid "%X%C: relocation to \"%s\" references a different segment\n"
 msgstr ""
 
-#: elf32-sh.c:5472
+#: elf32-sh.c:5054
 #, c-format
 msgid "%C: warning: relocation to \"%s\" references a different segment\n"
 msgstr ""
 
-#: elf32-sh.c:6046 elf32-sh.c:6132
+#: elf32-sh.c:5559 elf32-sh.c:5641
 #, c-format
-msgid "%B: `%s' accessed both as normal and FDPIC symbol"
+msgid "%pB: `%s' accessed both as normal and FDPIC symbol"
 msgstr ""
 
-#: elf32-sh.c:6052 elf32-sh.c:6137
+#: elf32-sh.c:5565 elf32-sh.c:5646
 #, c-format
-msgid "%B: `%s' accessed both as FDPIC and thread local symbol"
+msgid "%pB: `%s' accessed both as FDPIC and thread local symbol"
 msgstr ""
 
-#: elf32-sh.c:6083
-msgid "%B: Function descriptor relocation with non-zero addend"
+#: elf32-sh.c:5596
+#, c-format
+msgid "%pB: Function descriptor relocation with non-zero addend"
 msgstr ""
 
-#: elf32-sh.c:6321 elf64-alpha.c:4688
+#: elf32-sh.c:5803 elf64-alpha.c:4691
 #, c-format
-msgid "%B: TLS local exec code cannot be linked into shared objects"
+msgid "%pB: TLS local exec code cannot be linked into shared objects"
 msgstr ""
 
-#: elf32-sh.c:6436
+#: elf32-sh.c:5918
 #, c-format
-msgid "%B: uses %s instructions while previous modules use %s instructions"
+msgid "%pB: uses %s instructions while previous modules use %s instructions"
 msgstr ""
 
-#: elf32-sh.c:6448
+#: elf32-sh.c:5930
 #, c-format
 msgid ""
 "internal error: merge of architecture '%s' with architecture '%s' produced "
 "unknown architecture"
 msgstr ""
 
-#: elf32-sh.c:6485
+#: elf32-sh.c:5967
+#, c-format
 msgid ""
-"%B: uses instructions which are incompatible with instructions used in "
+"%pB: uses instructions which are incompatible with instructions used in "
 "previous modules"
 msgstr ""
 
-#: elf32-sh.c:6498
-msgid "%B: attempt to mix FDPIC and non-FDPIC objects"
-msgstr ""
-
-#: elf32-sh64.c:225 elf64-sh64.c:2277
-#, c-format
-msgid "%B: compiled as 32-bit object and %B is 64-bit"
-msgstr ""
-
-#: elf32-sh64.c:229 elf64-sh64.c:2281
-#, c-format
-msgid "%B: compiled as 64-bit object and %B is 32-bit"
-msgstr ""
-
-#: elf32-sh64.c:232 elf64-sh64.c:2284
+#: elf32-sh.c:5980
 #, c-format
-msgid "%B: object size does not match that of target %B"
-msgstr ""
-
-#: elf32-sh64.c:455 elf64-sh64.c:2772
-msgid "%B: encountered datalabel symbol in input"
-msgstr ""
-
-#: elf32-sh64.c:531
-msgid "PTB mismatch: a SHmedia address (bit 0 == 1)"
-msgstr ""
-
-#: elf32-sh64.c:534
-msgid "PTA mismatch: a SHcompact address (bit 0 == 0)"
-msgstr ""
-
-#: elf32-sh64.c:550
-msgid "%B: GAS error: unexpected PTB insn with R_SH_PT_16"
-msgstr ""
-
-#: elf32-sh64.c:600
-#, c-format
-msgid "%B: error: unaligned relocation type %d at %#Lx reloc %#Lx"
-msgstr ""
-
-#: elf32-sh64.c:676
-msgid "%B: could not write out added .cranges entries"
-msgstr ""
-
-#: elf32-sh64.c:735
-msgid "%B: could not write out sorted .cranges entries"
+msgid "%pB: attempt to mix FDPIC and non-FDPIC objects"
 msgstr ""
 
 #: elf32-sparc.c:89
-msgid "%B: compiled for a 64 bit system and target is 32 bit"
+#, c-format
+msgid "%pB: compiled for a 64 bit system and target is 32 bit"
 msgstr ""
 
 #: elf32-sparc.c:102
-msgid "%B: linking little endian files with big endian files"
-msgstr ""
-
-#: elf32-spu.c:160
 #, c-format
-msgid "%B: unrecognised SPU reloc number: %d"
+msgid "%pB: linking little endian files with big endian files"
 msgstr ""
 
-#: elf32-spu.c:726
-msgid "%X%P: overlay section %A does not start on a cache line.\n"
+#: elf32-spu.c:727
+msgid "%X%P: overlay section %pA does not start on a cache line\n"
 msgstr ""
 
-#: elf32-spu.c:734
-msgid "%X%P: overlay section %A is larger than a cache line.\n"
+#: elf32-spu.c:735
+msgid "%X%P: overlay section %pA is larger than a cache line\n"
 msgstr ""
 
-#: elf32-spu.c:754
-msgid "%X%P: overlay section %A is not in cache area.\n"
+#: elf32-spu.c:755
+msgid "%X%P: overlay section %pA is not in cache area\n"
 msgstr ""
 
-#: elf32-spu.c:795
+#: elf32-spu.c:796
 #, c-format
-msgid "%X%P: overlay sections %A and %A do not start at the same address.\n"
+msgid "%X%P: overlay sections %pA and %pA do not start at the same address\n"
 msgstr ""
 
-#: elf32-spu.c:1021
+#: elf32-spu.c:1022
 #, c-format
-msgid "warning: call to non-function symbol %s defined in %B"
+msgid "warning: call to non-function symbol %s defined in %pB"
 msgstr ""
 
-#: elf32-spu.c:1371
+#: elf32-spu.c:1372
 #, c-format
-msgid "%A:0x%v lrlive .brinfo (%u) differs from analysis (%u)\n"
+msgid "%pA:0x%v lrlive .brinfo (%u) differs from analysis (%u)\n"
 msgstr ""
 
-#: elf32-spu.c:1903
+#: elf32-spu.c:1904
 #, c-format
-msgid "%B is not allowed to define %s"
+msgid "%pB is not allowed to define %s"
 msgstr ""
 
-#: elf32-spu.c:1911
+#: elf32-spu.c:1912
 #, c-format
 msgid "you are not allowed to define %s in a script"
 msgstr ""
 
-#: elf32-spu.c:1945
+#: elf32-spu.c:1946
 #, c-format
 msgid "%s in overlay section"
 msgstr ""
 
-#: elf32-spu.c:1974
+#: elf32-spu.c:1975
 msgid "overlay stub relocation overflow"
 msgstr ""
 
-#: elf32-spu.c:1983
+#: elf32-spu.c:1984 elf64-ppc.c:13805
 msgid "stubs don't match calculated size"
 msgstr ""
 
-#: elf32-spu.c:2566
+#: elf32-spu.c:2567
 #, c-format
 msgid "warning: %s overlaps %s\n"
 msgstr ""
 
-#: elf32-spu.c:2582
+#: elf32-spu.c:2583
 #, c-format
 msgid "warning: %s exceeds section size\n"
 msgstr ""
 
-#: elf32-spu.c:2614
+#: elf32-spu.c:2615
 #, c-format
-msgid "%A:0x%v not found in function table\n"
+msgid "%pA:0x%v not found in function table\n"
 msgstr ""
 
-#: elf32-spu.c:2755
+#: elf32-spu.c:2756
 #, c-format
-msgid "%B(%A+0x%v): call to non-code section %B(%A), analysis incomplete\n"
+msgid "%pB(%pA+0x%v): call to non-code section %pB(%pA), analysis incomplete\n"
 msgstr ""
 
-#: elf32-spu.c:3324
+#: elf32-spu.c:3325
 #, c-format
-msgid "Stack analysis will ignore the call from %s to %s\n"
+msgid "stack analysis will ignore the call from %s to %s\n"
 msgstr ""
 
-#: elf32-spu.c:4021
+#: elf32-spu.c:4022
 msgid "  calls:\n"
 msgstr ""
 
-#: elf32-spu.c:4335
+#: elf32-spu.c:4336
 #, c-format
 msgid "%s duplicated in %s\n"
 msgstr ""
 
-#: elf32-spu.c:4339
+#: elf32-spu.c:4340
 #, c-format
 msgid "%s duplicated\n"
 msgstr ""
 
-#: elf32-spu.c:4346
+#: elf32-spu.c:4347
 msgid "sorry, no support for duplicate object files in auto-overlay script\n"
 msgstr ""
 
-#: elf32-spu.c:4388
+#: elf32-spu.c:4389
 #, c-format
 msgid ""
 "non-overlay size of 0x%v plus maximum overlay size of 0x%v exceeds local "
 "store\n"
 msgstr ""
 
-#: elf32-spu.c:4544
+#: elf32-spu.c:4545
 #, c-format
-msgid "%B:%A%s exceeds overlay size\n"
+msgid "%pB:%pA%s exceeds overlay size\n"
 msgstr ""
 
-#: elf32-spu.c:4685
+#: elf32-spu.c:4686
 msgid "%F%P: auto overlay error: %E\n"
 msgstr ""
 
-#: elf32-spu.c:4706
+#: elf32-spu.c:4707
 msgid "Stack size for call graph root nodes.\n"
 msgstr ""
 
-#: elf32-spu.c:4707
+#: elf32-spu.c:4708
 msgid ""
 "\n"
 "Stack size for functions.  Annotations: '*' max stack, 't' tail call\n"
 msgstr ""
 
-#: elf32-spu.c:4717
+#: elf32-spu.c:4718
 msgid "Maximum stack required is 0x%v\n"
 msgstr ""
 
-#: elf32-spu.c:4736
+#: elf32-spu.c:4737
 msgid "%X%P: stack/lrlive analysis error: %E\n"
 msgstr ""
 
-#: elf32-spu.c:4739
+#: elf32-spu.c:4740
 msgid "%F%P: can not build overlay stubs: %E\n"
 msgstr ""
 
-#: elf32-spu.c:4808
+#: elf32-spu.c:4809
 msgid "fatal error while creating .fixup"
 msgstr ""
 
-#: elf32-spu.c:5043
+#: elf32-spu.c:5044
 #, c-format
-msgid "%B(%s+%#Lx): unresolvable %s relocation against symbol `%s'"
+msgid "%pB(%s+%#<PRIx64>): unresolvable %s relocation against symbol `%s'"
 msgstr ""
 
-#: elf32-tic6x.c:1596
+#: elf32-tic6x.c:1628
 msgid "warning: generating a shared library containing non-PIC code"
 msgstr ""
 
-#: elf32-tic6x.c:1601
+#: elf32-tic6x.c:1633
 msgid "warning: generating a shared library containing non-PID code"
 msgstr ""
 
-#: elf32-tic6x.c:2460
-msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
+#: elf32-tic6x.c:2493
+#, c-format
+msgid "%pB: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
 msgstr ""
 
-#: elf32-tic6x.c:3582
+#: elf32-tic6x.c:3616
 #, c-format
-msgid "%B: error: unknown mandatory EABI object attribute %d"
+msgid "%pB: error: unknown mandatory EABI object attribute %d"
 msgstr ""
 
-#: elf32-tic6x.c:3591
+#: elf32-tic6x.c:3625
 #, c-format
-msgid "%B: warning: unknown EABI object attribute %d"
+msgid "%pB: warning: unknown EABI object attribute %d"
 msgstr ""
 
-#: elf32-tic6x.c:3705 elf32-tic6x.c:3714
+#: elf32-tic6x.c:3739 elf32-tic6x.c:3748
 #, c-format
-msgid "error: %B requires more stack alignment than %B preserves"
+msgid "error: %pB requires more stack alignment than %pB preserves"
 msgstr ""
 
-#: elf32-tic6x.c:3724 elf32-tic6x.c:3733
-msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
+#: elf32-tic6x.c:3758 elf32-tic6x.c:3767
+#, c-format
+msgid "error: unknown Tag_ABI_array_object_alignment value in %pB"
 msgstr ""
 
-#: elf32-tic6x.c:3742 elf32-tic6x.c:3751
-msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
+#: elf32-tic6x.c:3776 elf32-tic6x.c:3785
+#, c-format
+msgid "error: unknown Tag_ABI_array_object_align_expected value in %pB"
 msgstr ""
 
-#: elf32-tic6x.c:3760 elf32-tic6x.c:3768
+#: elf32-tic6x.c:3794 elf32-tic6x.c:3802
 #, c-format
-msgid "error: %B requires more array alignment than %B preserves"
+msgid "error: %pB requires more array alignment than %pB preserves"
 msgstr ""
 
-#: elf32-tic6x.c:3791
+#: elf32-tic6x.c:3825
 #, c-format
-msgid "warning: %B and %B differ in wchar_t size"
+msgid "warning: %pB and %pB differ in wchar_t size"
 msgstr ""
 
-#: elf32-tic6x.c:3810
+#: elf32-tic6x.c:3844
 #, c-format
-msgid "warning: %B and %B differ in whether code is compiled for DSBT"
+msgid "warning: %pB and %pB differ in whether code is compiled for DSBT"
 msgstr ""
 
-#: elf32-tilepro.c:3752 elfxx-tilegx.c:4132 elfxx-x86.c:1336
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:9172
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2492
+#: elf32-tilepro.c:3761 elfxx-tilegx.c:4145 elfxx-x86.c:1370
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:9463
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2518
 #, c-format
-msgid "discarded output section: `%A'"
+msgid "discarded output section: `%pA'"
 msgstr ""
 
 #: elf32-v850.c:153
 #, c-format
-msgid "Variable `%s' cannot occupy in multiple small data regions"
+msgid "variable `%s' cannot occupy in multiple small data regions"
 msgstr ""
 
 #: elf32-v850.c:156
 #, c-format
 msgid ""
-"Variable `%s' can only be in one of the small, zero, and tiny data regions"
+"variable `%s' can only be in one of the small, zero, and tiny data regions"
 msgstr ""
 
 #: elf32-v850.c:159
 #, c-format
 msgid ""
-"Variable `%s' cannot be in both small and zero data regions simultaneously"
+"variable `%s' cannot be in both small and zero data regions simultaneously"
 msgstr ""
 
 #: elf32-v850.c:162
 #, c-format
 msgid ""
-"Variable `%s' cannot be in both small and tiny data regions simultaneously"
+"variable `%s' cannot be in both small and tiny data regions simultaneously"
 msgstr ""
 
 #: elf32-v850.c:165
 #, c-format
 msgid ""
-"Variable `%s' cannot be in both zero and tiny data regions simultaneously"
+"variable `%s' cannot be in both zero and tiny data regions simultaneously"
 msgstr ""
 
 #: elf32-v850.c:463
-msgid "FAILED to find previous HI16 reloc"
-msgstr ""
-
-#: elf32-v850.c:1898 elf32-v850.c:1917
-#, c-format
-msgid "%B: invalid V850 reloc number: %d"
+msgid "failed to find previous HI16 reloc"
 msgstr ""
 
-#: elf32-v850.c:2295
+#: elf32-v850.c:2303
 msgid "could not locate special linker symbol __gp"
 msgstr ""
 
-#: elf32-v850.c:2299
+#: elf32-v850.c:2307
 msgid "could not locate special linker symbol __ep"
 msgstr ""
 
-#: elf32-v850.c:2303
+#: elf32-v850.c:2311
 msgid "could not locate special linker symbol __ctbp"
 msgstr ""
 
-#: elf32-v850.c:2524
+#: elf32-v850.c:2532
 #, c-format
-msgid "error: %B needs 8-byte alignment but %B is set for 4-byte alignment"
+msgid "error: %pB needs 8-byte alignment but %pB is set for 4-byte alignment"
 msgstr ""
 
-#: elf32-v850.c:2540
+#: elf32-v850.c:2548
 #, c-format
-msgid "error: %B uses 64-bit doubles but %B uses 32-bit doubles"
+msgid "error: %pB uses 64-bit doubles but %pB uses 32-bit doubles"
 msgstr ""
 
-#: elf32-v850.c:2555
+#: elf32-v850.c:2563
 #, c-format
-msgid "error: %B uses FPU-3.0 but %B only supports FPU-2.0"
+msgid "error: %pB uses FPU-3.0 but %pB only supports FPU-2.0"
 msgstr ""
 
-#: elf32-v850.c:2587
+#: elf32-v850.c:2595
 #, c-format
 msgid " alignment of 8-byte entities: "
 msgstr ""
 
-#: elf32-v850.c:2590
+#: elf32-v850.c:2598
 #, c-format
 msgid "4-byte"
 msgstr ""
 
-#: elf32-v850.c:2591
+#: elf32-v850.c:2599
 #, c-format
 msgid "8-byte"
 msgstr ""
 
-#: elf32-v850.c:2592 elf32-v850.c:2604
+#: elf32-v850.c:2600 elf32-v850.c:2612
 #, c-format
 msgid "not set"
 msgstr ""
 
-#: elf32-v850.c:2593 elf32-v850.c:2605 elf32-v850.c:2617 elf32-v850.c:2628
-#: elf32-v850.c:2639 elf32-v850.c:2650
+#: elf32-v850.c:2601 elf32-v850.c:2613 elf32-v850.c:2625 elf32-v850.c:2636
+#: elf32-v850.c:2647 elf32-v850.c:2658
 #, c-format
 msgid "unknown: %x"
 msgstr ""
 
-#: elf32-v850.c:2599
+#: elf32-v850.c:2607
 #, c-format
 msgid " size of doubles: "
 msgstr ""
 
-#: elf32-v850.c:2602
+#: elf32-v850.c:2610
 #, c-format
 msgid "4-bytes"
 msgstr ""
 
-#: elf32-v850.c:2603
+#: elf32-v850.c:2611
 #, c-format
 msgid "8-bytes"
 msgstr ""
 
-#: elf32-v850.c:2611
+#: elf32-v850.c:2619
 #, c-format
 msgid " FPU support required: "
 msgstr ""
 
-#: elf32-v850.c:2614
+#: elf32-v850.c:2622
 #, c-format
 msgid "FPU-2.0"
 msgstr ""
 
-#: elf32-v850.c:2615
+#: elf32-v850.c:2623
 #, c-format
 msgid "FPU-3.0"
 msgstr ""
 
-#: elf32-v850.c:2616
+#: elf32-v850.c:2624
 #, c-format
 msgid "none"
 msgstr ""
 
-#: elf32-v850.c:2623
+#: elf32-v850.c:2631
 #, c-format
 msgid "SIMD use: "
 msgstr ""
 
-#: elf32-v850.c:2626 elf32-v850.c:2637 elf32-v850.c:2648
+#: elf32-v850.c:2634 elf32-v850.c:2645 elf32-v850.c:2656
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: elf32-v850.c:2627 elf32-v850.c:2638 elf32-v850.c:2649
+#: elf32-v850.c:2635 elf32-v850.c:2646 elf32-v850.c:2657
 #, c-format
 msgid "no"
 msgstr ""
 
-#: elf32-v850.c:2634
+#: elf32-v850.c:2642
 #, c-format
 msgid "CACHE use: "
 msgstr ""
 
-#: elf32-v850.c:2645
+#: elf32-v850.c:2653
 #, c-format
 msgid "MMU use: "
 msgstr ""
 
-#: elf32-v850.c:2812 elf32-v850.c:2868
-msgid "%B: Architecture mismatch with previous modules"
+#: elf32-v850.c:2820 elf32-v850.c:2876
+#, c-format
+msgid "%pB: architecture mismatch with previous modules"
 msgstr ""
 
 #. xgettext:c-format.
-#: elf32-v850.c:2886
+#: elf32-v850.c:2894
 #, c-format
 msgid "private flags = %lx: "
 msgstr ""
 
-#: elf32-v850.c:2891
+#: elf32-v850.c:2899
 #, c-format
 msgid "unknown v850 architecture"
 msgstr ""
 
-#: elf32-v850.c:2893
+#: elf32-v850.c:2901
 #, c-format
 msgid "v850 E3 architecture"
 msgstr ""
 
-#: elf32-v850.c:2895 elf32-v850.c:2902
+#: elf32-v850.c:2903 elf32-v850.c:2910
 #, c-format
 msgid "v850 architecture"
 msgstr ""
 
-#: elf32-v850.c:2903
+#: elf32-v850.c:2911
 #, c-format
 msgid "v850e architecture"
 msgstr ""
 
-#: elf32-v850.c:2904
+#: elf32-v850.c:2912
 #, c-format
 msgid "v850e1 architecture"
 msgstr ""
 
-#: elf32-v850.c:2905
+#: elf32-v850.c:2913
 #, c-format
 msgid "v850e2 architecture"
 msgstr ""
 
-#: elf32-v850.c:2906
+#: elf32-v850.c:2914
 #, c-format
 msgid "v850e2v3 architecture"
 msgstr ""
 
-#: elf32-v850.c:2907
+#: elf32-v850.c:2915
 #, c-format
 msgid "v850e3v5 architecture"
 msgstr ""
 
-#: elf32-v850.c:3601
-#, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGCALL points to unrecognized insns"
-msgstr ""
-
-#: elf32-v850.c:3611
-#, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGCALL points to unrecognized insn %#x"
-msgstr ""
-
-#: elf32-v850.c:3656
+#: elf32-v850.c:3609 elf32-v850.c:3848
 #, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGCALL points to unrecognized reloc"
+msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized insns"
 msgstr ""
 
-#: elf32-v850.c:3696
+#: elf32-v850.c:3619 elf32-v850.c:3858
 #, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGCALL points to unrecognized reloc %#Lx"
+msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized insn %#x"
 msgstr ""
 
-#: elf32-v850.c:3839
+#: elf32-v850.c:3665 elf32-v850.c:3893
 #, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGJUMP points to unrecognized insns"
+msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized reloc"
 msgstr ""
 
-#: elf32-v850.c:3849
+#: elf32-v850.c:3705
 #, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGJUMP points to unrecognized insn %#x"
+msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized reloc %#<PRIx64>"
 msgstr ""
 
-#: elf32-v850.c:3883
-#, c-format
-msgid "%B: %#Lx: warning: R_V850_LONGJUMP points to unrecognized reloc"
-msgstr ""
-
-#: elf32-vax.c:290
-#, c-format
-msgid "%B: unrecognised VAX reloc number: %d"
-msgstr ""
-
-#: elf32-vax.c:539
+#: elf32-vax.c:540
 #, c-format
 msgid " [nonpic]"
 msgstr ""
 
-#: elf32-vax.c:542
+#: elf32-vax.c:543
 #, c-format
 msgid " [d-float]"
 msgstr ""
 
-#: elf32-vax.c:545
+#: elf32-vax.c:546
 #, c-format
 msgid " [g-float]"
 msgstr ""
 
-#: elf32-vax.c:631
+#: elf32-vax.c:632
 #, c-format
 msgid ""
-"%B: warning: GOT addend of %Ld to `%s' does not match previous GOT addend of "
-"%Ld"
+"%pB: warning: GOT addend of %<PRId64> to `%s' does not match previous GOT "
+"addend of %<PRId64>"
 msgstr ""
 
-#: elf32-vax.c:1445
+#: elf32-vax.c:1446
 #, c-format
-msgid "%B: warning: PLT addend of %Ld to `%s' from %A section ignored"
+msgid "%pB: warning: PLT addend of %<PRId64> to `%s' from %pA section ignored"
 msgstr ""
 
-#: elf32-vax.c:1570
+#: elf32-vax.c:1572
 #, c-format
-msgid "%B: warning: %s relocation against symbol `%s' from %A section"
+msgid "%pB: warning: %s relocation against symbol `%s' from %pA section"
 msgstr ""
 
-#: elf32-vax.c:1577
+#: elf32-vax.c:1579
 #, c-format
-msgid "%B: warning: %s relocation to %#Lx from %A section"
+msgid "%pB: warning: %s relocation to %#<PRIx64> from %pA section"
 msgstr ""
 
-#: elf32-visium.c:481
+#: elf32-visium.c:821
 #, c-format
-msgid "%B: invalid Visium reloc number: %d"
-msgstr ""
-
-#: elf32-visium.c:817
-#, c-format
-msgid "%B: compiled %s -mtune=%s and linked with modules compiled %s -mtune=%s"
-msgstr ""
-
-#: elf32-xgate.c:428
-#, c-format
-msgid "%B: invalid XGate reloc number: %d"
+msgid ""
+"%pB: compiled %s -mtune=%s and linked with modules compiled %s -mtune=%s"
 msgstr ""
 
-#: elf32-xgate.c:681
+#: elf32-xgate.c:684
 #, c-format
 msgid "cpu=XGATE]"
 msgstr ""
 
-#: elf32-xgate.c:683
+#: elf32-xgate.c:686
 #, c-format
 msgid "error reading cpu type from elf private data"
 msgstr ""
 
-#: elf32-xstormy16.c:449 elf64-ia64-vms.c:2074 elf32-ia64.c:2337
-#: elf64-ia64.c:2337
+#: elf32-xstormy16.c:457 elf64-ia64-vms.c:2085 elf32-ia64.c:2354
+#: elf64-ia64.c:2354
 msgid "non-zero addend in @fptr reloc"
 msgstr ""
 
-#: elf32-xtensa.c:485
-#, c-format
-msgid "%B: invalid XTENSA reloc number: %d"
-msgstr ""
-
-#: elf32-xtensa.c:926
+#: elf32-xtensa.c:932
 #, c-format
-msgid "%B(%A): invalid property table"
+msgid "%pB(%pA): invalid property table"
 msgstr ""
 
-#: elf32-xtensa.c:2655
+#: elf32-xtensa.c:2661
 #, c-format
-msgid "%B(%A+%#Lx): relocation offset out of range (size=%#Lx)"
+msgid "%pB(%pA+%#<PRIx64>): relocation offset out of range (size=%#<PRIx64>)"
 msgstr ""
 
-#: elf32-xtensa.c:2736 elf32-xtensa.c:2855
+#: elf32-xtensa.c:2744 elf32-xtensa.c:2863
 msgid "dynamic relocation in read-only section"
 msgstr ""
 
-#: elf32-xtensa.c:2832
+#: elf32-xtensa.c:2840
 msgid "TLS relocation invalid without dynamic sections"
 msgstr ""
 
-#: elf32-xtensa.c:3043
+#: elf32-xtensa.c:3052
 msgid "internal inconsistency in size of .got.loc section"
 msgstr ""
 
-#: elf32-xtensa.c:3350
+#: elf32-xtensa.c:3359
 #, c-format
-msgid "%B: incompatible machine type. Output is 0x%x. Input is 0x%x"
+msgid "%pB: incompatible machine type; output is 0x%x; input is 0x%x"
 msgstr ""
 
-#: elf32-xtensa.c:4581 elf32-xtensa.c:4589
-msgid "Attempt to convert L32R/CALLX to CALL failed"
+#: elf32-xtensa.c:4590 elf32-xtensa.c:4598
+msgid "attempt to convert L32R/CALLX to CALL failed"
 msgstr ""
 
-#: elf32-xtensa.c:6417 elf32-xtensa.c:6495 elf32-xtensa.c:7871
+#: elf32-xtensa.c:6426 elf32-xtensa.c:6505 elf32-xtensa.c:7882
 #, c-format
 msgid ""
-"%B(%A+%#Lx): could not decode instruction; possible configuration mismatch"
+"%pB(%pA+%#<PRIx64>): could not decode instruction; possible configuration "
+"mismatch"
 msgstr ""
 
-#: elf32-xtensa.c:7610
+#: elf32-xtensa.c:7621
 #, c-format
 msgid ""
-"%B(%A+%#Lx): could not decode instruction for XTENSA_ASM_SIMPLIFY "
+"%pB(%pA+%#<PRIx64>): could not decode instruction for XTENSA_ASM_SIMPLIFY "
 "relocation; possible configuration mismatch"
 msgstr ""
 
-#: elf32-xtensa.c:9455
+#: elf32-xtensa.c:9476
 msgid "invalid relocation address"
 msgstr ""
 
-#: elf32-xtensa.c:9505
+#: elf32-xtensa.c:9526
 msgid "overflow after relaxation"
 msgstr ""
 
-#: elf32-xtensa.c:10649
+#: elf32-xtensa.c:10670
 #, c-format
-msgid "%B(%A+%#Lx): unexpected fix for %s relocation"
+msgid "%pB(%pA+%#<PRIx64>): unexpected fix for %s relocation"
 msgstr ""
 
 #: elf64-alpha.c:472
 msgid "GPDISP relocation did not find ldah and lda instructions"
 msgstr ""
 
-#: elf64-alpha.c:1112
+#: elf64-alpha.c:2463
 #, c-format
-msgid "%B: unrecognised Alpha reloc number: %d"
+msgid "%pB: .got subsegment exceeds 64K (size %d)"
 msgstr ""
 
-#: elf64-alpha.c:2462
+#: elf64-alpha.c:3018 elf64-alpha.c:3214
 #, c-format
-msgid "%B: .got subsegment exceeds 64K (size %d)"
+msgid "%pB: %pA+%#<PRIx64>: warning: %s relocation against unexpected insn"
 msgstr ""
 
-#: elf64-alpha.c:3017
+#: elf64-alpha.c:4415 elf64-alpha.c:4428
 #, c-format
-msgid "%B: %A+%#Lx: warning: %s relocation against unexpected insn"
+msgid "%pB: gp-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:3212
+#: elf64-alpha.c:4455 elf64-alpha.c:4599
 #, c-format
-msgid "%B: %A+%#Lx: warning: LITERAL relocation against unexpected insn"
+msgid "%pB: pc-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4412 elf64-alpha.c:4425
+#: elf64-alpha.c:4484
 #, c-format
-msgid "%B: gp-relative relocation against dynamic symbol %s"
+msgid "%pB: change in gp: BRSGP %s"
 msgstr ""
 
-#: elf64-alpha.c:4452 elf64-alpha.c:4596
-#, c-format
-msgid "%B: pc-relative relocation against dynamic symbol %s"
+#: elf64-alpha.c:4509 /work/sources/binutils/current/bfd/elfnn-riscv.c:476
+msgid "<unknown>"
 msgstr ""
 
-#: elf64-alpha.c:4481
+#: elf64-alpha.c:4515
 #, c-format
-msgid "%B: change in gp: BRSGP %s"
-msgstr ""
-
-#: elf64-alpha.c:4506
-msgid "<unknown>"
+msgid "%pB: !samegp reloc against symbol without .prologue: %s"
 msgstr ""
 
-#: elf64-alpha.c:4512
+#: elf64-alpha.c:4573
 #, c-format
-msgid "%B: !samegp reloc against symbol without .prologue: %s"
+msgid "%pB: unhandled dynamic relocation against %s"
 msgstr ""
 
-#: elf64-alpha.c:4570
+#: elf64-alpha.c:4608
 #, c-format
-msgid "%B: unhandled dynamic relocation against %s"
+msgid "%pB: pc-relative relocation against undefined weak symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4605
+#: elf64-alpha.c:4674
 #, c-format
-msgid "%B: pc-relative relocation against undefined weak symbol %s"
+msgid "%pB: dtp-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4671
+#: elf64-alpha.c:4699
 #, c-format
-msgid "%B: dtp-relative relocation against dynamic symbol %s"
+msgid "%pB: tp-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4696
+#: elf64-gen.c:71
 #, c-format
-msgid "%B: tp-relative relocation against dynamic symbol %s"
+msgid "%pB: Relocations in generic ELF (EM: %d)"
 msgstr ""
 
 #: elf64-hppa.c:2081
 #, c-format
-msgid "stub entry for %s cannot load .plt, dp offset = %Ld"
+msgid "stub entry for %s cannot load .plt, dp offset = %<PRId64>"
 msgstr ""
 
 #: elf64-hppa.c:3286
 #, c-format
-msgid "%B(%A+%#Lx): cannot reach %s"
+msgid "%pB(%pA+%#<PRIx64>): cannot reach %s"
 msgstr ""
 
-#: elf64-ia64-vms.c:587 elf32-ia64.c:620 elf64-ia64.c:620
+#: elf64-ia64-vms.c:598 elf32-ia64.c:637 elf64-ia64.c:637
 #, c-format
 msgid ""
-"%B: Can't relax br at %#Lx in section `%A'. Please use brl or indirect "
-"branch."
+"%pB: can't relax br at %#<PRIx64> in section `%pA'; please use brl or "
+"indirect branch"
 msgstr ""
 
-#: elf64-ia64-vms.c:2029 elf32-ia64.c:2285 elf64-ia64.c:2285
+#: elf64-ia64-vms.c:2040 elf32-ia64.c:2302 elf64-ia64.c:2302
 msgid "@pltoff reloc against local symbol"
 msgstr ""
 
-#: elf64-ia64-vms.c:3281 elf32-ia64.c:3696 elf64-ia64.c:3696
+#: elf64-ia64-vms.c:3292 elf32-ia64.c:3713 elf64-ia64.c:3713
 #, c-format
-msgid "%B: short data segment overflowed (%#Lx >= 0x400000)"
+msgid "%pB: short data segment overflowed (%#<PRIx64> >= 0x400000)"
 msgstr ""
 
-#: elf64-ia64-vms.c:3291 elf32-ia64.c:3706 elf64-ia64.c:3706
-msgid "%B: __gp does not cover short data segment"
+#: elf64-ia64-vms.c:3302 elf32-ia64.c:3723 elf64-ia64.c:3723
+#, c-format
+msgid "%pB: __gp does not cover short data segment"
 msgstr ""
 
-#: elf64-ia64-vms.c:3557 elf32-ia64.c:3974 elf64-ia64.c:3974
+#: elf64-ia64-vms.c:3572 elf32-ia64.c:3997 elf64-ia64.c:3997
 #, c-format
-msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
+msgid "%pB: non-pic code with imm relocation against dynamic symbol `%s'"
 msgstr ""
 
-#: elf64-ia64-vms.c:3621 elf32-ia64.c:4042 elf64-ia64.c:4042
+#: elf64-ia64-vms.c:3636 elf32-ia64.c:4065 elf64-ia64.c:4065
 #, c-format
-msgid "%B: @gprel relocation against dynamic symbol %s"
+msgid "%pB: @gprel relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-ia64-vms.c:3680 elf32-ia64.c:4105 elf64-ia64.c:4105
-msgid "%B: linking non-pic code in a position independent executable"
+#: elf64-ia64-vms.c:3695 elf32-ia64.c:4128 elf64-ia64.c:4128
+#, c-format
+msgid "%pB: linking non-pic code in a position independent executable"
 msgstr ""
 
-#: elf64-ia64-vms.c:3782 elf32-ia64.c:4243 elf64-ia64.c:4243
+#: elf64-ia64-vms.c:3797 elf32-ia64.c:4266 elf64-ia64.c:4266
 #, c-format
-msgid "%B: @internal branch to dynamic symbol %s"
+msgid "%pB: @internal branch to dynamic symbol %s"
 msgstr ""
 
-#: elf64-ia64-vms.c:3785 elf32-ia64.c:4246 elf64-ia64.c:4246
+#: elf64-ia64-vms.c:3800 elf32-ia64.c:4269 elf64-ia64.c:4269
 #, c-format
-msgid "%B: speculation fixup to dynamic symbol %s"
+msgid "%pB: speculation fixup to dynamic symbol %s"
 msgstr ""
 
-#: elf64-ia64-vms.c:3788 elf32-ia64.c:4249 elf64-ia64.c:4249
+#: elf64-ia64-vms.c:3803 elf32-ia64.c:4272 elf64-ia64.c:4272
 #, c-format
-msgid "%B: @pcrel relocation against dynamic symbol %s"
+msgid "%pB: @pcrel relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-ia64-vms.c:3912 elf32-ia64.c:4446 elf64-ia64.c:4446
+#: elf64-ia64-vms.c:3927 elf32-ia64.c:4469 elf64-ia64.c:4469
 msgid "unsupported reloc"
 msgstr ""
 
-#: elf64-ia64-vms.c:3949 elf32-ia64.c:4484 elf64-ia64.c:4484
+#: elf64-ia64-vms.c:3964 elf32-ia64.c:4507 elf64-ia64.c:4507
 #, c-format
 msgid ""
-"%B: missing TLS section for relocation %s against `%s' at %#Lx in section `"
-"%A'."
+"%pB: missing TLS section for relocation %s against `%s' at %#<PRIx64> in "
+"section `%pA'."
 msgstr ""
 
-#: elf64-ia64-vms.c:3966 elf32-ia64.c:4501 elf64-ia64.c:4501
+#: elf64-ia64-vms.c:3981 elf32-ia64.c:4524 elf64-ia64.c:4524
 #, c-format
 msgid ""
-"%B: Can't relax br (%s) to `%s' at %#Lx in section `%A' with size %#Lx (> "
-"0x1000000)."
+"%pB: Can't relax br (%s) to `%s' at %#<PRIx64> in section `%pA' with size "
+"%#<PRIx64> (> 0x1000000)."
 msgstr ""
 
-#: elf64-ia64-vms.c:4257 elf32-ia64.c:4758 elf64-ia64.c:4758
-msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
+#: elf64-ia64-vms.c:4273 elf32-ia64.c:4782 elf64-ia64.c:4782
+#, c-format
+msgid "%pB: linking trap-on-NULL-dereference with non-trapping files"
 msgstr ""
 
-#: elf64-ia64-vms.c:4266 elf32-ia64.c:4767 elf64-ia64.c:4767
-msgid "%B: linking big-endian files with little-endian files"
+#: elf64-ia64-vms.c:4282 elf32-ia64.c:4791 elf64-ia64.c:4791
+#, c-format
+msgid "%pB: linking big-endian files with little-endian files"
 msgstr ""
 
-#: elf64-ia64-vms.c:4275 elf32-ia64.c:4776 elf64-ia64.c:4776
-msgid "%B: linking 64-bit files with 32-bit files"
+#: elf64-ia64-vms.c:4291 elf32-ia64.c:4800 elf64-ia64.c:4800
+#, c-format
+msgid "%pB: linking 64-bit files with 32-bit files"
 msgstr ""
 
-#: elf64-ia64-vms.c:4284 elf32-ia64.c:4785 elf64-ia64.c:4785
-msgid "%B: linking constant-gp files with non-constant-gp files"
+#: elf64-ia64-vms.c:4300 elf32-ia64.c:4809 elf64-ia64.c:4809
+#, c-format
+msgid "%pB: linking constant-gp files with non-constant-gp files"
 msgstr ""
 
-#: elf64-ia64-vms.c:4294 elf32-ia64.c:4795 elf64-ia64.c:4795
-msgid "%B: linking auto-pic files with non-auto-pic files"
+#: elf64-ia64-vms.c:4310 elf32-ia64.c:4819 elf64-ia64.c:4819
+#, c-format
+msgid "%pB: linking auto-pic files with non-auto-pic files"
 msgstr ""
 
-#: elf64-ia64-vms.c:5137 elflink.c:4773
+#: elf64-ia64-vms.c:5153 elflink.c:4787
 #, c-format
 msgid ""
-"Warning: alignment %u of common symbol `%s' in %B is greater than the "
-"alignment (%u) of its section %A"
+"warning: alignment %u of common symbol `%s' in %pB is greater than the "
+"alignment (%u) of its section %pA"
 msgstr ""
 
-#: elf64-ia64-vms.c:5144 elflink.c:4780
+#: elf64-ia64-vms.c:5160 elflink.c:4794
 #, c-format
-msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
+msgid "warning: alignment %u of symbol `%s' in %pB is smaller than %u in %pB"
 msgstr ""
 
-#: elf64-ia64-vms.c:5160 elflink.c:4797
+#: elf64-ia64-vms.c:5176 elflink.c:4811
 #, c-format
-msgid "Warning: size of symbol `%s' changed from %Lu in %B to %Lu in %B"
+msgid ""
+"warning: size of symbol `%s' changed from %<PRIu64> in %pB to %<PRIu64> in "
+"%pB"
 msgstr ""
 
-#: elf64-mips.c:3615 elfn32-mips.c:3443
+#: elf64-mips.c:3763
 #, c-format
-msgid "unrecognised MIPS reloc number: %d"
+msgid "%pB(%pA): relocation %<PRIu64> has invalid symbol index %ld"
 msgstr ""
 
 #: elf64-mmix.c:984
 msgid ""
-"invalid input relocation when producing non-ELF, non-mmo format output.\n"
-" Please use the objcopy program to convert from ELF or mmo,\n"
-" or assemble using \"-no-expand\" (for gcc, \"-Wa,-no-expand\""
+"invalid input relocation when producing non-ELF, non-mmo format output; "
+"please use the objcopy program to convert from ELF or mmo, or assemble using "
+"\"-no-expand\" (for gcc, \"-Wa,-no-expand\""
 msgstr ""
 
 #: elf64-mmix.c:1168
 msgid ""
-"invalid input relocation when producing non-ELF, non-mmo format output.\n"
-" Please use the objcopy program to convert from ELF or mmo,\n"
-" or compile using the gcc-option \"-mno-base-addresses\"."
+"invalid input relocation when producing non-ELF, non-mmo format output; "
+"please use the objcopy program to convert from ELF or mmo, or compile using "
+"the gcc-option \"-mno-base-addresses\"."
 msgstr ""
 
 #: elf64-mmix.c:1195
 #, c-format
 msgid ""
-"%B: Internal inconsistency error for value for\n"
-" linker-allocated global register: linked: %#Lx != relaxed: %#Lx"
-msgstr ""
-
-#: elf64-mmix.c:1264
-#, c-format
-msgid "%B: invalid MMIX reloc number: %d"
+"%pB: Internal inconsistency error for value for\n"
+" linker-allocated global register: linked: %#<PRIx64> != relaxed: %#<PRIx64>"
 msgstr ""
 
-#: elf64-mmix.c:1616
+#: elf64-mmix.c:1619
 #, c-format
 msgid ""
-"%B: base-plus-offset relocation against register symbol: (unknown) in %A"
+"%pB: base-plus-offset relocation against register symbol: (unknown) in %pA"
 msgstr ""
 
-#: elf64-mmix.c:1622
+#: elf64-mmix.c:1625
 #, c-format
-msgid "%B: base-plus-offset relocation against register symbol: %s in %A"
+msgid "%pB: base-plus-offset relocation against register symbol: %s in %pA"
 msgstr ""
 
-#: elf64-mmix.c:1667
+#: elf64-mmix.c:1670
 #, c-format
-msgid "%B: register relocation against non-register symbol: (unknown) in %A"
+msgid "%pB: register relocation against non-register symbol: (unknown) in %pA"
 msgstr ""
 
-#: elf64-mmix.c:1673
+#: elf64-mmix.c:1676
 #, c-format
-msgid "%B: register relocation against non-register symbol: %s in %A"
+msgid "%pB: register relocation against non-register symbol: %s in %pA"
 msgstr ""
 
-#: elf64-mmix.c:1710
-msgid "%B: directive LOCAL valid only with a register or absolute value"
+#: elf64-mmix.c:1713
+#, c-format
+msgid "%pB: directive LOCAL valid only with a register or absolute value"
 msgstr ""
 
-#: elf64-mmix.c:1741
+#: elf64-mmix.c:1744
 #, c-format
 msgid ""
-"%B: LOCAL directive: Register $%Ld is not a local register.  First global "
-"register is $%Ld."
+"%pB: LOCAL directive: register $%<PRId64> is not a local register; first "
+"global register is $%<PRId64>"
 msgstr ""
 
-#: elf64-mmix.c:2169
+#: elf64-mmix.c:2173
 #, c-format
 msgid ""
-"%B: Error: multiple definition of `%s'; start of %s is set in a earlier "
-"linked file\n"
+"%pB: error: multiple definition of `%s'; start of %s is set in a earlier "
+"linked file"
 msgstr ""
 
-#: elf64-mmix.c:2224
-msgid "Register section has contents\n"
+#: elf64-mmix.c:2228
+msgid "register section has contents\n"
 msgstr ""
 
-#: elf64-mmix.c:2414
+#: elf64-mmix.c:2418
 #, c-format
 msgid ""
-"Internal inconsistency: remaining %lu != max %lu.\n"
-"  Please report this bug."
+"internal inconsistency: remaining %lu != max %lu; please report this bug"
 msgstr ""
 
-#: elf64-ppc.c:4640
+#: elf64-ppc.c:5068
 #, c-format
-msgid "%P: %B: cannot create stub entry %s\n"
-msgstr ""
-
-#: elf64-ppc.c:4971
-msgid "%P: symbol '%s' has invalid st_other for ABI version 1\n"
+msgid "symbol '%s' has invalid st_other for ABI version 1"
 msgstr ""
 
-#: elf64-ppc.c:5146
+#: elf64-ppc.c:5243
 #, c-format
-msgid "%P: %B .opd not allowed in ABI version %d\n"
+msgid "%pB .opd not allowed in ABI version %d"
 msgstr ""
 
-#: elf64-ppc.c:5645
+#: elf64-ppc.c:5757
 #, c-format
-msgid "%H: %s reloc unsupported in shared libraries and PIEs.\n"
+msgid "%H: %s reloc unsupported in shared libraries and PIEs\n"
 msgstr ""
 
-#: elf64-ppc.c:6035
+#: elf64-ppc.c:6152
 #, c-format
-msgid "%B uses unknown e_flags 0x%lx"
+msgid "%pB uses unknown e_flags 0x%lx"
 msgstr ""
 
-#: elf64-ppc.c:6043
+#: elf64-ppc.c:6160
 #, c-format
-msgid "%B: ABI version %ld is not compatible with ABI version %ld output"
+msgid "%pB: ABI version %ld is not compatible with ABI version %ld output"
 msgstr ""
 
-#: elf64-ppc.c:6071
+#: elf64-ppc.c:6188
 #, c-format
 msgid " [abiv%ld]"
 msgstr ""
 
-#: elf64-ppc.c:7255
+#: elf64-ppc.c:7376
 msgid ""
-"%P: copy reloc against `%T' requires lazy plt linking; avoid setting "
+"%P: copy reloc against `%pT' requires lazy plt linking; avoid setting "
 "LD_BIND_NOW=1 or upgrade gcc\n"
 msgstr ""
 
-#: elf64-ppc.c:7522
-msgid "%B: undefined symbol on R_PPC64_TOCSAVE relocation"
+#: elf64-ppc.c:7645
+#, c-format
+msgid "%pB: undefined symbol on R_PPC64_TOCSAVE relocation"
 msgstr ""
 
-#: elf64-ppc.c:7749
+#: elf64-ppc.c:7872
 #, c-format
-msgid "%P: dynreloc miscount for %B, section %A\n"
+msgid "dynreloc miscount for %pB, section %pA"
 msgstr ""
 
-#: elf64-ppc.c:7838
-msgid "%B: .opd is not a regular array of opd entries"
+#: elf64-ppc.c:7961
+#, c-format
+msgid "%pB: .opd is not a regular array of opd entries"
 msgstr ""
 
-#: elf64-ppc.c:7848
+#: elf64-ppc.c:7971
 #, c-format
-msgid "%B: unexpected reloc type %u in .opd section"
+msgid "%pB: unexpected reloc type %u in .opd section"
 msgstr ""
 
-#: elf64-ppc.c:7870
+#: elf64-ppc.c:7993
 #, c-format
-msgid "%B: undefined sym `%s' in .opd section"
+msgid "%pB: undefined sym `%s' in .opd section"
 msgstr ""
 
-#: elf64-ppc.c:8207
+#: elf64-ppc.c:8477
 msgid ""
-"%P: warning: --plt-localentry is especially dangerous without ld.so support "
-"to detect ABI violations.\n"
+"warning: --plt-localentry is especially dangerous without ld.so support to "
+"detect ABI violations"
 msgstr ""
 
-#: elf64-ppc.c:8456
+#: elf64-ppc.c:8726
 msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
 msgstr ""
 
-#: elf64-ppc.c:8800 elf64-ppc.c:9437
+#: elf64-ppc.c:9101 elf64-ppc.c:9738
 #, c-format
 msgid "%s defined on removed toc entry"
 msgstr ""
 
-#: elf64-ppc.c:9165
+#: elf64-ppc.c:9466
 #, c-format
-msgid "%H: toc optimization is not supported for %s instruction.\n"
+msgid "%H: toc optimization is not supported for %s instruction\n"
 msgstr ""
 
-#: elf64-ppc.c:9394
+#: elf64-ppc.c:9695
 #, c-format
 msgid "%H: %s references optimized away TOC entry\n"
 msgstr ""
 
-#: elf64-ppc.c:10157
+#: elf64-ppc.c:10526
 #, c-format
 msgid "warning: discarding dynamic section %s"
 msgstr ""
 
-#: elf64-ppc.c:10746
-msgid "%P: cannot find opd entry toc for `%T'\n"
+#: elf64-ppc.c:11113
+msgid "%P: cannot find opd entry toc for `%pT'\n"
 msgstr ""
 
-#: elf64-ppc.c:10837
-msgid "%P: long branch stub `%s' offset overflow\n"
-msgstr ""
-
-#: elf64-ppc.c:10896
-msgid "%P: can't find branch stub `%s'\n"
+#: elf64-ppc.c:11201
+#, c-format
+msgid "long branch stub `%s' offset overflow"
 msgstr ""
 
-#: elf64-ppc.c:10960 elf64-ppc.c:11112 elf64-ppc.c:12974
+#: elf64-ppc.c:11260
 #, c-format
-msgid "%P: linkage table error against `%T'\n"
+msgid "can't find branch stub `%s'"
 msgstr ""
 
-#: elf64-ppc.c:11331
-msgid "%P: can't build branch stub `%s'\n"
+#: elf64-ppc.c:11324 elf64-ppc.c:11452 elf64-ppc.c:13421
+#, c-format
+msgid "%P: linkage table error against `%pT'\n"
 msgstr ""
 
-#: elf64-ppc.c:12104
+#: elf64-ppc.c:11675
 #, c-format
-msgid "%B section %A exceeds stub group size"
+msgid "can't build branch stub `%s'"
 msgstr ""
 
-#: elf64-ppc.c:13242
-msgid "%P: stubs don't match calculated size\n"
+#: elf64-ppc.c:12451
+#, c-format
+msgid "%pB section %pA exceeds stub group size"
 msgstr ""
 
-#: elf64-ppc.c:13256
+#: elf64-ppc.c:13819
 #, c-format
 msgid "linker stubs in %u group\n"
 msgid_plural "linker stubs in %u groups\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: elf64-ppc.c:13260
+#: elf64-ppc.c:13823
 #, c-format
 msgid ""
 "  branch       %lu\n"
@@ -4598,1330 +4303,1284 @@ msgid ""
 "  global entry %lu"
 msgstr ""
 
-#: elf64-ppc.c:13579
+#: elf64-ppc.c:14142
 #, c-format
-msgid "%H: %s used with TLS symbol `%T'\n"
+msgid "%H: %s used with TLS symbol `%pT'\n"
 msgstr ""
 
-#: elf64-ppc.c:13581
+#: elf64-ppc.c:14144
 #, c-format
-msgid "%H: %s used with non-TLS symbol `%T'\n"
+msgid "%H: %s used with non-TLS symbol `%pT'\n"
 msgstr ""
 
-#: elf64-ppc.c:14191
+#: elf64-ppc.c:14788
 #, c-format
-msgid "%H: call to `%T' lacks nop, can't restore toc; recompile with -fPIC\n"
+msgid "%H: call to `%pT' lacks nop, can't restore toc; recompile with -fPIC\n"
 msgstr ""
 
-#: elf64-ppc.c:14197
+#: elf64-ppc.c:14794
 #, c-format
 msgid ""
-"%H: call to `%T' lacks nop, can't restore toc; (-mcmodel=small toc adjust "
+"%H: call to `%pT' lacks nop, can't restore toc; (-mcmodel=small toc adjust "
 "stub)\n"
 msgstr ""
 
-#: elf64-ppc.c:14325
+#: elf64-ppc.c:15489
 #, c-format
-msgid "%P: %B: unknown relocation type %d for `%T'\n"
+msgid "%H: %s for indirect function `%pT' unsupported\n"
 msgstr ""
 
-#: elf64-ppc.c:14874
+#: elf64-ppc.c:15601
 #, c-format
-msgid "%H: %s for indirect function `%T' unsupported\n"
+msgid "%P: %pB: %s is not supported for `%pT'\n"
 msgstr ""
 
-#: elf64-ppc.c:14986
-#, c-format
-msgid "%P: %B: %s is not supported for `%T'\n"
-msgstr ""
-
-#: elf64-ppc.c:15169
+#: elf64-ppc.c:15827
 #, c-format
 msgid "%H: error: %s not a multiple of %u\n"
 msgstr ""
 
-#: elf64-ppc.c:15191
+#: elf64-ppc.c:15850
 #, c-format
-msgid "%H: unresolvable %s against `%T'\n"
+msgid "%H: unresolvable %s against `%pT'\n"
 msgstr ""
 
-#: elf64-ppc.c:15288
+#: elf64-ppc.c:15947
 #, c-format
-msgid "%H: %s against `%T': error %d\n"
+msgid "%H: %s against `%pT': error %d\n"
 msgstr ""
 
-#: elf64-ppc.c:15678 elf64-ppc.c:15697
-msgid "%P: %s offset too large for .eh_frame sdata4 encoding"
+#: elf64-ppc.c:16293 elf64-ppc.c:16312
+#, c-format
+msgid "%s offset too large for .eh_frame sdata4 encoding"
 msgstr ""
 
-#: elf64-s390.c:2533
+#: elf64-s390.c:2540
+#, c-format
 msgid ""
-"%B: `%s' non-PLT reloc for symbol defined in shared library and accessed "
+"%pB: `%s' non-PLT reloc for symbol defined in shared library and accessed "
 "from executable (rebuild file with -fPIC ?)"
 msgstr ""
 
-#: elf64-sh64.c:1680
+#: elf64-sparc.c:464
 #, c-format
-msgid "%B: error: unaligned relocation type %d at %08Lx reloc %08Lx"
+msgid "%pB: only registers %%g[2367] can be declared using STT_REGISTER"
 msgstr ""
 
-#: elf64-sparc.c:460
-msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
-msgstr ""
-
-#: elf64-sparc.c:481
+#: elf64-sparc.c:485
 #, c-format
-msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
+msgid "register %%g%d used incompatibly: %s in %pB, previously %s in %pB"
 msgstr ""
 
-#: elf64-sparc.c:505
+#: elf64-sparc.c:509
 #, c-format
-msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
+msgid "symbol `%s' has differing types: REGISTER in %pB, previously %s in %pB"
 msgstr ""
 
-#: elf64-sparc.c:552
+#: elf64-sparc.c:556
 #, c-format
-msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
+msgid "Symbol `%s' has differing types: %s in %pB, previously REGISTER in %pB"
 msgstr ""
 
-#: elf64-sparc.c:707
-msgid "%B: linking UltraSPARC specific with HAL specific code"
+#: elf64-sparc.c:711
+#, c-format
+msgid "%pB: linking UltraSPARC specific with HAL specific code"
 msgstr ""
 
-#: elf64-x86-64.c:1370
+#: elf64-x86-64.c:1373
 msgid "hidden symbol "
 msgstr ""
 
-#: elf64-x86-64.c:1373
+#: elf64-x86-64.c:1376
 msgid "internal symbol "
 msgstr ""
 
-#: elf64-x86-64.c:1376 elf64-x86-64.c:1380
+#: elf64-x86-64.c:1379 elf64-x86-64.c:1383
 msgid "protected symbol "
 msgstr ""
 
-#: elf64-x86-64.c:1382
+#: elf64-x86-64.c:1385
 msgid "symbol "
 msgstr ""
 
-#: elf64-x86-64.c:1383 elf64-x86-64.c:1393
+#: elf64-x86-64.c:1386 elf64-x86-64.c:1396
 msgid "; recompile with -fPIC"
 msgstr ""
 
-#: elf64-x86-64.c:1388
+#: elf64-x86-64.c:1391
 msgid "undefined "
 msgstr ""
 
-#: elf64-x86-64.c:1397
+#: elf64-x86-64.c:1400
 msgid "a shared object"
 msgstr ""
 
-#: elf64-x86-64.c:1399
+#: elf64-x86-64.c:1402
 msgid "a PIE object"
 msgstr ""
 
-#: elf64-x86-64.c:1401
+#: elf64-x86-64.c:1404
 msgid "a PDE object"
 msgstr ""
 
-#: elf64-x86-64.c:1404
+#: elf64-x86-64.c:1407
 #, c-format
-msgid "%B: relocation %s against %s%s`%s' can not be used when making %s%s"
+msgid "%pB: relocation %s against %s%s`%s' can not be used when making %s%s"
 msgstr ""
 
-#: elf64-x86-64.c:1889
+#: elf64-x86-64.c:1892
 #, c-format
-msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
+msgid "%pB: relocation %s against symbol `%s' isn't supported in x32 mode"
 msgstr ""
 
-#: elf64-x86-64.c:2027
+#: elf64-x86-64.c:2034
 #, c-format
-msgid "%B: '%s' accessed both as normal and thread local symbol"
+msgid "%pB: '%s' accessed both as normal and thread local symbol"
 msgstr ""
 
-#: elf64-x86-64.c:2651 /work/sources/binutils/current/bfd/elfnn-aarch64.c:5040
+#: elf64-x86-64.c:2654 /work/sources/binutils/current/bfd/elfnn-aarch64.c:5299
 #, c-format
 msgid ""
-"%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %Ld"
+"%pB: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: "
+"%<PRId64>"
 msgstr ""
 
-#: elf64-x86-64.c:2888
+#: elf64-x86-64.c:2892
 #, c-format
 msgid ""
-"%B: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used "
+"%pB: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used "
 "when making a shared object"
 msgstr ""
 
-#: elf64-x86-64.c:2902
+#: elf64-x86-64.c:2906
 #, c-format
 msgid ""
-"%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used "
+"%pB: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used "
 "when making a shared object"
 msgstr ""
 
-#: elf64-x86-64.c:3153
+#: elf64-x86-64.c:3166
 #, c-format
 msgid ""
-"%B: addend %s%#x in relocation %s against symbol `%s' at %#Lx in section `"
-"%A' is out of range"
+"%pB: addend %s%#x in relocation %s against symbol `%s' at %#<PRIx64> in "
+"section `%pA' is out of range"
 msgstr ""
 
-#: elf64-x86-64.c:3828
+#: elf64-x86-64.c:3843
 msgid "%F%P: failed to convert GOTPCREL relocation; relink with --no-relax\n"
 msgstr ""
 
-#: elf64-x86-64.c:3986
+#: elf64-x86-64.c:4001
 #, c-format
-msgid "%F%B: PC-relative offset overflow in PLT entry for `%s'\n"
+msgid "%F%pB: PC-relative offset overflow in PLT entry for `%s'\n"
 msgstr ""
 
-#: elf64-x86-64.c:4049
+#: elf64-x86-64.c:4064
 #, c-format
-msgid "%F%B: branch displacement overflow in PLT entry for `%s'\n"
+msgid "%F%pB: branch displacement overflow in PLT entry for `%s'\n"
 msgstr ""
 
-#: elf64-x86-64.c:4102
+#: elf64-x86-64.c:4117
 #, c-format
-msgid "%F%B: PC-relative offset overflow in GOT PLT entry for `%s'\n"
+msgid "%F%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"
 msgstr ""
 
 #: elfcode.h:760
-msgid "warning: %B has a corrupt string table index - ignoring"
+#, c-format
+msgid "warning: %pB has a corrupt string table index - ignoring"
 msgstr ""
 
 #: elfcode.h:1199
 #, c-format
-msgid "%B: version count (%Ld) does not match symbol count (%ld)"
+msgid "%pB: version count (%<PRId64>) does not match symbol count (%ld)"
 msgstr ""
 
-#: elfcode.h:1456
+#: elfcode.h:1458
 #, c-format
-msgid "%B(%A): relocation %d has invalid symbol index %ld"
+msgid "%pB(%pA): relocation %d has invalid symbol index %ld"
 msgstr ""
 
 #: elfcore.h:300
 #, c-format
-msgid "warning: %B is truncated: expected core file size >= %Lu, found: %llu"
+msgid ""
+"warning: %pB is truncated: expected core file size >= %<PRIu64>, found: "
+"%<PRIu64>"
 msgstr ""
 
-#: elflink.c:1353
+#: elflink.c:1367
 #, c-format
 msgid ""
-"%s: TLS definition in %B section %A mismatches non-TLS definition in %B "
-"section %A"
+"%s: TLS definition in %pB section %pA mismatches non-TLS definition in %pB "
+"section %pA"
 msgstr ""
 
-#: elflink.c:1359
+#: elflink.c:1373
 #, c-format
-msgid "%s: TLS reference in %B mismatches non-TLS reference in %B"
+msgid "%s: TLS reference in %pB mismatches non-TLS reference in %pB"
 msgstr ""
 
-#: elflink.c:1365
+#: elflink.c:1379
 #, c-format
-msgid "%s: TLS definition in %B section %A mismatches non-TLS reference in %B"
+msgid ""
+"%s: TLS definition in %pB section %pA mismatches non-TLS reference in %pB"
 msgstr ""
 
-#: elflink.c:1371
+#: elflink.c:1385
 #, c-format
-msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
+msgid ""
+"%s: TLS reference in %pB mismatches non-TLS definition in %pB section %pA"
 msgstr ""
 
-#: elflink.c:2052
+#: elflink.c:2066
 #, c-format
-msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
+msgid "%pB: unexpected redefinition of indirect versioned symbol `%s'"
 msgstr ""
 
-#: elflink.c:2345
+#: elflink.c:2359
 #, c-format
-msgid "%B: version node not found for symbol %s"
+msgid "%pB: version node not found for symbol %s"
 msgstr ""
 
-#: elflink.c:2434
+#: elflink.c:2448
 #, c-format
 msgid ""
-"%B: bad reloc symbol index (%#Lx >= %#lx) for offset %#Lx in section `%A'"
+"%pB: bad reloc symbol index (%#<PRIx64> >= %#lx) for offset %#<PRIx64> in "
+"section `%pA'"
 msgstr ""
 
-#: elflink.c:2446
+#: elflink.c:2460
 #, c-format
 msgid ""
-"%B: non-zero symbol index (%#Lx) for offset %#Lx in section `%A' when the "
-"object file has no symbol table"
+"%pB: non-zero symbol index (%#<PRIx64>) for offset %#<PRIx64> in section `"
+"%pA' when the object file has no symbol table"
 msgstr ""
 
-#: elflink.c:2637
+#: elflink.c:2651
 #, c-format
-msgid "%B: relocation size mismatch in %B section %A"
+msgid "%pB: relocation size mismatch in %pB section %pA"
 msgstr ""
 
-#: elflink.c:2955
+#: elflink.c:2969
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
 msgstr ""
 
-#: elflink.c:3017
-msgid "%P: copy reloc against protected `%T' is dangerous\n"
+#: elflink.c:3031
+msgid "%P: copy reloc against protected `%pT' is dangerous\n"
 msgstr ""
 
-#: elflink.c:3818
+#: elflink.c:3832
 #, c-format
-msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
+msgid "alternate ELF machine code found (%d) in %pB, expecting %d"
 msgstr ""
 
-#: elflink.c:4484
+#: elflink.c:4498
 #, c-format
-msgid "%B: %s: invalid version %u (max %d)"
+msgid "%pB: %s: invalid version %u (max %d)"
 msgstr ""
 
-#: elflink.c:4521
+#: elflink.c:4535
 #, c-format
-msgid "%B: %s: invalid needed version %d"
+msgid "%pB: %s: invalid needed version %d"
 msgstr ""
 
-#: elflink.c:4932
+#: elflink.c:4947
 #, c-format
-msgid "%B: undefined reference to symbol '%s'"
+msgid "%pB: undefined reference to symbol '%s'"
 msgstr ""
 
-#: elflink.c:6008
+#: elflink.c:6023
 #, c-format
-msgid "%B: stack size specified and %s set"
+msgid "%pB: stack size specified and %s set"
 msgstr ""
 
-#: elflink.c:6012
+#: elflink.c:6027
 #, c-format
-msgid "%B: %s not absolute"
+msgid "%pB: %s not absolute"
 msgstr ""
 
-#: elflink.c:6209
+#: elflink.c:6224
 #, c-format
 msgid "%s: undefined version: %s"
 msgstr ""
 
-#: elflink.c:6780
-msgid "%B: .preinit_array section is not allowed in DSO"
+#: elflink.c:6795
+#, c-format
+msgid "%pB: .preinit_array section is not allowed in DSO"
 msgstr ""
 
-#: elflink.c:8217
+#: elflink.c:8232
 #, c-format
 msgid "undefined %s reference in complex symbol: %s"
 msgstr ""
 
-#: elflink.c:8372
+#: elflink.c:8387
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr ""
 
 #. PR 21524: Let the user know if a symbol was removed by garbage collection.
-#: elflink.c:8710
+#: elflink.c:8725
+#, c-format
 msgid ""
-"%B:%A: error: relocation references symbol %s which was removed by garbage "
-"collection."
+"%pB:%pA: error: relocation references symbol %s which was removed by garbage "
+"collection"
 msgstr ""
 
-#: elflink.c:8713
-msgid "%B:%A: error: try relinking with --gc-keep-exported enabled."
+#: elflink.c:8728
+#, c-format
+msgid "%pB:%pA: error: try relinking with --gc-keep-exported enabled"
 msgstr ""
 
-#: elflink.c:8949 elflink.c:8967 elflink.c:9006 elflink.c:9024
-msgid "%B: Unable to sort relocs - they are in more than one size"
+#: elflink.c:8964 elflink.c:8982 elflink.c:9021 elflink.c:9039
+#, c-format
+msgid "%pB: unable to sort relocs - they are in more than one size"
 msgstr ""
 
 #. The section size is not divisible by either -
 #. something is wrong.
-#: elflink.c:8983 elflink.c:9040
-msgid "%B: Unable to sort relocs - they are of an unknown size"
+#: elflink.c:8998 elflink.c:9055
+#, c-format
+msgid "%pB: unable to sort relocs - they are of an unknown size"
 msgstr ""
 
-#: elflink.c:9092
-msgid "Not enough memory to sort relocations"
+#: elflink.c:9107
+msgid "not enough memory to sort relocations"
 msgstr ""
 
-#: elflink.c:9360
+#: elflink.c:9375
 #, c-format
-msgid "%B: Too many sections: %d (>= %d)"
+msgid "%pB: too many sections: %d (>= %d)"
 msgstr ""
 
-#: elflink.c:9640
+#: elflink.c:9655
 #, c-format
-msgid "%B: internal symbol `%s' in %B is referenced by DSO"
+msgid "%pB: internal symbol `%s' in %pB is referenced by DSO"
 msgstr ""
 
-#: elflink.c:9643
+#: elflink.c:9658
 #, c-format
-msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
+msgid "%pB: hidden symbol `%s' in %pB is referenced by DSO"
 msgstr ""
 
-#: elflink.c:9646
+#: elflink.c:9661
 #, c-format
-msgid "%B: local symbol `%s' in %B is referenced by DSO"
+msgid "%pB: local symbol `%s' in %pB is referenced by DSO"
 msgstr ""
 
-#: elflink.c:9732
+#: elflink.c:9747
 #, c-format
-msgid "%B: could not find output section %A for input section %A"
+msgid "%pB: could not find output section %pA for input section %pA"
 msgstr ""
 
-#: elflink.c:9886
+#: elflink.c:9901
 #, c-format
-msgid "%B: protected symbol `%s' isn't defined"
+msgid "%pB: protected symbol `%s' isn't defined"
 msgstr ""
 
-#: elflink.c:9889
+#: elflink.c:9904
 #, c-format
-msgid "%B: internal symbol `%s' isn't defined"
+msgid "%pB: internal symbol `%s' isn't defined"
 msgstr ""
 
-#: elflink.c:9892
+#: elflink.c:9907
 #, c-format
-msgid "%B: hidden symbol `%s' isn't defined"
+msgid "%pB: hidden symbol `%s' isn't defined"
 msgstr ""
 
-#: elflink.c:9923
+#: elflink.c:9938
 #, c-format
-msgid "%B: No symbol version section for versioned symbol `%s'"
+msgid "%pB: no symbol version section for versioned symbol `%s'"
 msgstr ""
 
-#: elflink.c:10533
+#: elflink.c:10548
 #, c-format
-msgid "error: %B: size of section %A is not multiple of address size"
+msgid "error: %pB: size of section %pA is not multiple of address size"
 msgstr ""
 
-#: elflink.c:10578
+#: elflink.c:10593
 #, c-format
 msgid ""
-"error: %B contains a reloc (%#Lx) for section %A that references a non-"
-"existent global symbol"
+"error: %pB contains a reloc (%#<PRIx64>) for section %pA that references a "
+"non-existent global symbol"
 msgstr ""
 
-#: elflink.c:11333
+#: elflink.c:11348
 #, c-format
-msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
+msgid ""
+"%pA has both ordered [`%pA' in %pB] and unordered [`%pA' in %pB] sections"
 msgstr ""
 
-#: elflink.c:11339
+#: elflink.c:11354
 #, c-format
-msgid "%A has both ordered and unordered sections"
+msgid "%pA has both ordered and unordered sections"
 msgstr ""
 
-#: elflink.c:11441
-msgid "%B: no symbol found for import library"
+#: elflink.c:11456
+#, c-format
+msgid "%pB: no symbol found for import library"
 msgstr ""
 
-#: elflink.c:12063
+#: elflink.c:12085
 #, c-format
-msgid "%B: file class %s incompatible with %s"
+msgid "%pB: file class %s incompatible with %s"
 msgstr ""
 
-#: elflink.c:12280
-msgid "%B: failed to generate import library"
+#: elflink.c:12302
+#, c-format
+msgid "%pB: failed to generate import library"
 msgstr ""
 
-#: elflink.c:12399
+#: elflink.c:12421
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr ""
 
-#: elflink.c:12447
+#: elflink.c:12469
 #, c-format
 msgid "warning: section '%s' is being made into a note"
 msgstr ""
 
-#: elflink.c:12539
-msgid "%P%X: read-only segment has dynamic relocations.\n"
+#: elflink.c:12561
+msgid "%P%X: read-only segment has dynamic relocations\n"
 msgstr ""
 
-#: elflink.c:12542
-msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
+#: elflink.c:12564
+msgid "%P: warning: creating a DT_TEXTREL in a shared object\n"
 msgstr ""
 
-#: elflink.c:12667
+#: elflink.c:12689
 msgid "%P%X: can not read symbols: %E\n"
 msgstr ""
 
-#: elflink.c:12829
-msgid "%F%P: corrupt input: %B\n"
+#: elflink.c:12862
+msgid "%F%P: corrupt input: %pB\n"
 msgstr ""
 
-#: elflink.c:13495
+#: elflink.c:13528
 #, c-format
-msgid "%B: %A+%#Lx: No symbol found for INHERIT"
+msgid "%pB: %pA+%#<PRIx64>: no symbol found for INHERIT"
 msgstr ""
 
-#: elflink.c:13671
+#: elflink.c:13704
 #, c-format
-msgid "Unrecognized INPUT_SECTION_FLAG %s\n"
+msgid "unrecognized INPUT_SECTION_FLAG %s\n"
 msgstr ""
 
 #: elfxx-mips.c:1444
 msgid "static procedure (no name)"
 msgstr ""
 
-#: elfxx-mips.c:5628
+#: elfxx-mips.c:5634
 msgid "MIPS16 and microMIPS functions cannot call each other"
 msgstr ""
 
-#: elfxx-mips.c:6376
-msgid "%X%H: Unsupported JALX to the same ISA mode\n"
+#: elfxx-mips.c:6382
+msgid "%X%H: unsupported JALX to the same ISA mode\n"
 msgstr ""
 
-#: elfxx-mips.c:6409
+#: elfxx-mips.c:6415
 msgid ""
-"%X%H: Unsupported jump between ISA modes; consider recompiling with "
+"%X%H: unsupported jump between ISA modes; consider recompiling with "
 "interlinking enabled\n"
 msgstr ""
 
-#: elfxx-mips.c:6454
+#: elfxx-mips.c:6460
 msgid ""
-"%X%H: Cannot convert branch between ISA modes to JALX: relocation out of "
+"%X%H: cannot convert branch between ISA modes to JALX: relocation out of "
 "range\n"
 msgstr ""
 
-#: elfxx-mips.c:6466
-msgid "%X%H: Unsupported branch between ISA modes\n"
+#: elfxx-mips.c:6472
+msgid "%X%H: unsupported branch between ISA modes\n"
 msgstr ""
 
-#: elfxx-mips.c:7144 elfxx-mips.c:7379
+#: elfxx-mips.c:7116
 #, c-format
-msgid "%B: Warning: bad `%s' option size %u smaller than its header"
+msgid ""
+"%pB: incorrect `.reginfo' section size; expected %<PRIu64>, got %<PRIu64>"
 msgstr ""
 
-#: elfxx-mips.c:8135 elfxx-mips.c:8261
+#: elfxx-mips.c:7160 elfxx-mips.c:7395
 #, c-format
-msgid "%B: Warning: cannot determine the target function for stub section `%s'"
+msgid "%pB: warning: bad `%s' option size %u smaller than its header"
 msgstr ""
 
-#: elfxx-mips.c:8393
+#: elfxx-mips.c:8151 elfxx-mips.c:8277
 #, c-format
-msgid "%B: Malformed reloc detected for section %s"
+msgid ""
+"%pB: warning: cannot determine the target function for stub section `%s'"
 msgstr ""
 
-#: elfxx-mips.c:8465
+#: elfxx-mips.c:8409
 #, c-format
-msgid "%B: GOT reloc at %#Lx not expected in executables"
+msgid "%pB: malformed reloc detected for section %s"
 msgstr ""
 
-#: elfxx-mips.c:8603
+#: elfxx-mips.c:8481
 #, c-format
-msgid "%B: CALL16 reloc at %#Lx not against global symbol"
+msgid "%pB: GOT reloc at %#<PRIx64> not expected in executables"
 msgstr ""
 
-#: elfxx-mips.c:9226
+#: elfxx-mips.c:8619
+#, c-format
+msgid "%pB: CALL16 reloc at %#<PRIx64> not against global symbol"
+msgstr ""
+
+#: elfxx-mips.c:9242
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
 msgstr ""
 
-#: elfxx-mips.c:10146
+#: elfxx-mips.c:10169
 #, c-format
 msgid ""
-"%B: Can't find matching LO16 reloc against `%s' for %s at %#Lx in section `"
-"%A'"
+"%pB: can't find matching LO16 reloc against `%s' for %s at %#<PRIx64> in "
+"section `%pA'"
 msgstr ""
 
-#: elfxx-mips.c:10286
+#: elfxx-mips.c:10309
 msgid ""
 "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
 msgstr ""
 
-#: elfxx-mips.c:10305
-msgid "Cannot convert a jump to JALX for a non-word-aligned address"
+#: elfxx-mips.c:10328
+msgid "cannot convert a jump to JALX for a non-word-aligned address"
 msgstr ""
 
-#: elfxx-mips.c:10308
-msgid "Jump to a non-word-aligned address"
+#: elfxx-mips.c:10331
+msgid "jump to a non-word-aligned address"
 msgstr ""
 
-#: elfxx-mips.c:10309
-msgid "Jump to a non-instruction-aligned address"
+#: elfxx-mips.c:10332
+msgid "jump to a non-instruction-aligned address"
 msgstr ""
 
-#: elfxx-mips.c:10312
-msgid "Cannot convert a branch to JALX for a non-word-aligned address"
+#: elfxx-mips.c:10335
+msgid "cannot convert a branch to JALX for a non-word-aligned address"
 msgstr ""
 
-#: elfxx-mips.c:10314
-msgid "Branch to a non-instruction-aligned address"
+#: elfxx-mips.c:10337
+msgid "branch to a non-instruction-aligned address"
 msgstr ""
 
-#: elfxx-mips.c:10316
+#: elfxx-mips.c:10339
 msgid "PC-relative load from unaligned address"
 msgstr ""
 
-#: elfxx-mips.c:10690 elfxx-mips.c:11258
+#: elfxx-mips.c:10713 elfxx-mips.c:11281
 #, c-format
-msgid "%B: `%A' offset of %Ld from `%A' beyond the range of ADDIUPC"
+msgid "%pB: `%pA' offset of %<PRId64> from `%pA' beyond the range of ADDIUPC"
 msgstr ""
 
-#: elfxx-mips.c:14121
+#: elfxx-mips.c:14161
 #, c-format
-msgid "%B: Unknown architecture %s"
+msgid "%pB: unknown architecture %s"
 msgstr ""
 
-#: elfxx-mips.c:14380
-msgid "%B: .reginfo section size should be %d bytes, actual size is %d"
-msgstr ""
-
-#: elfxx-mips.c:14659
+#: elfxx-mips.c:14695
 #, c-format
-msgid "%B: illegal section name `%A'"
+msgid "%pB: illegal section name `%pA'"
 msgstr ""
 
-#: elfxx-mips.c:14936
-msgid "%B: warning: linking abicalls files with non-abicalls files"
+#: elfxx-mips.c:14972
+#, c-format
+msgid "%pB: warning: linking abicalls files with non-abicalls files"
 msgstr ""
 
-#: elfxx-mips.c:14953
-msgid "%B: linking 32-bit code with 64-bit code"
+#: elfxx-mips.c:14989
+#, c-format
+msgid "%pB: linking 32-bit code with 64-bit code"
 msgstr ""
 
-#: elfxx-mips.c:14985 elfxx-mips.c:15051 elfxx-mips.c:15066
+#: elfxx-mips.c:15021 elfxx-mips.c:15087 elfxx-mips.c:15102
 #, c-format
-msgid "%B: linking %s module with previous %s modules"
+msgid "%pB: linking %s module with previous %s modules"
 msgstr ""
 
-#: elfxx-mips.c:15009
+#: elfxx-mips.c:15045
 #, c-format
-msgid "%B: ABI mismatch: linking %s module with previous %s modules"
+msgid "%pB: ABI mismatch: linking %s module with previous %s modules"
 msgstr ""
 
-#: elfxx-mips.c:15034
+#: elfxx-mips.c:15070
 #, c-format
-msgid "%B: ASE mismatch: linking %s module with previous %s modules"
+msgid "%pB: ASE mismatch: linking %s module with previous %s modules"
 msgstr ""
 
-#: elfxx-mips.c:15168
+#: elfxx-mips.c:15204
+#, c-format
 msgid ""
-"Warning: %B uses unknown floating point ABI %d (set by %B), %B uses unknown "
-"floating point ABI %d"
+"warning: %pB uses unknown floating point ABI %d (set by %pB), %pB uses "
+"unknown floating point ABI %d"
 msgstr ""
 
-#: elfxx-mips.c:15174
+#: elfxx-mips.c:15210
 #, c-format
-msgid "Warning: %B uses unknown floating point ABI %d (set by %B), %B uses %s"
+msgid ""
+"warning: %pB uses unknown floating point ABI %d (set by %pB), %pB uses %s"
 msgstr ""
 
-#: elfxx-mips.c:15180
+#: elfxx-mips.c:15216
 #, c-format
-msgid "Warning: %B uses %s (set by %B), %B uses unknown floating point ABI %d"
+msgid ""
+"warning: %pB uses %s (set by %pB), %pB uses unknown floating point ABI %d"
 msgstr ""
 
-#: elfxx-mips.c:15194
+#: elfxx-mips.c:15230
 #, c-format
-msgid "Warning: %B uses %s (set by %B), %B uses %s"
+msgid "warning: %pB uses %s (set by %pB), %pB uses %s"
 msgstr ""
 
-#: elfxx-mips.c:15213
+#: elfxx-mips.c:15249
 #, c-format
-msgid "Warning: %B uses %s (set by %B), %B uses unknown MSA ABI %d"
+msgid "warning: %pB uses %s (set by %pB), %pB uses unknown MSA ABI %d"
 msgstr ""
 
-#: elfxx-mips.c:15225
+#: elfxx-mips.c:15261
 #, c-format
-msgid "Warning: %B uses unknown MSA ABI %d (set by %B), %B uses %s"
+msgid "warning: %pB uses unknown MSA ABI %d (set by %pB), %pB uses %s"
 msgstr ""
 
-#: elfxx-mips.c:15234
+#: elfxx-mips.c:15270
 #, c-format
 msgid ""
-"Warning: %B uses unknown MSA ABI %d (set by %B), %B uses unknown MSA ABI %d"
+"warning: %pB uses unknown MSA ABI %d (set by %pB), %pB uses unknown MSA ABI "
+"%d"
 msgstr ""
 
-#: elfxx-mips.c:15296
-msgid "%B: endianness incompatible with that of the selected emulation"
+#: elfxx-mips.c:15332
+#, c-format
+msgid "%pB: endianness incompatible with that of the selected emulation"
 msgstr ""
 
-#: elfxx-mips.c:15310
-msgid "%B: ABI is incompatible with that of the selected emulation"
+#: elfxx-mips.c:15346
+#, c-format
+msgid "%pB: ABI is incompatible with that of the selected emulation"
 msgstr ""
 
-#: elfxx-mips.c:15362
-msgid "%B: warning: Inconsistent ISA between e_flags and .MIPS.abiflags"
+#: elfxx-mips.c:15398
+#, c-format
+msgid "%pB: warning: inconsistent ISA between e_flags and .MIPS.abiflags"
 msgstr ""
 
-#: elfxx-mips.c:15367
+#: elfxx-mips.c:15403
+#, c-format
 msgid ""
-"%B: warning: Inconsistent FP ABI between .gnu.attributes and .MIPS.abiflags"
+"%pB: warning: inconsistent FP ABI between .gnu.attributes and .MIPS.abiflags"
 msgstr ""
 
-#: elfxx-mips.c:15371
-msgid "%B: warning: Inconsistent ASEs between e_flags and .MIPS.abiflags"
+#: elfxx-mips.c:15407
+#, c-format
+msgid "%pB: warning: inconsistent ASEs between e_flags and .MIPS.abiflags"
 msgstr ""
 
-#: elfxx-mips.c:15378
+#: elfxx-mips.c:15414
+#, c-format
 msgid ""
-"%B: warning: Inconsistent ISA extensions between e_flags and .MIPS.abiflags"
+"%pB: warning: inconsistent ISA extensions between e_flags and .MIPS.abiflags"
 msgstr ""
 
-#: elfxx-mips.c:15382
+#: elfxx-mips.c:15418
+#, c-format
 msgid ""
-"%B: warning: Unexpected flag in the flags2 field of .MIPS.abiflags (0x%lx)"
+"%pB: warning: unexpected flag in the flags2 field of .MIPS.abiflags (0x%lx)"
 msgstr ""
 
-#: elfxx-mips.c:15571
+#: elfxx-mips.c:15607
 msgid "-mips32r2 -mfp64 (12 callee-saved)"
 msgstr ""
 
-#: elfxx-mips.c:15621 elfxx-mips.c:15632
+#: elfxx-mips.c:15657 elfxx-mips.c:15668
 msgid "None"
 msgstr ""
 
-#: elfxx-mips.c:15623 elfxx-mips.c:15695
+#: elfxx-mips.c:15659 elfxx-mips.c:15731
 msgid "Unknown"
 msgstr ""
 
-#: elfxx-mips.c:15706
+#: elfxx-mips.c:15742
 #, c-format
 msgid "Hard or soft float\n"
 msgstr ""
 
-#: elfxx-mips.c:15709
+#: elfxx-mips.c:15745
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr ""
 
-#: elfxx-mips.c:15712
+#: elfxx-mips.c:15748
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr ""
 
-#: elfxx-mips.c:15715
+#: elfxx-mips.c:15751
 #, c-format
 msgid "Soft float\n"
 msgstr ""
 
-#: elfxx-mips.c:15718
+#: elfxx-mips.c:15754
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU 12 callee-saved)\n"
 msgstr ""
 
-#: elfxx-mips.c:15721
+#: elfxx-mips.c:15757
 #, c-format
 msgid "Hard float (32-bit CPU, Any FPU)\n"
 msgstr ""
 
-#: elfxx-mips.c:15724
+#: elfxx-mips.c:15760
 #, c-format
 msgid "Hard float (32-bit CPU, 64-bit FPU)\n"
 msgstr ""
 
-#: elfxx-mips.c:15727
+#: elfxx-mips.c:15763
 #, c-format
 msgid "Hard float compat (32-bit CPU, 64-bit FPU)\n"
 msgstr ""
 
-#: elfxx-mips.c:15759
+#: elfxx-mips.c:15795
 #, c-format
 msgid " [abi=O32]"
 msgstr ""
 
-#: elfxx-mips.c:15761
+#: elfxx-mips.c:15797
 #, c-format
 msgid " [abi=O64]"
 msgstr ""
 
-#: elfxx-mips.c:15763
+#: elfxx-mips.c:15799
 #, c-format
 msgid " [abi=EABI32]"
 msgstr ""
 
-#: elfxx-mips.c:15765
+#: elfxx-mips.c:15801
 #, c-format
 msgid " [abi=EABI64]"
 msgstr ""
 
-#: elfxx-mips.c:15767
+#: elfxx-mips.c:15803
 #, c-format
 msgid " [abi unknown]"
 msgstr ""
 
-#: elfxx-mips.c:15769
+#: elfxx-mips.c:15805
 #, c-format
 msgid " [abi=N32]"
 msgstr ""
 
-#: elfxx-mips.c:15771
+#: elfxx-mips.c:15807
 #, c-format
 msgid " [abi=64]"
 msgstr ""
 
-#: elfxx-mips.c:15773
+#: elfxx-mips.c:15809
 #, c-format
 msgid " [no abi set]"
 msgstr ""
 
-#: elfxx-mips.c:15798
+#: elfxx-mips.c:15834
 #, c-format
 msgid " [unknown ISA]"
 msgstr ""
 
-#: elfxx-mips.c:15818
+#: elfxx-mips.c:15854
 #, c-format
 msgid " [not 32bitmode]"
 msgstr ""
 
-#: elfxx-riscv.c:955
+#: elfxx-sparc.c:3115 /work/sources/binutils/current/bfd/elfnn-aarch64.c:5283
 #, c-format
-msgid "unrecognized relocation (0x%x)"
-msgstr ""
-
-#: elfxx-sparc.c:639
-#, c-format
-msgid "invalid relocation type %d"
-msgstr ""
-
-#: elfxx-sparc.c:3129 /work/sources/binutils/current/bfd/elfnn-aarch64.c:5024
-#, c-format
-msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
+msgid ""
+"%pB: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
 msgstr ""
 
-#: elfxx-tilegx.c:4241
+#: elfxx-tilegx.c:4254
 #, c-format
-msgid "%B: Cannot link together %s and %s objects."
+msgid "%pB: cannot link together %s and %s objects"
 msgstr ""
 
-#: elfxx-x86.c:570
+#: elfxx-x86.c:578
 #, c-format
-msgid "%P: %B: warning: relocation against `%s' in read-only section `%A'\n"
+msgid "%P: %pB: warning: relocation against `%s' in read-only section `%pA'\n"
 msgstr ""
 
-#: elfxx-x86.c:954
-msgid "%P: %B: warning: relocation in read-only section `%A'\n"
+#: elfxx-x86.c:973
+msgid "%P: %pB: warning: relocation in read-only section `%pA'\n"
 msgstr ""
 
-#: elfxx-x86.c:1287
+#: elfxx-x86.c:1321
 msgid ""
 "%P%X: read-only segment has dynamic IFUNC relocations; recompile with -fPIC\n"
 msgstr ""
 
-#: elfxx-x86.c:2241
-msgid "error: %B: <corrupt x86 ISA used size: 0x%x>"
+#: elfxx-x86.c:2275
+#, c-format
+msgid "error: %pB: <corrupt x86 ISA used size: 0x%x>"
 msgstr ""
 
-#: elfxx-x86.c:2243
-msgid "error: %B: <corrupt x86 ISA needed size: 0x%x>"
+#: elfxx-x86.c:2277
+#, c-format
+msgid "error: %pB: <corrupt x86 ISA needed size: 0x%x>"
 msgstr ""
 
-#: elfxx-x86.c:2244
-msgid "error: %B: <corrupt x86 feature size: 0x%x>"
+#: elfxx-x86.c:2278
+#, c-format
+msgid "error: %pB: <corrupt x86 feature size: 0x%x>"
 msgstr ""
 
-#: elfxx-x86.c:2416
+#: elfxx-x86.c:2450
 msgid "%F%P: failed to create GNU property section\n"
 msgstr ""
 
-#: elfxx-x86.c:2421
+#: elfxx-x86.c:2455
 #, c-format
-msgid "%F%A: failed to align section\n"
+msgid "%F%pA: failed to align section\n"
 msgstr ""
 
-#: elfxx-x86.c:2571
+#: elfxx-x86.c:2607
 msgid "%F%P: failed to create VxWorks dynamic sections\n"
 msgstr ""
 
-#: elfxx-x86.c:2580
+#: elfxx-x86.c:2616
 msgid "%F%P: failed to create GOT sections\n"
 msgstr ""
 
-#: elfxx-x86.c:2598
+#: elfxx-x86.c:2634
 msgid "%F%P: failed to create ifunc sections\n"
 msgstr ""
 
-#: elfxx-x86.c:2639
+#: elfxx-x86.c:2675
 msgid "%F%P: failed to create GOT PLT section\n"
 msgstr ""
 
-#: elfxx-x86.c:2660
+#: elfxx-x86.c:2696
 msgid "%F%P: failed to create IBT-enabled PLT section\n"
 msgstr ""
 
-#: elfxx-x86.c:2675
+#: elfxx-x86.c:2711
 msgid "%F%P: failed to create BND PLT section\n"
 msgstr ""
 
-#: elfxx-x86.c:2696
+#: elfxx-x86.c:2732
 msgid "%F%P: failed to create PLT .eh_frame section\n"
 msgstr ""
 
-#: elfxx-x86.c:2709
+#: elfxx-x86.c:2745
 msgid "%F%P: failed to create GOT PLT .eh_frame section\n"
 msgstr ""
 
-#: elfxx-x86.c:2723
+#: elfxx-x86.c:2759
 msgid "%F%P: failed to create the second PLT .eh_frame section\n"
 msgstr ""
 
-#: i386linux.c:416 m68klinux.c:419 sparclinux.c:412
-#, c-format
-msgid "Output file requires shared library `%s'\n"
-msgstr ""
-
-#: i386linux.c:424 m68klinux.c:428 sparclinux.c:421
-#, c-format
-msgid "Output file requires shared library `%s.so.%s'\n"
-msgstr ""
-
-#: i386linux.c:611 i386linux.c:661 m68klinux.c:617 m68klinux.c:665
-#: sparclinux.c:608 sparclinux.c:658
-#, c-format
-msgid "Symbol %s not defined for fixups\n"
-msgstr ""
-
-#: i386linux.c:685 m68klinux.c:689 sparclinux.c:682
-msgid "Warning: fixup count mismatch\n"
-msgstr ""
-
-#: ieee.c:159
-#, c-format
-msgid "%B: string too long (%ld chars, max 65535)"
-msgstr ""
-
-#: ieee.c:226
-#, c-format
-msgid "IEEE parser: string length: %#lx longer than buffer: %#lx"
-msgstr ""
-
-#: ieee.c:302
-#, c-format
-msgid "%B: unrecognized symbol `%s' flags 0x%x"
-msgstr ""
-
-#: ieee.c:837
-#, c-format
-msgid "%B: unimplemented ATI record %u for symbol %u"
-msgstr ""
-
-#: ieee.c:862
-#, c-format
-msgid "%B: unexpected ATN type %Ld in external part"
-msgstr ""
-
-#: ieee.c:884
-msgid "%B: unexpected type after ATN"
-msgstr ""
-
 #: ihex.c:230
 #, c-format
-msgid "%B:%d: unexpected character `%s' in Intel Hex file"
+msgid "%pB:%d: unexpected character `%s' in Intel Hex file"
 msgstr ""
 
 #: ihex.c:338
 #, c-format
-msgid "%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"
+msgid "%pB:%u: bad checksum in Intel Hex file (expected %u, found %u)"
 msgstr ""
 
 #: ihex.c:394
 #, c-format
-msgid "%B:%u: bad extended address record length in Intel Hex file"
+msgid "%pB:%u: bad extended address record length in Intel Hex file"
 msgstr ""
 
 #: ihex.c:412
 #, c-format
-msgid "%B:%u: bad extended start address length in Intel Hex file"
+msgid "%pB:%u: bad extended start address length in Intel Hex file"
 msgstr ""
 
 #: ihex.c:430
 #, c-format
-msgid "%B:%u: bad extended linear address record length in Intel Hex file"
+msgid "%pB:%u: bad extended linear address record length in Intel Hex file"
 msgstr ""
 
 #: ihex.c:448
 #, c-format
-msgid "%B:%u: bad extended linear start address length in Intel Hex file"
+msgid "%pB:%u: bad extended linear start address length in Intel Hex file"
 msgstr ""
 
 #: ihex.c:466
 #, c-format
-msgid "%B:%u: unrecognized ihex type %u in Intel Hex file"
+msgid "%pB:%u: unrecognized ihex type %u in Intel Hex file"
 msgstr ""
 
 #: ihex.c:585
-msgid "%B: internal error in ihex_read_section"
+#, c-format
+msgid "%pB: internal error in ihex_read_section"
 msgstr ""
 
 #: ihex.c:619
-msgid "%B: bad section length in ihex_read_section"
+#, c-format
+msgid "%pB: bad section length in ihex_read_section"
 msgstr ""
 
 #: ihex.c:830
 #, c-format
-msgid "%B: address %#Lx out of range for Intel Hex file"
+msgid "%pB: address %#<PRIx64> out of range for Intel Hex file"
 msgstr ""
 
-#: libbfd.c:799
+#: libbfd.c:877
 #, c-format
-msgid "%B: unable to get decompressed section %A"
+msgid "%pB: unable to get decompressed section %pA"
 msgstr ""
 
-#: libbfd.c:963
+#: libbfd.c:1041
 #, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
 msgstr ""
 
-#: libbfd.c:966
+#: libbfd.c:1044
 #, c-format
 msgid "Deprecated %s called\n"
 msgstr ""
 
-#: linker.c:1678
+#: linker.c:1684
 #, c-format
-msgid "%B: indirect symbol `%s' to `%s' is a loop"
+msgid "%pB: indirect symbol `%s' to `%s' is a loop"
 msgstr ""
 
-#: linker.c:2548
+#: linker.c:2554
 #, c-format
-msgid "Attempt to do relocatable link with %s input and %s output"
+msgid "attempt to do relocatable link with %s input and %s output"
 msgstr ""
 
-#: linker.c:2834
+#: linker.c:2840
 #, c-format
-msgid "%B: ignoring duplicate section `%A'\n"
+msgid "%pB: ignoring duplicate section `%pA'\n"
 msgstr ""
 
-#: linker.c:2844 linker.c:2854
+#: linker.c:2850 linker.c:2860
 #, c-format
-msgid "%B: duplicate section `%A' has different size\n"
+msgid "%pB: duplicate section `%pA' has different size\n"
 msgstr ""
 
-#: linker.c:2863 linker.c:2869
+#: linker.c:2869 linker.c:2875
 #, c-format
-msgid "%B: could not read contents of section `%A'\n"
+msgid "%pB: could not read contents of section `%pA'\n"
 msgstr ""
 
-#: linker.c:2874
+#: linker.c:2880
 #, c-format
-msgid "%B: duplicate section `%A' has different contents\n"
+msgid "%pB: duplicate section `%pA' has different contents\n"
 msgstr ""
 
-#: linker.c:3362
-msgid "%B: compiled for a big endian system and target is little endian"
+#: linker.c:3368
+#, c-format
+msgid "%pB: compiled for a big endian system and target is little endian"
 msgstr ""
 
-#: linker.c:3365
-msgid "%B: compiled for a little endian system and target is big endian"
+#: linker.c:3371
+#, c-format
+msgid "%pB: compiled for a little endian system and target is big endian"
 msgstr ""
 
 #: mach-o.c:779
 msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
 msgstr ""
 
-#: mach-o.c:1981
+#: mach-o.c:1975
 msgid ""
 "sorry: modtab, toc and extrefsyms are not yet implemented for dysymtab "
 "commands."
 msgstr ""
 
-#: mach-o.c:2424
+#: mach-o.c:2418
 #, c-format
 msgid "mach-o: there are too many sections (%u) maximum is 255,\n"
 msgstr ""
 
-#: mach-o.c:2531
+#: mach-o.c:2525
 #, c-format
 msgid "unable to allocate data for load command %#x"
 msgstr ""
 
-#: mach-o.c:2636
+#: mach-o.c:2630
 #, c-format
 msgid "unable to write unknown load command %#x"
 msgstr ""
 
-#: mach-o.c:2820
+#: mach-o.c:2814
 #, c-format
-msgid "section address (%#Lx) below start of segment (%#Lx)"
+msgid "section address (%#<PRIx64>) below start of segment (%#<PRIx64>)"
 msgstr ""
 
-#: mach-o.c:2961
+#: mach-o.c:2956
 #, c-format
 msgid "unable to layout unknown load command %#x"
 msgstr ""
 
-#: mach-o.c:3497
+#: mach-o.c:3492
 #, c-format
 msgid ""
 "bfd_mach_o_read_section_32: overlarge alignment value: %#lx, using 32 instead"
 msgstr ""
 
-#: mach-o.c:3540
+#: mach-o.c:3535
 #, c-format
 msgid ""
 "bfd_mach_o_read_section_64: overlarge alignment value: %#lx, using 32 instead"
 msgstr ""
 
-#: mach-o.c:3591
+#: mach-o.c:3586
 #, c-format
 msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %u"
 msgstr ""
 
-#: mach-o.c:3610
+#: mach-o.c:3605
 #, c-format
 msgid "bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %u)"
 msgstr ""
 
-#: mach-o.c:3693
+#: mach-o.c:3688
 #, c-format
 msgid ""
 "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d "
 "(max %lu): setting to undefined"
 msgstr ""
 
-#: mach-o.c:3712
+#: mach-o.c:3707
 #, c-format
 msgid ""
 "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x"
 "%x: setting to undefined"
 msgstr ""
 
-#: mach-o.c:3789
+#: mach-o.c:3784
 msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
 msgstr ""
 
-#: mach-o.c:4762
-msgid "%B: unknown load command %#x"
+#: mach-o.c:4757
+#, c-format
+msgid "%pB: unknown load command %#x"
 msgstr ""
 
-#: mach-o.c:4953
+#: mach-o.c:4948
 #, c-format
 msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
 msgstr ""
 
-#: mach-o.c:5058
+#: mach-o.c:5053
 #, c-format
 msgid "unknown header byte-order value %#x"
 msgstr ""
 
 #: merge.c:868
 #, c-format
-msgid "%B: access beyond end of merged section (%Ld)"
+msgid "%pB: access beyond end of merged section (%<PRId64>)"
 msgstr ""
 
 #: mmo.c:468
 #, c-format
-msgid "%B: No core to allocate section name %s\n"
+msgid "%pB: no core to allocate section name %s"
 msgstr ""
 
 #: mmo.c:544
 #, c-format
-msgid "%B: No core to allocate a symbol %d bytes long\n"
+msgid "%pB: no core to allocate a symbol %d bytes long"
 msgstr ""
 
 #: mmo.c:958
 #, c-format
-msgid "%B: attempt to emit contents at non-multiple-of-4 address %#Lx"
+msgid "%pB: attempt to emit contents at non-multiple-of-4 address %#<PRIx64>"
 msgstr ""
 
 #: mmo.c:1255
-msgid "%B: invalid mmo file: initialization value for $255 is not `Main'\n"
+#, c-format
+msgid "%pB: invalid mmo file: initialization value for $255 is not `Main'\n"
 msgstr ""
 
 #: mmo.c:1402
 #, c-format
 msgid ""
-"%B: unsupported wide character sequence 0x%02X 0x%02X after symbol name "
+"%pB: unsupported wide character sequence 0x%02X 0x%02X after symbol name "
 "starting with `%s'\n"
 msgstr ""
 
 #: mmo.c:1636
 #, c-format
-msgid "%B: invalid mmo file: unsupported lopcode `%d'\n"
+msgid "%pB: invalid mmo file: unsupported lopcode `%d'\n"
 msgstr ""
 
 #: mmo.c:1647
 #, c-format
-msgid "%B: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"
+msgid "%pB: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"
 msgstr ""
 
 #: mmo.c:1685
 #, c-format
-msgid "%B: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"
+msgid ""
+"%pB: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"
 msgstr ""
 
 #: mmo.c:1736
 #, c-format
 msgid ""
-"%B: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"
+"%pB: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"
 msgstr ""
 
 #: mmo.c:1777
 #, c-format
-msgid "%B: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"
+msgid "%pB: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"
 msgstr ""
 
 #: mmo.c:1788
 #, c-format
 msgid ""
-"%B: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"
+"%pB: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"
 msgstr ""
 
 #: mmo.c:1813
 #, c-format
 msgid ""
-"%B: invalid mmo file: leading byte of operand word must be 0 or 1, got %d "
+"%pB: invalid mmo file: leading byte of operand word must be 0 or 1, got %d "
 "for lop_fixrx\n"
 msgstr ""
 
 #: mmo.c:1838
 #, c-format
-msgid "%B: cannot allocate file name for file number %d, %d bytes\n"
+msgid "%pB: cannot allocate file name for file number %d, %d bytes\n"
 msgstr ""
 
 #: mmo.c:1860
 #, c-format
 msgid ""
-"%B: invalid mmo file: file number %d `%s', was already entered as `%s'\n"
+"%pB: invalid mmo file: file number %d `%s', was already entered as `%s'\n"
 msgstr ""
 
 #: mmo.c:1874
 #, c-format
 msgid ""
-"%B: invalid mmo file: file name for number %d was not specified before use\n"
+"%pB: invalid mmo file: file name for number %d was not specified before use\n"
 msgstr ""
 
 #: mmo.c:1981
 #, c-format
 msgid ""
-"%B: invalid mmo file: fields y and z of lop_stab non-zero, y: %d, z: %d\n"
+"%pB: invalid mmo file: fields y and z of lop_stab non-zero, y: %d, z: %d\n"
 msgstr ""
 
 #: mmo.c:2018
 #, c-format
-msgid "%B: invalid mmo file: lop_end not last item in file\n"
+msgid "%pB: invalid mmo file: lop_end not last item in file\n"
 msgstr ""
 
 #: mmo.c:2032
 #, c-format
 msgid ""
-"%B: invalid mmo file: YZ of lop_end (%ld) not equal to the number of tetras "
+"%pB: invalid mmo file: YZ of lop_end (%ld) not equal to the number of tetras "
 "to the preceding lop_stab (%ld)\n"
 msgstr ""
 
 #: mmo.c:2743
 #, c-format
-msgid "%B: invalid symbol table: duplicate symbol `%s'\n"
+msgid "%pB: invalid symbol table: duplicate symbol `%s'\n"
 msgstr ""
 
 #: mmo.c:2986
 #, c-format
 msgid ""
-"%B: Bad symbol definition: `Main' set to %s rather than the start address "
+"%pB: bad symbol definition: `Main' set to %s rather than the start address "
 "%s\n"
 msgstr ""
 
 #: mmo.c:3085
 #, c-format
 msgid ""
-"%B: warning: symbol table too large for mmo, larger than 65535 32-bit words: "
-"%d.  Only `Main' will be emitted.\n"
+"%pB: warning: symbol table too large for mmo, larger than 65535 32-bit "
+"words: %d.  Only `Main' will be emitted.\n"
 msgstr ""
 
 #: mmo.c:3131
 #, c-format
-msgid "%B: internal error, symbol table changed size from %d to %d words\n"
+msgid "%pB: internal error, symbol table changed size from %d to %d words\n"
 msgstr ""
 
 #: mmo.c:3184
 #, c-format
-msgid "%B: internal error, internal register section %A had contents\n"
+msgid "%pB: internal error, internal register section %pA had contents\n"
 msgstr ""
 
 #: mmo.c:3235
-msgid "%B: no initialized registers; section length 0\n"
+#, c-format
+msgid "%pB: no initialized registers; section length 0\n"
 msgstr ""
 
 #: mmo.c:3242
 #, c-format
-msgid "%B: too many initialized registers; section length %Ld"
+msgid "%pB: too many initialized registers; section length %<PRId64>"
 msgstr ""
 
 #: mmo.c:3247
 #, c-format
-msgid "%B: invalid start address for initialized registers of length %Ld: %#Lx"
-msgstr ""
-
-#: oasys.c:881
-#, c-format
-msgid "%B: can not represent section `%A' in oasys"
+msgid ""
+"%pB: invalid start address for initialized registers of length %<PRId64>: "
+"%#<PRIx64>"
 msgstr ""
 
 #: osf-core.c:127
 #, c-format
-msgid "Unhandled OSF/1 core file section type %d\n"
+msgid "unhandled OSF/1 core file section type %d"
 msgstr ""
 
-#: pe-mips.c:609
-msgid "%B: `ld -r' not supported with PE MIPS objects\n"
-msgstr ""
-
-#. OK, at this point the following variables are set up:
-#. src = VMA of the memory we're fixing up
-#. mem = pointer to memory we're fixing up
-#. val = VMA of what we need to refer to.
-#: pe-mips.c:720
+#: pef.c:526
 #, c-format
-msgid "%B: unimplemented %s\n"
-msgstr ""
-
-#: pe-mips.c:746
-msgid "%B: jump too far away\n"
-msgstr ""
-
-#: pe-mips.c:772
-msgid "%B: bad pair/reflo after refhi\n"
+msgid "bfd_pef_scan: unknown architecture 0x%lx"
 msgstr ""
 
-#: pef.c:526
+#: pei-x86_64.c:177 pei-x86_64.c:191 pei-x86_64.c:220
 #, c-format
-msgid "bfd_pef_scan: unknown architecture 0x%lx"
+msgid "warning: corrupt unwind data\n"
 msgstr ""
 
 #. PR 17512: file: 2245-7442-0.004.
-#: pei-x86_64.c:281
+#: pei-x86_64.c:315
 #, c-format
 msgid "Unknown: %x"
 msgstr ""
 
-#: pei-x86_64.c:331
+#: pei-x86_64.c:365 pei-x86_64.c:375 pei-x86_64.c:384
 #, c-format
 msgid "warning: xdata section corrupt\n"
 msgstr ""
 
-#: pei-x86_64.c:341
-#, c-format
-msgid "warning: xdata section corrupt"
-msgstr ""
-
-#: pei-x86_64.c:401
+#: pei-x86_64.c:439
 #, c-format
 msgid "Too many unwind codes (%ld)\n"
 msgstr ""
 
-#: pei-x86_64.c:491
+#: pei-x86_64.c:529
 #, c-format
 msgid "Warning: %s section size (%ld) is not a multiple of %d\n"
 msgstr ""
 
-#: pei-x86_64.c:498
+#: pei-x86_64.c:536
 #, c-format
 msgid "Warning: %s section size is zero\n"
 msgstr ""
 
-#: pei-x86_64.c:513
+#: pei-x86_64.c:551
 #, c-format
 msgid "Warning: %s section size (%ld) is smaller than virtual size (%ld)\n"
 msgstr ""
 
-#: pei-x86_64.c:522
+#: pei-x86_64.c:560
 #, c-format
 msgid ""
 "\n"
 "The Function Table (interpreted %s section contents)\n"
 msgstr ""
 
-#: pei-x86_64.c:525
+#: pei-x86_64.c:563
 #, c-format
 msgid "vma:\t\t\tBeginAddress\t EndAddress\t  UnwindData\n"
 msgstr ""
 
-#: pei-x86_64.c:654
+#: pei-x86_64.c:692
 #, c-format
 msgid ""
 "\n"
@@ -5931,124 +5590,128 @@ msgstr ""
 #. XXX code yet to be written.
 #: peicode.h:775
 #, c-format
-msgid "%B: Unhandled import type; %x"
+msgid "%pB: unhandled import type; %x"
 msgstr ""
 
 #: peicode.h:781
 #, c-format
-msgid "%B: Unrecognised import type; %x"
+msgid "%pB: unrecognized import type; %x"
 msgstr ""
 
 #: peicode.h:796
 #, c-format
-msgid "%B: Unrecognised import name type; %x"
+msgid "%pB: unrecognized import name type; %x"
 msgstr ""
 
-#: peicode.h:1217
+#: peicode.h:1211
 #, c-format
-msgid "%B: Unrecognised machine type (0x%x) in Import Library Format archive"
+msgid "%pB: unrecognised machine type (0x%x) in Import Library Format archive"
 msgstr ""
 
-#: peicode.h:1230
+#: peicode.h:1224
 #, c-format
 msgid ""
-"%B: Recognised but unhandled machine type (0x%x) in Import Library Format "
+"%pB: recognised but unhandled machine type (0x%x) in Import Library Format "
 "archive"
 msgstr ""
 
-#: peicode.h:1248
-msgid "%B: size field is zero in Import Library Format header"
+#: peicode.h:1242
+#, c-format
+msgid "%pB: size field is zero in Import Library Format header"
 msgstr ""
 
-#: peicode.h:1280
-msgid "%B: string not null terminated in ILF object file."
+#: peicode.h:1274
+#, c-format
+msgid "%pB: string not null terminated in ILF object file"
 msgstr ""
 
-#: peicode.h:1335
-msgid "%B: Error: Debug Data ends beyond end of debug directory."
+#: peicode.h:1330
+#, c-format
+msgid "%pB: error: debug data ends beyond end of debug directory"
 msgstr ""
 
-#: ppcboot.c:393
+#: ppcboot.c:392
 #, c-format
 msgid ""
 "\n"
 "ppcboot header:\n"
 msgstr ""
 
-#: ppcboot.c:394
+#: ppcboot.c:393
 #, c-format
 msgid "Entry offset        = 0x%.8lx (%ld)\n"
 msgstr ""
 
-#: ppcboot.c:396
+#: ppcboot.c:395
 #, c-format
 msgid "Length              = 0x%.8lx (%ld)\n"
 msgstr ""
 
-#: ppcboot.c:400
+#: ppcboot.c:399
 #, c-format
 msgid "Flag field          = 0x%.2x\n"
 msgstr ""
 
-#: ppcboot.c:406
+#: ppcboot.c:405
 #, c-format
 msgid "Partition name      = \"%s\"\n"
 msgstr ""
 
-#: ppcboot.c:426
+#: ppcboot.c:425
 #, c-format
 msgid ""
 "\n"
 "Partition[%d] start  = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"
 msgstr ""
 
-#: ppcboot.c:433
+#: ppcboot.c:432
 #, c-format
 msgid "Partition[%d] end    = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"
 msgstr ""
 
-#: ppcboot.c:440
+#: ppcboot.c:439
 #, c-format
 msgid "Partition[%d] sector = 0x%.8lx (%ld)\n"
 msgstr ""
 
-#: ppcboot.c:444
+#: ppcboot.c:443
 #, c-format
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr ""
 
-#: reloc.c:8106
-msgid "INPUT_SECTION_FLAGS are not supported.\n"
+#: reloc.c:8125
+msgid "INPUT_SECTION_FLAGS are not supported"
 msgstr ""
 
-#: reloc.c:8207
+#: reloc.c:8226
 #, c-format
-msgid "%X%P: %B(%A): error: relocation for offset %V has no value\n"
+msgid "%X%P: %pB(%pA): error: relocation for offset %V has no value\n"
 msgstr ""
 
-#: reloc.c:8283
+#: reloc.c:8302
 #, c-format
-msgid "%X%P: %B(%A): relocation \"%R\" is not supported\n"
+msgid "%X%P: %pB(%pA): relocation \"%pR\" is not supported\n"
 msgstr ""
 
-#: reloc.c:8292
+#: reloc.c:8311
 #, c-format
-msgid "%X%P: %B(%A): relocation \"%R\" returns an unrecognized value %x\n"
+msgid "%X%P: %pB(%pA): relocation \"%pR\" returns an unrecognized value %x\n"
 msgstr ""
 
-#: reloc.c:8354
+#: reloc.c:8373
 #, c-format
-msgid "%B: unrecognized relocation (%#x) in section `%A'"
+msgid "%pB: unrecognized relocation type %#x in section `%pA'"
 msgstr ""
 
 #. PR 21803: Suggest the most likely cause of this error.
-#: reloc.c:8358
+#: reloc.c:8377
 #, c-format
-msgid "Is this version of the linker - %s - out of date ?"
+msgid "is this version of the linker - %s - out of date ?"
 msgstr ""
 
 #: rs6000-core.c:471
-msgid "%B: warning core file truncated"
+#, c-format
+msgid "%pB: warning core file truncated"
 msgstr ""
 
 #: som.c:5478
@@ -6064,91 +5727,91 @@ msgstr ""
 
 #: srec.c:260
 #, c-format
-msgid "%B:%d: Unexpected character `%s' in S-record file\n"
+msgid "%pB:%d: unexpected character `%s' in S-record file"
 msgstr ""
 
 #: srec.c:488
 #, c-format
-msgid "%B:%d: byte count %d too small\n"
+msgid "%pB:%d: byte count %d too small"
 msgstr ""
 
 #: srec.c:581 srec.c:615
 #, c-format
-msgid "%B:%d: Bad checksum in S-record file\n"
+msgid "%pB:%d: bad checksum in S-record file"
 msgstr ""
 
 #: stabs.c:279
 #, c-format
-msgid "%B(%A+%#lx): Stabs entry has invalid string index."
+msgid "%pB(%pA+%#lx): stabs entry has invalid string index"
 msgstr ""
 
 #: syms.c:1079
-msgid "Unsupported .stab relocation"
+msgid "unsupported .stab relocation"
 msgstr ""
 
 #: vms-alpha.c:479
-msgid "Corrupt EIHD record - size is too small"
+msgid "corrupt EIHD record - size is too small"
 msgstr ""
 
 #: vms-alpha.c:660
 #, c-format
-msgid "Unable to read EIHS record at offset %#x"
+msgid "unable to read EIHS record at offset %#x"
 msgstr ""
 
-#: vms-alpha.c:1172
+#: vms-alpha.c:1173
 #, c-format
-msgid "Corrupt EGSD record: its size (%#x) is too small"
+msgid "corrupt EGSD record: its size (%#x) is too small"
 msgstr ""
 
-#: vms-alpha.c:1196
+#: vms-alpha.c:1197
 #, c-format
-msgid "Corrupt EGSD record: size (%#x) is larger than remaining space (%#x)"
+msgid "corrupt EGSD record: size (%#x) is larger than remaining space (%#x)"
 msgstr ""
 
-#: vms-alpha.c:1204
+#: vms-alpha.c:1205
 #, c-format
-msgid "Corrupt EGSD record: size (%#x) is too small"
+msgid "corrupt EGSD record: size (%#x) is too small"
 msgstr ""
 
-#: vms-alpha.c:1333 vms-alpha.c:1349 vms-alpha.c:1389
+#: vms-alpha.c:1334 vms-alpha.c:1350 vms-alpha.c:1390
 #, c-format
-msgid "Corrupt EGSD record: its psindx field is too big (%#lx)"
+msgid "corrupt EGSD record: its psindx field is too big (%#lx)"
 msgstr ""
 
-#: vms-alpha.c:1418
+#: vms-alpha.c:1419
 #, c-format
-msgid "Unknown EGSD subtype %d"
+msgid "unknown EGSD subtype %d"
 msgstr ""
 
-#: vms-alpha.c:1451
+#: vms-alpha.c:1452
 #, c-format
-msgid "Stack overflow (%d) in _bfd_vms_push"
+msgid "stack overflow (%d) in _bfd_vms_push"
 msgstr ""
 
-#: vms-alpha.c:1464
-msgid "Stack underflow in _bfd_vms_pop"
+#: vms-alpha.c:1465
+msgid "stack underflow in _bfd_vms_pop"
 msgstr ""
 
 #. These names have not yet been added to this switch statement.
-#: vms-alpha.c:1706
+#: vms-alpha.c:1707
 #, c-format
 msgid "unknown ETIR command %d"
 msgstr ""
 
-#: vms-alpha.c:1737
-msgid "Corrupt vms value"
+#: vms-alpha.c:1738
+msgid "corrupt vms value"
 msgstr ""
 
-#: vms-alpha.c:1865
-msgid "Corrupt ETIR record encountered"
+#: vms-alpha.c:1866
+msgid "corrupt ETIR record encountered"
 msgstr ""
 
-#: vms-alpha.c:1922
+#: vms-alpha.c:1923
 #, c-format
 msgid "bad section index in %s"
 msgstr ""
 
-#: vms-alpha.c:1935
+#: vms-alpha.c:1936
 #, c-format
 msgid "unsupported STA cmd %s"
 msgstr ""
@@ -6158,1961 +5821,1932 @@ msgstr ""
 #. Rotate.
 #. Redefine symbol to current location.
 #. Define a literal.
-#: vms-alpha.c:2115 vms-alpha.c:2146 vms-alpha.c:2237 vms-alpha.c:2395
+#: vms-alpha.c:2116 vms-alpha.c:2147 vms-alpha.c:2238 vms-alpha.c:2396
 #, c-format
 msgid "%s: not supported"
 msgstr ""
 
-#: vms-alpha.c:2121
+#: vms-alpha.c:2122
 #, c-format
 msgid "%s: not implemented"
 msgstr ""
 
-#: vms-alpha.c:2379
+#: vms-alpha.c:2380
 #, c-format
 msgid "invalid use of %s with contexts"
 msgstr ""
 
-#: vms-alpha.c:2413
+#: vms-alpha.c:2414
 #, c-format
 msgid "reserved cmd %d"
 msgstr ""
 
-#: vms-alpha.c:2497
-msgid "Corrupt EEOM record - size is too small"
+#: vms-alpha.c:2498
+msgid "corrupt EEOM record - size is too small"
 msgstr ""
 
-#: vms-alpha.c:2506
-msgid "Object module NOT error-free !\n"
+#: vms-alpha.c:2507
+msgid "object module not error-free !"
 msgstr ""
 
-#: vms-alpha.c:3830
+#: vms-alpha.c:3831
 #, c-format
-msgid "SEC_RELOC with no relocs in section %A"
+msgid "SEC_RELOC with no relocs in section %pA"
 msgstr ""
 
-#: vms-alpha.c:3882 vms-alpha.c:4095
+#: vms-alpha.c:3883 vms-alpha.c:4096
 #, c-format
-msgid "Size error in section %A"
+msgid "size error in section %pA"
 msgstr ""
 
-#: vms-alpha.c:4041
-msgid "Spurious ALPHA_R_BSR reloc"
+#: vms-alpha.c:4042
+msgid "spurious ALPHA_R_BSR reloc"
 msgstr ""
 
-#: vms-alpha.c:4082
+#: vms-alpha.c:4083
 #, c-format
-msgid "Unhandled relocation %s"
+msgid "unhandled relocation %s"
 msgstr ""
 
-#: vms-alpha.c:4375
+#: vms-alpha.c:4376
 #, c-format
 msgid "unknown source command %d"
 msgstr ""
 
-#: vms-alpha.c:4436
-msgid "DST__K_SET_LINUM_INCR not implemented"
-msgstr ""
-
-#: vms-alpha.c:4442
-msgid "DST__K_SET_LINUM_INCR_W not implemented"
-msgstr ""
-
-#: vms-alpha.c:4448
-msgid "DST__K_RESET_LINUM_INCR not implemented"
-msgstr ""
-
-#: vms-alpha.c:4454
-msgid "DST__K_BEG_STMT_MODE not implemented"
-msgstr ""
-
-#: vms-alpha.c:4460
-msgid "DST__K_END_STMT_MODE not implemented"
-msgstr ""
-
-#: vms-alpha.c:4487
-msgid "DST__K_SET_PC not implemented"
-msgstr ""
-
-#: vms-alpha.c:4493
-msgid "DST__K_SET_PC_W not implemented"
-msgstr ""
-
-#: vms-alpha.c:4499
-msgid "DST__K_SET_PC_L not implemented"
-msgstr ""
-
-#: vms-alpha.c:4505
-msgid "DST__K_SET_STMTNUM not implemented"
+#: vms-alpha.c:4437 vms-alpha.c:4443 vms-alpha.c:4449 vms-alpha.c:4455
+#: vms-alpha.c:4461 vms-alpha.c:4488 vms-alpha.c:4494 vms-alpha.c:4500
+#: vms-alpha.c:4506
+#, c-format
+msgid "%s not implemented"
 msgstr ""
 
-#: vms-alpha.c:4548
+#: vms-alpha.c:4549
 #, c-format
 msgid "unknown line command %d"
 msgstr ""
 
-#: vms-alpha.c:5008 vms-alpha.c:5026 vms-alpha.c:5041 vms-alpha.c:5057
-#: vms-alpha.c:5070 vms-alpha.c:5082 vms-alpha.c:5095
+#: vms-alpha.c:5009 vms-alpha.c:5027 vms-alpha.c:5042 vms-alpha.c:5058
+#: vms-alpha.c:5071 vms-alpha.c:5083 vms-alpha.c:5096
 #, c-format
-msgid "Unknown reloc %s + %s"
+msgid "unknown reloc %s + %s"
 msgstr ""
 
-#: vms-alpha.c:5150
+#: vms-alpha.c:5151
 #, c-format
-msgid "Unknown reloc %s"
+msgid "unknown reloc %s"
 msgstr ""
 
-#: vms-alpha.c:5163
-msgid "Invalid section index in ETIR"
+#: vms-alpha.c:5164
+msgid "invalid section index in ETIR"
 msgstr ""
 
-#: vms-alpha.c:5172
-msgid "Relocation for non-REL psect"
+#: vms-alpha.c:5173
+msgid "relocation for non-REL psect"
 msgstr ""
 
-#: vms-alpha.c:5219
+#: vms-alpha.c:5220
 #, c-format
-msgid "Unknown symbol in command %s"
+msgid "unknown symbol in command %s"
 msgstr ""
 
-#: vms-alpha.c:5629
+#: vms-alpha.c:5630
 #, c-format
 msgid "reloc (%d) is *UNKNOWN*"
 msgstr ""
 
-#: vms-alpha.c:5745
+#: vms-alpha.c:5746
 #, c-format
 msgid "  EMH %u (len=%u): "
 msgstr ""
 
-#: vms-alpha.c:5750
+#: vms-alpha.c:5751
 #, c-format
 msgid "   Error: The length is less than the length of an EMH record\n"
 msgstr ""
 
-#: vms-alpha.c:5767
+#: vms-alpha.c:5768
 #, c-format
 msgid ""
 "   Error: The record length is less than the size of an EMH_MHD record\n"
 msgstr ""
 
-#: vms-alpha.c:5770
+#: vms-alpha.c:5771
 #, c-format
 msgid "Module header\n"
 msgstr ""
 
-#: vms-alpha.c:5771
+#: vms-alpha.c:5772
 #, c-format
 msgid "   structure level: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5772
+#: vms-alpha.c:5773
 #, c-format
 msgid "   max record size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5778
+#: vms-alpha.c:5779
 #, c-format
 msgid "   Error: The module name is missing\n"
 msgstr ""
 
-#: vms-alpha.c:5784
+#: vms-alpha.c:5785
 #, c-format
 msgid "   Error: The module name is too long\n"
 msgstr ""
 
-#: vms-alpha.c:5787
+#: vms-alpha.c:5788
 #, c-format
 msgid "   module name    : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5791
+#: vms-alpha.c:5792
 #, c-format
 msgid "   Error: The module version is missing\n"
 msgstr ""
 
-#: vms-alpha.c:5797
+#: vms-alpha.c:5798
 #, c-format
 msgid "   Error: The module version is too long\n"
 msgstr ""
 
-#: vms-alpha.c:5800
+#: vms-alpha.c:5801
 #, c-format
 msgid "   module version : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5803
+#: vms-alpha.c:5804
 #, c-format
 msgid "   Error: The compile date is truncated\n"
 msgstr ""
 
-#: vms-alpha.c:5805
+#: vms-alpha.c:5806
 #, c-format
 msgid "   compile date   : %.17s\n"
 msgstr ""
 
-#: vms-alpha.c:5810
+#: vms-alpha.c:5811
 #, c-format
 msgid "Language Processor Name\n"
 msgstr ""
 
-#: vms-alpha.c:5811
+#: vms-alpha.c:5812
 #, c-format
 msgid "   language name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5815
+#: vms-alpha.c:5816
 #, c-format
 msgid "Source Files Header\n"
 msgstr ""
 
-#: vms-alpha.c:5816
+#: vms-alpha.c:5817
 #, c-format
 msgid "   file: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5820
+#: vms-alpha.c:5821
 #, c-format
 msgid "Title Text Header\n"
 msgstr ""
 
-#: vms-alpha.c:5821
+#: vms-alpha.c:5822
 #, c-format
 msgid "   title: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5825
+#: vms-alpha.c:5826
 #, c-format
 msgid "Copyright Header\n"
 msgstr ""
 
-#: vms-alpha.c:5826
+#: vms-alpha.c:5827
 #, c-format
 msgid "   copyright: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5830
+#: vms-alpha.c:5831
 #, c-format
 msgid "unhandled emh subtype %u\n"
 msgstr ""
 
-#: vms-alpha.c:5840
+#: vms-alpha.c:5841
 #, c-format
 msgid "  EEOM (len=%u):\n"
 msgstr ""
 
-#: vms-alpha.c:5845
+#: vms-alpha.c:5846
 #, c-format
 msgid "   Error: The length is less than the length of an EEOM record\n"
 msgstr ""
 
-#: vms-alpha.c:5849
+#: vms-alpha.c:5850
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5851
+#: vms-alpha.c:5852
 #, c-format
 msgid "   completion code: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5856
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr ""
 
-#: vms-alpha.c:5856
+#: vms-alpha.c:5857
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5858
+#: vms-alpha.c:5859
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5867
+#: vms-alpha.c:5868
 msgid " WEAK"
 msgstr ""
 
-#: vms-alpha.c:5869
+#: vms-alpha.c:5870
 msgid " DEF"
 msgstr ""
 
-#: vms-alpha.c:5871
+#: vms-alpha.c:5872
 msgid " UNI"
 msgstr ""
 
-#: vms-alpha.c:5873 vms-alpha.c:5894
+#: vms-alpha.c:5874 vms-alpha.c:5895
 msgid " REL"
 msgstr ""
 
-#: vms-alpha.c:5875
+#: vms-alpha.c:5876
 msgid " COMM"
 msgstr ""
 
-#: vms-alpha.c:5877
+#: vms-alpha.c:5878
 msgid " VECEP"
 msgstr ""
 
-#: vms-alpha.c:5879
+#: vms-alpha.c:5880
 msgid " NORM"
 msgstr ""
 
-#: vms-alpha.c:5881
+#: vms-alpha.c:5882
 msgid " QVAL"
 msgstr ""
 
-#: vms-alpha.c:5888
+#: vms-alpha.c:5889
 msgid " PIC"
 msgstr ""
 
-#: vms-alpha.c:5890
+#: vms-alpha.c:5891
 msgid " LIB"
 msgstr ""
 
-#: vms-alpha.c:5892
+#: vms-alpha.c:5893
 msgid " OVR"
 msgstr ""
 
-#: vms-alpha.c:5896
+#: vms-alpha.c:5897
 msgid " GBL"
 msgstr ""
 
-#: vms-alpha.c:5898
+#: vms-alpha.c:5899
 msgid " SHR"
 msgstr ""
 
-#: vms-alpha.c:5900
+#: vms-alpha.c:5901
 msgid " EXE"
 msgstr ""
 
-#: vms-alpha.c:5902
+#: vms-alpha.c:5903
 msgid " RD"
 msgstr ""
 
-#: vms-alpha.c:5904
+#: vms-alpha.c:5905
 msgid " WRT"
 msgstr ""
 
-#: vms-alpha.c:5906
+#: vms-alpha.c:5907
 msgid " VEC"
 msgstr ""
 
-#: vms-alpha.c:5908
+#: vms-alpha.c:5909
 msgid " NOMOD"
 msgstr ""
 
-#: vms-alpha.c:5910
+#: vms-alpha.c:5911
 msgid " COM"
 msgstr ""
 
-#: vms-alpha.c:5912
+#: vms-alpha.c:5913
 msgid " 64B"
 msgstr ""
 
-#: vms-alpha.c:5921
+#: vms-alpha.c:5922
 #, c-format
 msgid "  EGSD (len=%u):\n"
 msgstr ""
 
-#: vms-alpha.c:5934
+#: vms-alpha.c:5935
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
 msgstr ""
 
-#: vms-alpha.c:5940 vms-alpha.c:6191
+#: vms-alpha.c:5941 vms-alpha.c:6192
 #, c-format
 msgid "   Error: length larger than remaining space in record\n"
 msgstr ""
 
-#: vms-alpha.c:5952
+#: vms-alpha.c:5953
 #, c-format
 msgid "PSC - Program section definition\n"
 msgstr ""
 
-#: vms-alpha.c:5953 vms-alpha.c:5970
+#: vms-alpha.c:5954 vms-alpha.c:5971
 #, c-format
 msgid "   alignment  : 2**%u\n"
 msgstr ""
 
-#: vms-alpha.c:5954 vms-alpha.c:5971
+#: vms-alpha.c:5955 vms-alpha.c:5972
 #, c-format
 msgid "   flags      : 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:5958
+#: vms-alpha.c:5959
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr ""
 
-#: vms-alpha.c:5959 vms-alpha.c:6016 vms-alpha.c:6065
+#: vms-alpha.c:5960 vms-alpha.c:6017 vms-alpha.c:6066
 #, c-format
 msgid "   name       : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5969
+#: vms-alpha.c:5970
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
 msgstr ""
 
-#: vms-alpha.c:5975
+#: vms-alpha.c:5976
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr ""
 
-#: vms-alpha.c:5976
+#: vms-alpha.c:5977
 #, c-format
 msgid "   image offset  : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5978
+#: vms-alpha.c:5979
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5980
+#: vms-alpha.c:5981
 #, c-format
 msgid "   name          : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5993
+#: vms-alpha.c:5994
 #, c-format
 msgid "SYM - Global symbol definition\n"
 msgstr ""
 
-#: vms-alpha.c:5994 vms-alpha.c:6054 vms-alpha.c:6075 vms-alpha.c:6094
+#: vms-alpha.c:5995 vms-alpha.c:6055 vms-alpha.c:6076 vms-alpha.c:6095
 #, c-format
 msgid "   flags: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:5997
+#: vms-alpha.c:5998
 #, c-format
 msgid "   psect offset: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6001
+#: vms-alpha.c:6002
 #, c-format
 msgid "   code address: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6003
+#: vms-alpha.c:6004
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr ""
 
-#: vms-alpha.c:6006 vms-alpha.c:6082 vms-alpha.c:6101
+#: vms-alpha.c:6007 vms-alpha.c:6083 vms-alpha.c:6102
 #, c-format
 msgid "   psect index : %u\n"
 msgstr ""
 
-#: vms-alpha.c:6008 vms-alpha.c:6084 vms-alpha.c:6103
+#: vms-alpha.c:6009 vms-alpha.c:6085 vms-alpha.c:6104
 #, c-format
 msgid "   name        : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6015
+#: vms-alpha.c:6016
 #, c-format
 msgid "SYM - Global symbol reference\n"
 msgstr ""
 
-#: vms-alpha.c:6027
+#: vms-alpha.c:6028
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr ""
 
-#: vms-alpha.c:6028
+#: vms-alpha.c:6029
 #, c-format
 msgid "   flags         : 0x%08x"
 msgstr ""
 
-#: vms-alpha.c:6032
+#: vms-alpha.c:6033
 #, c-format
 msgid "   id match      : %x\n"
 msgstr ""
 
-#: vms-alpha.c:6034
+#: vms-alpha.c:6035
 #, c-format
 msgid "   error severity: %x\n"
 msgstr ""
 
-#: vms-alpha.c:6037
+#: vms-alpha.c:6038
 #, c-format
 msgid "   entity name   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6039
+#: vms-alpha.c:6040
 #, c-format
 msgid "   object name   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6042
+#: vms-alpha.c:6043
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6045
+#: vms-alpha.c:6046
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6053
+#: vms-alpha.c:6054
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
 msgstr ""
 
-#: vms-alpha.c:6057
+#: vms-alpha.c:6058
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6059
+#: vms-alpha.c:6060
 #, c-format
 msgid "   entry point: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6061
+#: vms-alpha.c:6062
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6063
+#: vms-alpha.c:6064
 #, c-format
 msgid "   psect index: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6074
+#: vms-alpha.c:6075
 #, c-format
 msgid "SYMV - Vectored symbol definition\n"
 msgstr ""
 
-#: vms-alpha.c:6078
+#: vms-alpha.c:6079
 #, c-format
 msgid "   vector      : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6080 vms-alpha.c:6099
+#: vms-alpha.c:6081 vms-alpha.c:6100
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6093
+#: vms-alpha.c:6094
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
 msgstr ""
 
-#: vms-alpha.c:6097
+#: vms-alpha.c:6098
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6108
+#: vms-alpha.c:6109
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr ""
 
-#: vms-alpha.c:6143
+#: vms-alpha.c:6144
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6147
+#: vms-alpha.c:6148
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6152
+#: vms-alpha.c:6153
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6158
+#: vms-alpha.c:6159
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6163
+#: vms-alpha.c:6164
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6174
+#: vms-alpha.c:6175
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr ""
 
-#: vms-alpha.c:6196
+#: vms-alpha.c:6197
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr ""
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6201
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6204
+#: vms-alpha.c:6205
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6208
+#: vms-alpha.c:6209
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6213
+#: vms-alpha.c:6214
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6215
+#: vms-alpha.c:6216
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6222
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr ""
 
-#: vms-alpha.c:6224
+#: vms-alpha.c:6225
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr ""
 
-#: vms-alpha.c:6227
+#: vms-alpha.c:6228
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr ""
 
-#: vms-alpha.c:6231
+#: vms-alpha.c:6232
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr ""
 
-#: vms-alpha.c:6234
+#: vms-alpha.c:6235
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr ""
 
-#: vms-alpha.c:6237
+#: vms-alpha.c:6238
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr ""
 
-#: vms-alpha.c:6240
+#: vms-alpha.c:6241
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr ""
 
-#: vms-alpha.c:6246
+#: vms-alpha.c:6247
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr ""
 
-#: vms-alpha.c:6253
+#: vms-alpha.c:6254
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6257
+#: vms-alpha.c:6258
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6261
+#: vms-alpha.c:6262
 #, c-format
 msgid "STO_RB (store relative branch)\n"
 msgstr ""
 
-#: vms-alpha.c:6264
+#: vms-alpha.c:6265
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
 msgstr ""
 
-#: vms-alpha.c:6267
+#: vms-alpha.c:6268
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr ""
 
-#: vms-alpha.c:6273
+#: vms-alpha.c:6274
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr ""
 
-#: vms-alpha.c:6280
+#: vms-alpha.c:6281
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6284
+#: vms-alpha.c:6285
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr ""
 
-#: vms-alpha.c:6287
+#: vms-alpha.c:6288
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
 msgstr ""
 
-#: vms-alpha.c:6290
+#: vms-alpha.c:6291
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
 msgstr ""
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6295
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr ""
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6298
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr ""
 
-#: vms-alpha.c:6300
+#: vms-alpha.c:6301
 #, c-format
 msgid "OPR_SUB (subtract)\n"
 msgstr ""
 
-#: vms-alpha.c:6303
+#: vms-alpha.c:6304
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr ""
 
-#: vms-alpha.c:6306
+#: vms-alpha.c:6307
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr ""
 
-#: vms-alpha.c:6309
+#: vms-alpha.c:6310
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr ""
 
-#: vms-alpha.c:6312
+#: vms-alpha.c:6313
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr ""
 
-#: vms-alpha.c:6315
+#: vms-alpha.c:6316
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr ""
 
-#: vms-alpha.c:6318
+#: vms-alpha.c:6319
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr ""
 
-#: vms-alpha.c:6321
+#: vms-alpha.c:6322
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr ""
 
-#: vms-alpha.c:6324
+#: vms-alpha.c:6325
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr ""
 
-#: vms-alpha.c:6327
+#: vms-alpha.c:6328
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr ""
 
-#: vms-alpha.c:6330
+#: vms-alpha.c:6331
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr ""
 
-#: vms-alpha.c:6333
+#: vms-alpha.c:6334
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr ""
 
-#: vms-alpha.c:6336
+#: vms-alpha.c:6337
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr ""
 
-#: vms-alpha.c:6339
+#: vms-alpha.c:6340
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr ""
 
-#: vms-alpha.c:6342
+#: vms-alpha.c:6343
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr ""
 
-#: vms-alpha.c:6346
+#: vms-alpha.c:6347
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr ""
 
-#: vms-alpha.c:6350
+#: vms-alpha.c:6351
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr ""
 
-#: vms-alpha.c:6352
+#: vms-alpha.c:6353
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6355
+#: vms-alpha.c:6356
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6358
+#: vms-alpha.c:6359
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr ""
 
-#: vms-alpha.c:6360
+#: vms-alpha.c:6361
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6364
+#: vms-alpha.c:6365
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr ""
 
-#: vms-alpha.c:6366
+#: vms-alpha.c:6367
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6370
+#: vms-alpha.c:6371
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6373
+#: vms-alpha.c:6374
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6380
+#: vms-alpha.c:6381
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6384
+#: vms-alpha.c:6385
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6388
+#: vms-alpha.c:6389
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6392
+#: vms-alpha.c:6393
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6396
+#: vms-alpha.c:6397
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6400
+#: vms-alpha.c:6401
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6404
+#: vms-alpha.c:6405
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6408
+#: vms-alpha.c:6409
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6413
+#: vms-alpha.c:6414
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6417
+#: vms-alpha.c:6418
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6421
+#: vms-alpha.c:6422
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
 msgstr ""
 
-#: vms-alpha.c:6427
+#: vms-alpha.c:6428
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
 msgstr ""
 
-#: vms-alpha.c:6431
+#: vms-alpha.c:6432
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
 msgstr ""
 
-#: vms-alpha.c:6434
+#: vms-alpha.c:6435
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr ""
 
-#: vms-alpha.c:6437
+#: vms-alpha.c:6438
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
 msgstr ""
 
-#: vms-alpha.c:6440 vms-alpha.c:6864 vms-alpha.c:6990
+#: vms-alpha.c:6441 vms-alpha.c:6865 vms-alpha.c:6991
 #, c-format
 msgid "*unhandled*\n"
 msgstr ""
 
-#: vms-alpha.c:6470 vms-alpha.c:6509
+#: vms-alpha.c:6471 vms-alpha.c:6510
 #, c-format
 msgid "cannot read GST record length\n"
 msgstr ""
 
 #. Ill-formed.
-#: vms-alpha.c:6491
+#: vms-alpha.c:6492
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr ""
 
-#: vms-alpha.c:6517
+#: vms-alpha.c:6518
 #, c-format
 msgid "cannot read GST record header\n"
 msgstr ""
 
-#: vms-alpha.c:6530
+#: vms-alpha.c:6531
 #, c-format
 msgid " corrupted GST\n"
 msgstr ""
 
-#: vms-alpha.c:6538
+#: vms-alpha.c:6539
 #, c-format
 msgid "cannot read GST record\n"
 msgstr ""
 
-#: vms-alpha.c:6567
+#: vms-alpha.c:6568
 #, c-format
 msgid " unhandled EOBJ record type %u\n"
 msgstr ""
 
-#: vms-alpha.c:6591
+#: vms-alpha.c:6592
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6605
+#: vms-alpha.c:6606
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
 msgstr ""
 
-#: vms-alpha.c:6612
+#: vms-alpha.c:6613
 #, c-format
 msgid " %08x"
 msgstr ""
 
-#: vms-alpha.c:6638
+#: vms-alpha.c:6639
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr ""
 
-#: vms-alpha.c:6644
+#: vms-alpha.c:6645
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6666
+#: vms-alpha.c:6667
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr ""
 
-#: vms-alpha.c:6673
+#: vms-alpha.c:6674
 #, c-format
 msgid " 0x%08x"
 msgstr ""
 
 #. 64 bits.
-#: vms-alpha.c:6795
+#: vms-alpha.c:6796
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr ""
 
-#: vms-alpha.c:6800
+#: vms-alpha.c:6801
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6811
+#: vms-alpha.c:6812
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr ""
 
-#: vms-alpha.c:6816
+#: vms-alpha.c:6817
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6821
+#: vms-alpha.c:6822
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6825
+#: vms-alpha.c:6826
 #, c-format
 msgid "Strides:\n"
 msgstr ""
 
-#: vms-alpha.c:6835
+#: vms-alpha.c:6836
 #, c-format
 msgid "Bounds:\n"
 msgstr ""
 
-#: vms-alpha.c:6841
+#: vms-alpha.c:6842
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6853
+#: vms-alpha.c:6854
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr ""
 
-#: vms-alpha.c:6858
+#: vms-alpha.c:6859
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6879
+#: vms-alpha.c:6880
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr ""
 
-#: vms-alpha.c:6885
+#: vms-alpha.c:6886
 #, c-format
 msgid "(no value)\n"
 msgstr ""
 
-#: vms-alpha.c:6888
+#: vms-alpha.c:6889
 #, c-format
 msgid "(not active)\n"
 msgstr ""
 
-#: vms-alpha.c:6891
+#: vms-alpha.c:6892
 #, c-format
 msgid "(not allocated)\n"
 msgstr ""
 
-#: vms-alpha.c:6894
+#: vms-alpha.c:6895
 #, c-format
 msgid "(descriptor)\n"
 msgstr ""
 
-#: vms-alpha.c:6898
+#: vms-alpha.c:6899
 #, c-format
 msgid "(trailing value)\n"
 msgstr ""
 
-#: vms-alpha.c:6901
+#: vms-alpha.c:6902
 #, c-format
 msgid "(value spec follows)\n"
 msgstr ""
 
-#: vms-alpha.c:6904
+#: vms-alpha.c:6905
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr ""
 
-#: vms-alpha.c:6908
+#: vms-alpha.c:6909
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr ""
 
-#: vms-alpha.c:6915
+#: vms-alpha.c:6916
 msgid "literal"
 msgstr ""
 
-#: vms-alpha.c:6918
+#: vms-alpha.c:6919
 msgid "address"
 msgstr ""
 
-#: vms-alpha.c:6921
+#: vms-alpha.c:6922
 msgid "desc"
 msgstr ""
 
-#: vms-alpha.c:6924
+#: vms-alpha.c:6925
 msgid "reg"
 msgstr ""
 
-#: vms-alpha.c:6941
+#: vms-alpha.c:6942
 #, c-format
 msgid "len: %2u, kind: %2u "
 msgstr ""
 
-#: vms-alpha.c:6947
+#: vms-alpha.c:6948
 #, c-format
 msgid "atomic, type=0x%02x %s\n"
 msgstr ""
 
-#: vms-alpha.c:6951
+#: vms-alpha.c:6952
 #, c-format
 msgid "indirect, defined at 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6955
+#: vms-alpha.c:6956
 #, c-format
 msgid "typed pointer\n"
 msgstr ""
 
-#: vms-alpha.c:6959
+#: vms-alpha.c:6960
 #, c-format
 msgid "pointer\n"
 msgstr ""
 
-#: vms-alpha.c:6967
+#: vms-alpha.c:6968
 #, c-format
 msgid "array, dim: %u, bitmap: "
 msgstr ""
 
-#: vms-alpha.c:6974
+#: vms-alpha.c:6975
 #, c-format
 msgid "array descriptor:\n"
 msgstr ""
 
-#: vms-alpha.c:6981
+#: vms-alpha.c:6982
 #, c-format
 msgid "type spec for element:\n"
 msgstr ""
 
-#: vms-alpha.c:6983
+#: vms-alpha.c:6984
 #, c-format
 msgid "type spec for subscript %u:\n"
 msgstr ""
 
-#: vms-alpha.c:7001
+#: vms-alpha.c:7002
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr ""
 
-#: vms-alpha.c:7012
+#: vms-alpha.c:7013
 #, c-format
 msgid "cannot read DST header\n"
 msgstr ""
 
-#: vms-alpha.c:7018
+#: vms-alpha.c:7019
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr ""
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7033
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr ""
 
-#: vms-alpha.c:7075
+#: vms-alpha.c:7076
 #, c-format
 msgid "standard data: %s\n"
 msgstr ""
 
-#: vms-alpha.c:7078 vms-alpha.c:7166
+#: vms-alpha.c:7079 vms-alpha.c:7167
 #, c-format
 msgid "    name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7085
+#: vms-alpha.c:7086
 #, c-format
 msgid "modbeg\n"
 msgstr ""
 
-#: vms-alpha.c:7087
+#: vms-alpha.c:7088
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7093 vms-alpha.c:7367
+#: vms-alpha.c:7094 vms-alpha.c:7368
 #, c-format
 msgid "   module name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7096
+#: vms-alpha.c:7097
 #, c-format
 msgid "   compiler   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7101
+#: vms-alpha.c:7102
 #, c-format
 msgid "modend\n"
 msgstr ""
 
-#: vms-alpha.c:7108
+#: vms-alpha.c:7109
 msgid "rtnbeg\n"
 msgstr ""
 
-#: vms-alpha.c:7110
+#: vms-alpha.c:7111
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7115
+#: vms-alpha.c:7116
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7123
+#: vms-alpha.c:7124
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7131
+#: vms-alpha.c:7132
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7140
+#: vms-alpha.c:7141
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7150
+#: vms-alpha.c:7151
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7159
+#: vms-alpha.c:7160
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7165
+#: vms-alpha.c:7166
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7172
+#: vms-alpha.c:7173
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7181
+#: vms-alpha.c:7182
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7183
+#: vms-alpha.c:7184
 #, c-format
 msgid "    len: %u bits\n"
 msgstr ""
 
-#: vms-alpha.c:7188
+#: vms-alpha.c:7189
 #, c-format
 msgid "recend\n"
 msgstr ""
 
-#: vms-alpha.c:7192
+#: vms-alpha.c:7193
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7196
+#: vms-alpha.c:7197
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7200
+#: vms-alpha.c:7201
 #, c-format
 msgid "enumend\n"
 msgstr ""
 
-#: vms-alpha.c:7205
+#: vms-alpha.c:7206
 #, c-format
 msgid "label, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7207
+#: vms-alpha.c:7208
 #, c-format
 msgid "    address: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7217
+#: vms-alpha.c:7218
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7220
+#: vms-alpha.c:7221
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7230
+#: vms-alpha.c:7231
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7247
+#: vms-alpha.c:7248
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr ""
 
-#: vms-alpha.c:7254
+#: vms-alpha.c:7255
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7260
+#: vms-alpha.c:7261
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7266
+#: vms-alpha.c:7267
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7272
+#: vms-alpha.c:7273
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr ""
 
-#: vms-alpha.c:7277
+#: vms-alpha.c:7278
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr ""
 
-#: vms-alpha.c:7282
+#: vms-alpha.c:7283
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr ""
 
-#: vms-alpha.c:7287
+#: vms-alpha.c:7288
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7291
+#: vms-alpha.c:7292
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7296
+#: vms-alpha.c:7297
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr ""
 
-#: vms-alpha.c:7298
+#: vms-alpha.c:7299
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7303
+#: vms-alpha.c:7304
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:7305
+#: vms-alpha.c:7306
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7311
+#: vms-alpha.c:7312
 #, c-format
 msgid "delta pc +%-4d"
 msgstr ""
 
-#: vms-alpha.c:7315
+#: vms-alpha.c:7316
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7320
+#: vms-alpha.c:7321
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr ""
 
-#: vms-alpha.c:7335
+#: vms-alpha.c:7336
 #, c-format
 msgid "source (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7350
+#: vms-alpha.c:7351
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7355
+#: vms-alpha.c:7356
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7364
+#: vms-alpha.c:7365
 #, c-format
 msgid "   filename   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7373
+#: vms-alpha.c:7374
 #, c-format
 msgid "   setfile %u\n"
 msgstr ""
 
-#: vms-alpha.c:7378 vms-alpha.c:7383
+#: vms-alpha.c:7379 vms-alpha.c:7384
 #, c-format
 msgid "   setrec %u\n"
 msgstr ""
 
-#: vms-alpha.c:7388 vms-alpha.c:7393
+#: vms-alpha.c:7389 vms-alpha.c:7394
 #, c-format
 msgid "   setlnum %u\n"
 msgstr ""
 
-#: vms-alpha.c:7398 vms-alpha.c:7403
+#: vms-alpha.c:7399 vms-alpha.c:7404
 #, c-format
 msgid "   deflines %u\n"
 msgstr ""
 
-#: vms-alpha.c:7407
+#: vms-alpha.c:7408
 #, c-format
 msgid "   formfeed\n"
 msgstr ""
 
-#: vms-alpha.c:7411
+#: vms-alpha.c:7412
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr ""
 
-#: vms-alpha.c:7423
+#: vms-alpha.c:7424
 #, c-format
 msgid "*unhandled* dst type %u\n"
 msgstr ""
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7456
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr ""
 
-#: vms-alpha.c:7459
+#: vms-alpha.c:7460
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7463
+#: vms-alpha.c:7464
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7471
+#: vms-alpha.c:7472
 msgid "executable"
 msgstr ""
 
-#: vms-alpha.c:7474
+#: vms-alpha.c:7475
 msgid "linkable image"
 msgstr ""
 
-#: vms-alpha.c:7481
+#: vms-alpha.c:7482
 #, c-format
 msgid " image type: %u (%s)"
 msgstr ""
 
-#: vms-alpha.c:7487
+#: vms-alpha.c:7488
 msgid "native"
 msgstr ""
 
-#: vms-alpha.c:7490
+#: vms-alpha.c:7491
 msgid "CLI"
 msgstr ""
 
-#: vms-alpha.c:7497
+#: vms-alpha.c:7498
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ""
 
-#: vms-alpha.c:7504
+#: vms-alpha.c:7505
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7508
+#: vms-alpha.c:7509
 #, c-format
 msgid " fixup info rva: "
 msgstr ""
 
-#: vms-alpha.c:7510
+#: vms-alpha.c:7511
 #, c-format
 msgid ", symbol vector rva: "
 msgstr ""
 
-#: vms-alpha.c:7513
+#: vms-alpha.c:7514
 #, c-format
 msgid ""
 "\n"
 " version array off: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7519
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7524
+#: vms-alpha.c:7525
 #, c-format
 msgid " linker flags: %08x:"
 msgstr ""
 
-#: vms-alpha.c:7555
+#: vms-alpha.c:7556
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7561
+#: vms-alpha.c:7562
 #, c-format
 msgid " BPAGE: %u"
 msgstr ""
 
-#: vms-alpha.c:7568
+#: vms-alpha.c:7569
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ""
 
-#: vms-alpha.c:7571
+#: vms-alpha.c:7572
 #, c-format
 msgid ", alias: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7579
+#: vms-alpha.c:7580
 #, c-format
 msgid "system version array information:\n"
 msgstr ""
 
-#: vms-alpha.c:7583
+#: vms-alpha.c:7584
 #, c-format
 msgid "cannot read EIHVN header\n"
 msgstr ""
 
-#: vms-alpha.c:7593
+#: vms-alpha.c:7594
 #, c-format
 msgid "cannot read EIHVN version\n"
 msgstr ""
 
-#: vms-alpha.c:7596
+#: vms-alpha.c:7597
 #, c-format
 msgid "   %02u "
 msgstr ""
 
-#: vms-alpha.c:7600
+#: vms-alpha.c:7601
 msgid "BASE_IMAGE       "
 msgstr ""
 
-#: vms-alpha.c:7603
+#: vms-alpha.c:7604
 msgid "MEMORY_MANAGEMENT"
 msgstr ""
 
-#: vms-alpha.c:7606
+#: vms-alpha.c:7607
 msgid "IO               "
 msgstr ""
 
-#: vms-alpha.c:7609
+#: vms-alpha.c:7610
 msgid "FILES_VOLUMES    "
 msgstr ""
 
-#: vms-alpha.c:7612
+#: vms-alpha.c:7613
 msgid "PROCESS_SCHED    "
 msgstr ""
 
-#: vms-alpha.c:7615
+#: vms-alpha.c:7616
 msgid "SYSGEN           "
 msgstr ""
 
-#: vms-alpha.c:7618
+#: vms-alpha.c:7619
 msgid "CLUSTERS_LOCKMGR "
 msgstr ""
 
-#: vms-alpha.c:7621
+#: vms-alpha.c:7622
 msgid "LOGICAL_NAMES    "
 msgstr ""
 
-#: vms-alpha.c:7624
+#: vms-alpha.c:7625
 msgid "SECURITY         "
 msgstr ""
 
-#: vms-alpha.c:7627
+#: vms-alpha.c:7628
 msgid "IMAGE_ACTIVATOR  "
 msgstr ""
 
-#: vms-alpha.c:7630
+#: vms-alpha.c:7631
 msgid "NETWORKS         "
 msgstr ""
 
-#: vms-alpha.c:7633
+#: vms-alpha.c:7634
 msgid "COUNTERS         "
 msgstr ""
 
-#: vms-alpha.c:7636
+#: vms-alpha.c:7637
 msgid "STABLE           "
 msgstr ""
 
-#: vms-alpha.c:7639
+#: vms-alpha.c:7640
 msgid "MISC             "
 msgstr ""
 
-#: vms-alpha.c:7642
+#: vms-alpha.c:7643
 msgid "CPU              "
 msgstr ""
 
-#: vms-alpha.c:7645
+#: vms-alpha.c:7646
 msgid "VOLATILE         "
 msgstr ""
 
-#: vms-alpha.c:7648
+#: vms-alpha.c:7649
 msgid "SHELL            "
 msgstr ""
 
-#: vms-alpha.c:7651
+#: vms-alpha.c:7652
 msgid "POSIX            "
 msgstr ""
 
-#: vms-alpha.c:7654
+#: vms-alpha.c:7655
 msgid "MULTI_PROCESSING "
 msgstr ""
 
-#: vms-alpha.c:7657
+#: vms-alpha.c:7658
 msgid "GALAXY           "
 msgstr ""
 
-#: vms-alpha.c:7660
+#: vms-alpha.c:7661
 msgid "*unknown*        "
 msgstr ""
 
-#: vms-alpha.c:7676 vms-alpha.c:7951
+#: vms-alpha.c:7677 vms-alpha.c:7952
 #, c-format
 msgid "cannot read EIHA\n"
 msgstr ""
 
-#: vms-alpha.c:7679
+#: vms-alpha.c:7680
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr ""
 
-#: vms-alpha.c:7682
+#: vms-alpha.c:7683
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7686
+#: vms-alpha.c:7687
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7690
+#: vms-alpha.c:7691
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7694
+#: vms-alpha.c:7695
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7698
+#: vms-alpha.c:7699
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7709
+#: vms-alpha.c:7710
 #, c-format
 msgid "cannot read EIHI\n"
 msgstr ""
 
-#: vms-alpha.c:7713
+#: vms-alpha.c:7714
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7716
+#: vms-alpha.c:7717
 #, c-format
 msgid " image name       : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7718
+#: vms-alpha.c:7719
 #, c-format
 msgid " link time        : %s\n"
 msgstr ""
 
-#: vms-alpha.c:7720
+#: vms-alpha.c:7721
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7722
+#: vms-alpha.c:7723
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7724
+#: vms-alpha.c:7725
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7734
+#: vms-alpha.c:7735
 #, c-format
 msgid "cannot read EIHS\n"
 msgstr ""
 
-#: vms-alpha.c:7738
+#: vms-alpha.c:7739
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7744
+#: vms-alpha.c:7745
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
 msgstr ""
 
-#: vms-alpha.c:7749
+#: vms-alpha.c:7750
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7754
+#: vms-alpha.c:7755
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7767
+#: vms-alpha.c:7768
 #, c-format
 msgid "cannot read EISD\n"
 msgstr ""
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7779
 #, c-format
 msgid ""
 "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7786
+#: vms-alpha.c:7787
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7791
+#: vms-alpha.c:7792
 #, c-format
 msgid " flags: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:7829
+#: vms-alpha.c:7830
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr ""
 
-#: vms-alpha.c:7835
+#: vms-alpha.c:7836
 msgid "NORMAL"
 msgstr ""
 
-#: vms-alpha.c:7838
+#: vms-alpha.c:7839
 msgid "SHRFXD"
 msgstr ""
 
-#: vms-alpha.c:7841
+#: vms-alpha.c:7842
 msgid "PRVFXD"
 msgstr ""
 
-#: vms-alpha.c:7844
+#: vms-alpha.c:7845
 msgid "SHRPIC"
 msgstr ""
 
-#: vms-alpha.c:7847
+#: vms-alpha.c:7848
 msgid "PRVPIC"
 msgstr ""
 
-#: vms-alpha.c:7850
+#: vms-alpha.c:7851
 msgid "USRSTACK"
 msgstr ""
 
-#: vms-alpha.c:7856
+#: vms-alpha.c:7857
 msgid ")\n"
 msgstr ""
 
-#: vms-alpha.c:7859
+#: vms-alpha.c:7860
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7869
+#: vms-alpha.c:7870
 #, c-format
 msgid "cannot read DMT\n"
 msgstr ""
 
-#: vms-alpha.c:7873
+#: vms-alpha.c:7874
 #, c-format
 msgid "Debug module table:\n"
 msgstr ""
 
-#: vms-alpha.c:7882
+#: vms-alpha.c:7883
 #, c-format
 msgid "cannot read DMT header\n"
 msgstr ""
 
-#: vms-alpha.c:7888
+#: vms-alpha.c:7889
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
 msgstr ""
 
-#: vms-alpha.c:7898
+#: vms-alpha.c:7899
 #, c-format
 msgid "cannot read DMT psect\n"
 msgstr ""
 
-#: vms-alpha.c:7902
+#: vms-alpha.c:7903
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7915
+#: vms-alpha.c:7916
 #, c-format
 msgid "cannot read DST\n"
 msgstr ""
 
-#: vms-alpha.c:7925
+#: vms-alpha.c:7926
 #, c-format
 msgid "cannot read GST\n"
 msgstr ""
 
-#: vms-alpha.c:7929
+#: vms-alpha.c:7930
 #, c-format
 msgid "Global symbol table:\n"
 msgstr ""
 
-#: vms-alpha.c:7958
+#: vms-alpha.c:7959
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7962
+#: vms-alpha.c:7963
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:7966
+#: vms-alpha.c:7967
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:7969
+#: vms-alpha.c:7970
 #, c-format
 msgid "  size : %u\n"
 msgstr ""
 
-#: vms-alpha.c:7971
+#: vms-alpha.c:7972
 #, c-format
 msgid "  flags: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7976
+#: vms-alpha.c:7977
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7981
+#: vms-alpha.c:7982
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7986
+#: vms-alpha.c:7987
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7989
+#: vms-alpha.c:7990
 #, c-format
 msgid "  chgprtoff : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7993
+#: vms-alpha.c:7994
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7996
+#: vms-alpha.c:7997
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7999
+#: vms-alpha.c:8000
 #, c-format
 msgid "  base_va : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:8001
+#: vms-alpha.c:8002
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:8009
+#: vms-alpha.c:8010
 #, c-format
 msgid " Shareable images:\n"
 msgstr ""
 
-#: vms-alpha.c:8014
+#: vms-alpha.c:8015
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:8021
+#: vms-alpha.c:8022
 #, c-format
 msgid " quad-word relocation fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:8026
+#: vms-alpha.c:8027
 #, c-format
 msgid " long-word relocation fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:8031
+#: vms-alpha.c:8032
 #, c-format
 msgid " quad-word .address reference fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:8036
+#: vms-alpha.c:8037
 #, c-format
 msgid " long-word .address reference fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:8041
+#: vms-alpha.c:8042
 #, c-format
 msgid " Code Address Reference Fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:8046
+#: vms-alpha.c:8047
 #, c-format
 msgid " Linkage Pairs Reference Fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:8055
+#: vms-alpha.c:8056
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr ""
 
-#: vms-alpha.c:8061
+#: vms-alpha.c:8062
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
 msgstr ""
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8901
+#: vms-alpha.c:8902
 msgid "%P: relocatable link is not supported\n"
 msgstr ""
 
-#: vms-alpha.c:8972
+#: vms-alpha.c:8973
 #, c-format
-msgid "%P: multiple entry points: in modules %B and %B\n"
+msgid "%P: multiple entry points: in modules %pB and %pB\n"
 msgstr ""
 
 #: vms-lib.c:1445
@@ -8129,173 +7763,192 @@ msgid "_bfd_vms_output_counted called with too many bytes"
 msgstr ""
 
 #: xcofflink.c:832
-msgid "%B: XCOFF shared object when not producing XCOFF output"
+#, c-format
+msgid "%pB: XCOFF shared object when not producing XCOFF output"
 msgstr ""
 
 #: xcofflink.c:853
-msgid "%B: dynamic object with no .loader section"
+#, c-format
+msgid "%pB: dynamic object with no .loader section"
 msgstr ""
 
 #: xcofflink.c:1413
 #, c-format
-msgid "%B: `%s' has line numbers but no enclosing section"
+msgid "%pB: `%s' has line numbers but no enclosing section"
 msgstr ""
 
 #: xcofflink.c:1466
 #, c-format
-msgid "%B: class %d symbol `%s' has no aux entries"
+msgid "%pB: class %d symbol `%s' has no aux entries"
 msgstr ""
 
 #: xcofflink.c:1489
 #, c-format
-msgid "%B: symbol `%s' has unrecognized csect type %d"
+msgid "%pB: symbol `%s' has unrecognized csect type %d"
 msgstr ""
 
 #: xcofflink.c:1502
 #, c-format
-msgid "%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %Ld"
+msgid "%pB: bad XTY_ER symbol `%s': class %d scnum %d scnlen %<PRId64>"
 msgstr ""
 
-#: xcofflink.c:1532
+#: xcofflink.c:1533
 #, c-format
-msgid "%B: XMC_TC0 symbol `%s' is class %d scnlen %Ld"
+msgid "%pB: XMC_TC0 symbol `%s' is class %d scnlen %<PRId64>"
 msgstr ""
 
-#: xcofflink.c:1679
+#: xcofflink.c:1680
 #, c-format
-msgid "%B: csect `%s' not in enclosing section"
+msgid "%pB: csect `%s' not in enclosing section"
 msgstr ""
 
-#: xcofflink.c:1787
+#: xcofflink.c:1788
 #, c-format
-msgid "%B: misplaced XTY_LD `%s'"
+msgid "%pB: misplaced XTY_LD `%s'"
 msgstr ""
 
-#: xcofflink.c:2108
+#: xcofflink.c:2109
 #, c-format
-msgid "%B: reloc %s:%Ld not in csect"
+msgid "%pB: reloc %s:%<PRId64> not in csect"
 msgstr ""
 
-#: xcofflink.c:3198
+#: xcofflink.c:3199
 #, c-format
 msgid "%s: no such symbol"
 msgstr ""
 
-#: xcofflink.c:3303
+#: xcofflink.c:3304
 #, c-format
 msgid "warning: attempt to export undefined symbol `%s'"
 msgstr ""
 
-#: xcofflink.c:3682
+#: xcofflink.c:3683
 msgid "error: undefined symbol __rtinit"
 msgstr ""
 
-#: xcofflink.c:4062
+#: xcofflink.c:4063
 #, c-format
-msgid "%B: loader reloc in unrecognized section `%s'"
+msgid "%pB: loader reloc in unrecognized section `%s'"
 msgstr ""
 
-#: xcofflink.c:4074
+#: xcofflink.c:4075
 #, c-format
-msgid "%B: `%s' in loader reloc but not loader sym"
+msgid "%pB: `%s' in loader reloc but not loader sym"
 msgstr ""
 
-#: xcofflink.c:4091
+#: xcofflink.c:4092
 #, c-format
-msgid "%B: loader reloc in read-only section %A"
+msgid "%pB: loader reloc in read-only section %pA"
 msgstr ""
 
-#: xcofflink.c:5115
+#: xcofflink.c:5116
 #, c-format
-msgid "TOC overflow: %#Lx > 0x10000; try -mminimal-toc when compiling"
+msgid "TOC overflow: %#<PRIx64> > 0x10000; try -mminimal-toc when compiling"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:1890
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5027
 #, c-format
-msgid "Invalid AArch64 reloc number: %d"
+msgid "%pB: error: erratum 835769 stub out of range (input file too large)"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:4779
-msgid "%B: error: Erratum 835769 stub out of range (input file too large)"
-msgstr ""
-
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:4860
-msgid "%B: error: Erratum 843419 stub out of range (input file too large)"
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5108
+#, c-format
+msgid "%pB: error: erratum 843419 stub out of range (input file too large)"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5366
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5638
 #, c-format
 msgid ""
-"%B: relocation %s against symbol `%s' which may bind externally can not be "
+"%pB: relocation %s against symbol `%s' which may bind externally can not be "
 "used when making a shared object; recompile with -fPIC"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5457
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5729
 #, c-format
 msgid ""
-"%B: Local symbol descriptor table be NULL when applying relocation %s "
+"%pB: local symbol descriptor table be NULL when applying relocation %s "
 "against local symbol"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6479
-msgid "Too many GOT entries for -fpic, please recompile with -fPIC"
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6761
+msgid "too many GOT entries for -fpic, please recompile with -fPIC"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6507
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6789
 msgid ""
-"One possible cause of this error is that the symbol is being referenced in "
+"one possible cause of this error is that the symbol is being referenced in "
 "the indicated code as if it had a larger alignment than was declared where "
-"it was defined."
+"it was defined"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7084
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7375
 #, c-format
 msgid ""
-"%B: relocation %s against `%s' can not be used when making a shared object"
+"%pB: relocation %s against `%s' can not be used when making a shared object"
+msgstr ""
+
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2258
+msgid "%X%P: internal error: out of range error\n"
+msgstr ""
+
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2262
+msgid "%X%P: internal error: unsupported relocation error\n"
+msgstr ""
+
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2272
+msgid "%X%P: internal error: unknown error\n"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2570
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2596
+#, c-format
 msgid ""
-"%B: ABI is incompatible with that of the selected emulation:\n"
+"%pB: ABI is incompatible with that of the selected emulation:\n"
 "  target emulation `%s' does not match `%s'"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2590
-msgid "%B: can't link hard-float modules with soft-float modules"
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2616
+#, c-format
+msgid "%pB: can't link hard-float modules with soft-float modules"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:3070
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:3131
+#, c-format
 msgid ""
-"%B(%A+0x%lx): %d bytes required for alignment to %d-byte boundary, but only "
-"%d present"
+"%pB(%pA+%#<PRIx64>): %<PRId64> bytes required for alignment to %<PRId64>-"
+"byte boundary, but only %<PRId64> present"
 msgstr ""
 
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:3136
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:3199
+#, c-format
 msgid ""
-"%B(%A+0x%lx): Unable to clear RISCV_PCREL_HI20 relocfor cooresponding "
-"RISCV_PCREL_LO12 reloc"
+"%pB(%pA+%#<PRIx64>): Unable to clear RISCV_PCREL_HI20 reloc for "
+"corresponding RISCV_PCREL_LO12 reloc"
 msgstr ""
 
 #: peigen.c:157 pepigen.c:157 pex64igen.c:157
-msgid "%B: unable to find name for empty section"
+#, c-format
+msgid "%pB: unable to find name for empty section"
 msgstr ""
 
 #: peigen.c:183 pepigen.c:183 pex64igen.c:183
-msgid "%B: out of memory creating name for empty section"
+#, c-format
+msgid "%pB: out of memory creating name for empty section"
 msgstr ""
 
 #: peigen.c:194 pepigen.c:194 pex64igen.c:194
-msgid "%B: unable to create fake empty section"
+#, c-format
+msgid "%pB: unable to create fake empty section"
 msgstr ""
 
 #: peigen.c:532 pepigen.c:532 pex64igen.c:532
+#, c-format
 msgid ""
-"%B: aout header specifies an invalid number of data-directory entries: %ld"
+"%pB: aout header specifies an invalid number of data-directory entries: %ld"
 msgstr ""
 
 #: peigen.c:1089 pepigen.c:1089 pex64igen.c:1089
 #, c-format
-msgid "%B: line number overflow: 0x%lx > 0xffff"
+msgid "%pB: line number overflow: 0x%lx > 0xffff"
 msgstr ""
 
 #: peigen.c:1233 pepigen.c:1233 pex64igen.c:1233
@@ -8589,7 +8242,7 @@ msgstr ""
 #: peigen.c:1906 peigen.c:2103 pepigen.c:1906 pepigen.c:2103 pex64igen.c:1906
 #: pex64igen.c:2103
 #, c-format
-msgid "Warning, .pdata section size (%ld) is not a multiple of %d\n"
+msgid "warning, .pdata section size (%ld) is not a multiple of %d\n"
 msgstr ""
 
 #: peigen.c:1910 peigen.c:2107 pepigen.c:1910 pepigen.c:2107 pex64igen.c:1910
@@ -8790,82 +8443,92 @@ msgid ""
 "Characteristics 0x%x\n"
 msgstr ""
 
-#: peigen.c:2989 pepigen.c:2989 pex64igen.c:2989
+#: peigen.c:2990 pepigen.c:2990 pex64igen.c:2990
 #, c-format
-msgid "%B: Data Directory size (%lx) exceeds space left in section (%Lx)"
+msgid ""
+"%pB: Data Directory size (%lx) exceeds space left in section (%<PRIx64>)"
 msgstr ""
 
-#: peigen.c:3019 pepigen.c:3019 pex64igen.c:3019
-msgid "Failed to update file offsets in debug directory"
+#: peigen.c:3021 pepigen.c:3021 pex64igen.c:3021
+msgid "failed to update file offsets in debug directory"
 msgstr ""
 
-#: peigen.c:3025 pepigen.c:3025 pex64igen.c:3025
-msgid "%B: Failed to read debug data section"
+#: peigen.c:3027 pepigen.c:3027 pex64igen.c:3027
+#, c-format
+msgid "%pB: failed to read debug data section"
 msgstr ""
 
-#: peigen.c:3841 pepigen.c:3841 pex64igen.c:3841
+#: peigen.c:3843 pepigen.c:3843 pex64igen.c:3843
 #, c-format
 msgid ".rsrc merge failure: duplicate string resource: %d"
 msgstr ""
 
-#: peigen.c:3976 pepigen.c:3976 pex64igen.c:3976
+#: peigen.c:3978 pepigen.c:3978 pex64igen.c:3978
 msgid ".rsrc merge failure: multiple non-default manifests"
 msgstr ""
 
-#: peigen.c:3994 pepigen.c:3994 pex64igen.c:3994
+#: peigen.c:3996 pepigen.c:3996 pex64igen.c:3996
 msgid ".rsrc merge failure: a directory matches a leaf"
 msgstr ""
 
-#: peigen.c:4036 pepigen.c:4036 pex64igen.c:4036
+#: peigen.c:4038 pepigen.c:4038 pex64igen.c:4038
 msgid ".rsrc merge failure: duplicate leaf"
 msgstr ""
 
-#: peigen.c:4038 pepigen.c:4038 pex64igen.c:4038
+#: peigen.c:4040 pepigen.c:4040 pex64igen.c:4040
 #, c-format
 msgid ".rsrc merge failure: duplicate leaf: %s"
 msgstr ""
 
-#: peigen.c:4104 pepigen.c:4104 pex64igen.c:4104
-msgid ".rsrc merge failure: dirs with differing characteristics\n"
+#: peigen.c:4106 pepigen.c:4106 pex64igen.c:4106
+msgid ".rsrc merge failure: dirs with differing characteristics"
 msgstr ""
 
-#: peigen.c:4111 pepigen.c:4111 pex64igen.c:4111
-msgid ".rsrc merge failure: differing directory versions\n"
+#: peigen.c:4113 pepigen.c:4113 pex64igen.c:4113
+msgid ".rsrc merge failure: differing directory versions"
 msgstr ""
 
 #. Corrupted .rsrc section - cannot merge.
-#: peigen.c:4228 pepigen.c:4228 pex64igen.c:4228
-msgid "%B: .rsrc merge failure: corrupt .rsrc section"
+#: peigen.c:4230 pepigen.c:4230 pex64igen.c:4230
+#, c-format
+msgid "%pB: .rsrc merge failure: corrupt .rsrc section"
 msgstr ""
 
-#: peigen.c:4236 pepigen.c:4236 pex64igen.c:4236
-msgid "%B: .rsrc merge failure: unexpected .rsrc size"
+#: peigen.c:4238 pepigen.c:4238 pex64igen.c:4238
+#, c-format
+msgid "%pB: .rsrc merge failure: unexpected .rsrc size"
 msgstr ""
 
-#: peigen.c:4375 pepigen.c:4375 pex64igen.c:4375
-msgid "%B: unable to fill in DataDictionary[1] because .idata$2 is missing"
+#: peigen.c:4377 pepigen.c:4377 pex64igen.c:4377
+#, c-format
+msgid "%pB: unable to fill in DataDictionary[1] because .idata$2 is missing"
 msgstr ""
 
-#: peigen.c:4395 pepigen.c:4395 pex64igen.c:4395
-msgid "%B: unable to fill in DataDictionary[1] because .idata$4 is missing"
+#: peigen.c:4397 pepigen.c:4397 pex64igen.c:4397
+#, c-format
+msgid "%pB: unable to fill in DataDictionary[1] because .idata$4 is missing"
 msgstr ""
 
-#: peigen.c:4416 pepigen.c:4416 pex64igen.c:4416
-msgid "%B: unable to fill in DataDictionary[12] because .idata$5 is missing"
+#: peigen.c:4418 pepigen.c:4418 pex64igen.c:4418
+#, c-format
+msgid "%pB: unable to fill in DataDictionary[12] because .idata$5 is missing"
 msgstr ""
 
-#: peigen.c:4436 pepigen.c:4436 pex64igen.c:4436
+#: peigen.c:4438 pepigen.c:4438 pex64igen.c:4438
+#, c-format
 msgid ""
-"%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because ."
+"%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because ."
 "idata$6 is missing"
 msgstr ""
 
-#: peigen.c:4478 pepigen.c:4478 pex64igen.c:4478
+#: peigen.c:4480 pepigen.c:4480 pex64igen.c:4480
+#, c-format
 msgid ""
-"%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because ."
+"%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because ."
 "idata$6 is missing"
 msgstr ""
 
-#: peigen.c:4503 pepigen.c:4503 pex64igen.c:4503
-msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing"
+#: peigen.c:4505 pepigen.c:4505 pex64igen.c:4505
+#, c-format
+msgid "%pB: unable to fill in DataDictionary[9] because __tls_used is missing"
 msgstr ""