Merging upstream version 0.73.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

34 files changed, 5659 insertions, 3122 deletions

diff --git a/po/bin/ace.po b/po/bin/ace.po
index e17a985..efc5a5f 100644
--- a/po/bin/ace.po
+++ b/po/bin/ace.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.63\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -271,39 +271,39 @@ msgid ""
 "input: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
 "Po4a::Man manpage to see how po4a can handle new macros."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -317,7 +317,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -331,7 +331,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -341,11 +341,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -355,21 +355,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -401,22 +401,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr ""
@@ -430,67 +430,67 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -502,7 +502,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -620,26 +620,26 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -647,56 +647,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr ""
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr ""
 
@@ -744,109 +744,117 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -888,43 +896,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -932,12 +948,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -947,17 +963,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/af.po b/po/bin/af.po
index fd2e613..a527352 100644
--- a/po/bin/af.po
+++ b/po/bin/af.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2005-02-25 20:19+0100\n"
 "Last-Translator: Theuns Smuts\n"
 "Language-Team: Afrikaans <ubuntu-l10n-af@lists.launchpad.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -289,39 +289,39 @@ msgid ""
 "input: %s"
 msgstr "Ontsnap volgorde \\c tee gekom. Dit word nog nie hanteer nie."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, fuzzy, perl-format
 msgid "Unparsable line: %s"
 msgstr "Onbekende opsie: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
 "Po4a::Man manpage to see how po4a can handle new macros."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nie-ondersteunde lettertipe in:  '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -335,7 +335,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -349,7 +349,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -359,11 +359,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -373,21 +373,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -420,22 +420,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Kan nie skryf na %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Kan nie %s: %s oopmaak nie"
@@ -450,71 +450,71 @@ msgstr "Kan nie skryf na 'n lêer sonder 'n naam nie"
 msgid "Parse error at: -->%s<--"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Kan nie skryf na 'n lêer sonder 'n naam nie"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Kan nie skryf na %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Kan nie skryf na 'n lêer sonder 'n naam nie"
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Kan nie %s: %s oopmaak nie"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Kan nie %s: %s oopmaak nie"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Kan nie %s: %s oopmaak nie"
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -526,7 +526,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -644,27 +644,27 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, fuzzy, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "Ongebalanseer '<' en '>'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, fuzzy, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Onbekende opsie: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 msgid "Cannot read from file without having a filename"
 msgstr "Kan nie skryf na 'n lêer sonder 'n naam nie"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -672,56 +672,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, fuzzy, perl-format
 msgid "unknown environment: '%s'"
 msgstr "Onbekende opsie: %s"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, fuzzy, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "Onbekende opsie: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, fuzzy, perl-format
 msgid "Command '%s': %s"
 msgstr "Kan nie %s: %s oopmaak nie"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr ""
 
@@ -770,109 +770,117 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Kan nie %s: %s oopmaak nie"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Kan nie skryf na %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -914,43 +922,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -958,12 +974,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -973,17 +989,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/ar.po b/po/bin/ar.po
index da21326..37eb95f 100644
--- a/po/bin/ar.po
+++ b/po/bin/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.55\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2019-01-06 15:05+0000\n"
 "Last-Translator: mohammadA <mohammadAbdulhadi1@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/po4a/po4a/ar/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "تعذر تحليل تعريف الماكرو: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -316,39 +316,39 @@ msgid ""
 "input: %s"
 msgstr "وجدت سلسلة الخلوص \\c، وهي لا تعامل معاملة كاملة بعد."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "سلسلة '<' أو '>' غير معروفة. الرسالة الخاطئة: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "سطر غير قابل للتحليل: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
 "Po4a::Man manpage to see how po4a can handle new macros."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -362,7 +362,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -376,7 +376,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -386,11 +386,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -400,21 +400,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -446,23 +446,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "تعذر فتح %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot close %s after reading: %s"
@@ -477,71 +477,71 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "تعذر فتح %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "تعذر فتح %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot unlink %s: %s."
 msgstr "تعذر فتح %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot move %s to %s: %s."
 msgstr "تعذر فتح %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -553,7 +553,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -673,26 +673,26 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -700,56 +700,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr ""
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr ""
 
@@ -797,110 +797,118 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "تعذر فتح %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -943,43 +951,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -987,12 +1003,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1002,17 +1018,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/ca.po b/po/bin/ca.po
index c6fb64b..a414226 100644
--- a/po/bin/ca.po
+++ b/po/bin/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2018-11-06 19:39+0100\n"
 "Last-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -321,26 +321,26 @@ msgstr ""
 "S'ha trobat la seqüència d'escapada \\c. El seu tractament encara no és "
 "complet."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Etiqueta '<' and '>'sense balancejar al modificador de font. Missatge "
 "d'error: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, fuzzy, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 "Etiqueta '<' and '>'sense balancejar al modificador de font. Missatge "
 "d'error: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "No s'ha pogut analitzar la línia: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -349,17 +349,17 @@ msgstr ""
 "Macro '%s' desconeguda. Elimineu-la del document, o mireu la pàgina de "
 "manual Locale::Po4a::Man per veure com po4a pot tractar noves macros."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, fuzzy, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "No s'ha pogut analitzar el paràmetre '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Font no suportada a: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -373,7 +373,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -387,7 +387,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -397,11 +397,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "La macro .ie ha d'anar seguida d'una macro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -411,7 +411,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -420,7 +420,7 @@ msgstr ""
 "Aquesta pàgina inclou un altre fitxer amb '%s'. No us oblideu de traduir "
 "aquest fitxer ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -429,7 +429,7 @@ msgstr ""
 "Aquesta pàgina utilitza la petició '%s' amb el número de línies com a "
 "paràmetre. Això no està suportat (encara)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -473,23 +473,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "No s'ha pogut llegir de %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -506,72 +506,72 @@ msgstr "No es pot escriure a un fitxer sense nom"
 msgid "Parse error at: -->%s<--"
 msgstr "Línia estranya: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "No es pot escriure a un fitxer sense nom"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "No s'ha pogut escriure a %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "No es pot escriure a un fitxer sense nom"
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "No s'ha pogut tancar %s després d'escriure: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "No s'ha pogut esborrar %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "No s'ha pogut moure %s a %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definit més d'una vegada: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -590,7 +590,7 @@ msgstr ""
 "%s\n"
 " S'ha descartat la traducció vella."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -726,29 +726,29 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "%s desbalancejats a '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 "Error mentre es comprovava el nombre de paràmetres de la comanda '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Comanda desconeguda: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "No es pot llegir d'un fitxer sense nom"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -756,17 +756,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "No es pot utilitzar un alias a la comanda desconeguda '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -775,39 +775,39 @@ msgstr ""
 "Estàs fent servir el format de definicions antic (%s).Si us plau actualitza "
 "aquesta línia definició."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "entorn desconegut: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "final de l'entorn '%s' desaparellat"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Nombre de paràmetres incorrecte per a la comanda '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "S'ha passat un paràmetre opcional, però se n'esperava un d'obligatori."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Comanda '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: format no suportat: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "El primer paràmetre de \\begin és obligatori."
 
@@ -856,57 +856,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "No s'ha pogut tancar %s després d'escriure: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "No s'ha pogut llegir una capçalera po4a de %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "La primera línia de %s no sembla ser una capçalera po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Error de sintaxi a la capçalera po4a de %s, prop de \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Paràmetre invàlid en la capçalera po4a de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "La capçalera po4a de %s no defineix el mode."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -918,58 +926,58 @@ msgstr ""
 "Mode invàlid a la capçalera po4a de %s: hauria de ser 'before' o 'after', no "
 "%s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "La capçalera po4a de %s no defineix la posició."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "No es dóna límit al final en la capçalera po4a, però mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "No es dóna límit al final en la capçalera po4a, però mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "No es pot aplicar l'annex si no s'especifica el nom del fitxer"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "L'annex %s no existeix."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "No s'ha trobat cap posició candidata per l'annex %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "S'ha trobat més d'una posició candidata per l'annex %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "S'ha aplicat l'annex '%s' abans d'aquesta la línia: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "S'ha aplicat l'annex '%s' després de la línia: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "S'ha aplicat l'annex '%s' al final del fitxer."
@@ -1014,14 +1022,22 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Error intern: identificador de tipus '%s' desconegut."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, fuzzy, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1030,32 +1046,32 @@ msgstr ""
 "S'ha trobat el tag de tancament </%s> inesperat. Pot ser que el document "
 "principal sigui incorrecte."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "S'ha trobat el tag de tancament </%s> inesperat. Pot ser que el document "
 "principal sigui incorrecte."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, fuzzy, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "Sintaxi d'atribut incorrecta"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, fuzzy, perl-format
 #| msgid "Bad attribute syntax"
 msgid "%s: Bad attribute syntax"
 msgstr "Sintaxi d'atribut incorrecta"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1063,12 +1079,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1078,17 +1094,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/cs.po b/po/bin/cs.po
index a140c76..3a6be91 100644
--- a/po/bin/cs.po
+++ b/po/bin/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.43-1\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2020-08-05 11:04+0000\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/po4a/po4a/cs/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Nepodařilo se přečíst definici makra: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -329,23 +329,23 @@ msgstr ""
 "Vyskytla se escape sekvence \\c. Tato možnost ještě není úplně "
 "implementována."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Špatně spárované znaky '<' a '>' v modifikátoru písma. Chybná zpráva: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Špatně spárované znaky '<' a '>'. Chybná zpráva: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Neanalyzovatelný řádek: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -355,17 +355,17 @@ msgstr ""
 "manuálovou stránku Locale::Po4a::Man, kde se dočtete, jak v po4a pracovat s "
 "novými makry."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Nelze zpracovat argumenty příkazu: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nepodporované písmo v: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -379,7 +379,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -393,7 +393,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -403,11 +403,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Makro .ie musí být následováno makrem .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -417,7 +417,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -426,7 +426,7 @@ msgstr ""
 "Do této stránky je vložen jiný soubor '%s'. Nezapomeňte přeložit tento "
 "soubor ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -435,7 +435,7 @@ msgstr ""
 "Tato stránka používá požadavek '%s' s počtem řádků v argumentu. Toto není v "
 "současné době podporováno."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -479,23 +479,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "Nelze číst z %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -510,56 +510,56 @@ msgstr "Zprávy s více jak dvěma formami množného čísla nejsou podporován
 msgid "Parse error at: -->%s<--"
 msgstr "Chyba v analýze: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Nelze zapisovat do souboru bez názvu"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Nelze zapisovat do %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 #| msgid "Can't write PO files with more than two plural forms."
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Není možné ukládat soubory PO s více jak dvěma formami množného čísla."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Nelze uzavřít %s po zápisu: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't unlink %s: %s."
 msgid "Cannot unlink %s: %s."
 msgstr "Není možné oddělit %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't move %s to %s: %s."
 msgid "Cannot move %s to %s: %s."
 msgstr "Nelze přesunout %s do %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 "'%s' je zpráva v jednotném čísle, po4a použije u překladu msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -575,12 +575,12 @@ msgid ""
 msgstr ""
 "'%s' je zpráva v jednotném čísle, po4a použije u překladu msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definováno dvakrát: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -599,7 +599,7 @@ msgstr ""
 "%s\n"
 " Původní překlad zahozen."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -748,28 +748,28 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "nevyvážený %s v '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Chyba při ověřování počtu argumentů příkazu '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Neznámý příkaz: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Nelze číst ze souboru, který nemá název"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -777,17 +777,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich nenalezl %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Nelze použít alias k neznámému příkazu '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -796,39 +796,39 @@ msgstr ""
 "Používáte zastaralý formát definic (%s).  Aktualizujte prosím tento "
 "definiční řádek."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "Neznámé prostředí: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "nespárovaný konec prostředí '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Špatný počet argumentů pro příkaz '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Byl zadán nepovinný argument, ale je očekáván povinný."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Příkaz '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: nepodporovaný formát: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "První argument u \\begin je povinný."
 
@@ -876,57 +876,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Nelze uzavřít %s po zápisu: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Nelze načíst hlavičku po4a z %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "První řádek v %s nevypadá jako hlavička po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Syntaktická chyba %s v hlavičce po4a, poblíž \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Neplatný argument v hlavičce po4a v %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Po4a hlavička v %s nedefinuje režim."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -937,58 +945,58 @@ msgid ""
 msgstr ""
 "Neplatný režim %s v po4a hlavičce: má být 'before' nebo 'after' nikoli %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Po4a hlavička v %s nedefinuje pozici."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "V po4a hlavičce nebyla zadána ukončující hranice, nýbrž mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "V po4a hlavičce nebyla zadána ukončující hranice, nýbrž mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Nelze použít dodatek, není-li zadán název souboru"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Dodatek %s neexistuje."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Nebyla nalezena vhodná pozice pro dodatek %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Byla nalezena více než jedna vhodná pozice pro dodatek %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Dodatek '%s' vložen před tento řádek: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Dodatek „%s“ byl vložen za řádek: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Dodatek '%s' vložen na konec souboru."
@@ -1035,7 +1043,15 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Vnitřní chyba: neznámý identifikátor typu '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1044,7 +1060,7 @@ msgstr ""
 "Špatný typ dokumentu. Je očekáván '%s'. Opravu můžete provést volbou -o  "
 "doctype, ignorovat kontrolu můžete pomocí -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1053,31 +1069,31 @@ msgstr ""
 "Nalezena neočekávaná ukončovací značka </%s>. Hlavní dokument může být "
 "chybný.  Pokračuji…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Byla nalezena neočekávaná ukončovací značka </%s>. Hlavní dokument může být "
 "chybný."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, fuzzy, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Špatná syntaxe atributu.  Pokračuji…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Špatná syntaxe atributu"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1085,12 +1101,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1100,7 +1116,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1109,10 +1125,10 @@ msgstr ""
 "Volba '%s' je zastaralá. Použijte prosím kategorie translated/untranslated "
 "and/or break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Označit '%s' v obou (%s a %s) kategoriích."
diff --git a/po/bin/de.po b/po/bin/de.po
index 1c90dda..bde9c0b 100644
--- a/po/bin/de.po
+++ b/po/bin/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.71\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
-"PO-Revision-Date: 2024-05-13 18:55+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
+"PO-Revision-Date: 2024-06-13 19:34+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -40,7 +40,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Makrodefinition kann nicht interpretiert werden: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -327,24 +327,24 @@ msgstr ""
 "Escape-Sequenz \\c angetroffen. Dies wird noch nicht komplett unterstützt. "
 "Fehlerhafte Eingabe: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Ungleiche Anzahl von Zeichen »<« und »>« in einem Schrift-Modifikator. "
 "Fehlerhafte Meldung: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Unbekannte Abfolge von »<« und »>«. Fehlerhafte Meldung: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Nicht-interpretierbare Zeile: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -354,17 +354,17 @@ msgstr ""
 "einen Blick in die Handbuchseite von Locale::Po4a::Man, um herauszufinden, "
 "wie po4a mit neuen Makros umgehen kann."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Befehlsargumente konnten nicht interpretiert werden: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nicht unterstützte Schrift in: '%s'"
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -388,7 +388,7 @@ msgstr ""
 "Bitte lesen Sie die Handbuchseite von Locale::Po4a::Man für weitere "
 "Informationen über diese Parameter.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -412,7 +412,7 @@ msgstr ""
 "Bitte lesen Sie die Handbuchseite von Locale::Po4a::Man für weitere "
 "Informationen über diese Parameter.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -427,11 +427,11 @@ msgstr ""
 "ist nicht sehr robust. »%s« zeigt diese Makros den Übersetzern, aber Groff-"
 "Makros sind für Übersetzer nicht sehr anwendungsfreundlich."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Das ».el«-Makro muss auf ein ».ie«-Makro folgen."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -447,7 +447,7 @@ msgstr ""
 "Übersetzern, aber Groff-Makros sind für Übersetzer nicht sehr "
 "anwendungsfreundlich."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -456,7 +456,7 @@ msgstr ""
 "Diese Seite verweist auf eine andere Datei mit »%s«. Vergessen Sie nicht, "
 "diese Datei zu übersetzen (»%s«)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -465,7 +465,7 @@ msgstr ""
 "Diese Seite verwendet die »%s«-Anfrage mit den Zeilennummern in den "
 "Argumenten. Das wird noch nicht unterstützt."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -505,14 +505,14 @@ msgstr ""
 "Ungültige PO-Datei %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "%s kann nicht gelesen werden: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -521,8 +521,8 @@ msgstr ""
 "Die Datei %s beginnt mit einem BOM-Zeichen, das anzeigt, dass die Datei "
 "UTF-8 ist, aber Sie haben stattdessen %s angegeben."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "%s kann nach dem Lesen nicht geschlossen werden: %s"
@@ -536,16 +536,16 @@ msgstr "Nachrichten mit mehr als zwei Pluralformen werden nicht unterstützt."
 msgid "Parse error at: -->%s<--"
 msgstr "Auswertefehler bei: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "In eine Datei ohne Dateiname kann nicht geschrieben werden."
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Schreiben nach %s nicht möglich: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -554,33 +554,33 @@ msgstr ""
 "msgmerge leidet unter einigen Fehlern wenn PO-Dateien nicht als UTF-8 "
 "kodiert sind; Kodiere %s in UTF-8 (war %s), um das Problem zu umgehen.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "PO-Dateien mit mehr als zwei Pluralformen können nicht geschrieben werden."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "%s kann nach Beschreiben nicht geschlossen werden: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "%s kann nicht gelöscht werden: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Verschieben von %s nach %s nicht möglich: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Auswertung des bereitgestellten Filters fehlgeschlagen: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -589,7 +589,7 @@ msgstr ""
 "»%s« ist die Singularform einer Nachricht; po4a wird die msgstr[0]-"
 "Übersetzung verwenden (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -598,12 +598,12 @@ msgstr ""
 "»%s« ist die Pluralform einer Nachricht; po4a wird die msgstr[1]-Übersetzung "
 "verwenden (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid wurde doppelt definiert: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -622,7 +622,7 @@ msgstr ""
 "%s\n"
 " Alte Übersetzung wurde verworfen."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -774,26 +774,26 @@ msgstr ""
 "Argumenten erneut aus:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "ungleichmäßiges %s in »%s«"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Fehler beim Prüfen der Anzahl der Argumente des Befehls »%s«: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Unbekannter Befehl: »%s«"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Ohne den Dateinamen zu haben kann nicht von einer Datei gelesen werden"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -804,17 +804,17 @@ msgstr ""
 "Datei einbezogen wird, fügen Sie entweder auf der Befehlszeile oder in Ihrer "
 "po4a.conf-Datei »-o exclude_include=%s« hinzu."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich kann %s nicht finden"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Für den unbekannten Befehl »%s« kann kein Alias verwendet werden"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -823,41 +823,41 @@ msgstr ""
 "Sie verwenden das alte Definitionsformat (%s). Bitte aktualisieren Sie diese "
 "Definitionszeile."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "Unbekannte Umgebung: »%s«"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "Unpassendes Ende der Umgebung »%s«"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Falsche Anzahl von Argumenten des Befehls »%s«."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Ein optionales Argument wurde übergeben, aber ein Pflichtargument wurde "
 "erwartet."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Befehl »%s«: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: Nicht unterstütztes Format: »%s«."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Das erste Argument von \\begin ist verbindlich."
 
@@ -923,58 +923,74 @@ msgstr ""
 "Fehlerhaft abgeschlossener div-Block: Der bei %s beginnende Block wird nicht "
 "vor dem Ende der Datei abgeschlossen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
-msgstr "Missgebildete Kodierung beim Lesen von Datei %s mit Zeichensatz %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
+msgstr ""
+"Fehlerhafter Kodierungsblock beim Lesen von Datei %s mit Zeichensatz %s: %s\n"
+"Falls %s nicht der erwartete Zeichensatz ist, müssen Sie den richtigen "
+"mittels --master-charset oder ähnlicher Schalter konfigurieren."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Missgebildete Kodierung beim Schreiben des Zeichens »%s« in Datei %s mit "
-"Zeichensatz %s: %s"
+"Fehlerhafter Kodierungsblock beim Schreiben von Zeichen »%s« in Datei %s mit "
+"Zeichensatz %s: %s\n"
+"Falls %s nicht der erwartete Zeichensatz ist, müssen Sie den richtigen "
+"mittels --localized-charset oder ähnlicher Schalter konfigurieren."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Missgebildete Kodierung beim Schreiben in Datei %s mit Zeichensatz %s: %s"
+"Fehlerhafter Kodierungsblock beim Schreiben in Datei %s mit Zeichensatz %s: "
+"%s\n"
+"Falls %s nicht der erwartete Zeichensatz ist, müssen Sie den richtigen "
+"mittels --localized-charset oder ähnlicher Schalter konfigurieren."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "%s kann nach Beschreiben nicht geschlossen werden: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Die po4a-Kopfzeilen von %s können nicht gelesen werden."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Die erste Zeile von %s scheint keine po4a-Kopfzeile zu sein."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Syntax-Fehler in den po4a-Kopfzeilen von %s nahe bei »%s«"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Ungültiges Argument in den po4a-Kopfzeilen von %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Die po4a-Kopfzeilen von %s geben keinen Modus an."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -983,55 +999,55 @@ msgstr ""
 "Ungültiger Modus in den po4a-Kopfzeilen von %s: sollte »before«, »after« "
 "oder »eof« sein, stattdessen ist er »%s«."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Die po4a-Kopfzeilen von %s geben keine Position an."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 "Keine Endbgrenzung in den po4a-Kopfzeilen angegeben, aber Modus=»after«."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Beim Mode=eof wird keine Position benötigt."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Keine Endbegrenzung benötigt, wenn mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Kann das Addendum nicht anfügen, wenn kein Dateiname angegeben ist"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Addendum %s existiert nicht."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Keine bevorzugte Position für das Addendum %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Mehr als eine bevorzugte Position für das Addendum %s gefunden."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Addendum »%s« wurde vor dieser Zeile angefügt: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Addendum »%s« wurde nach dieser Zeile angefügt: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Addendum »%s« wurde am Ende der Datei angefügt."
@@ -1077,7 +1093,19 @@ msgstr ">>> Dateiname = »%s«"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Interner Fehler: Unbekannter Typidentifikator »%s«."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Die Datei %s erklärt %s als Kodierung, aber Sie haben %s als "
+"Hauptzeichensatz bereitgestellt. Bitte ändern Sie eine der Einstellungen, da "
+"sie in Perl wirklich verschieden Kodierungen sind. Siehe https://perldoc."
+"perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1087,7 +1115,7 @@ msgstr ""
 "beheben, indem Sie eine »-o doctype«-Option angeben oder Sie ignorieren "
 "diese Prüfung mit »-o doctype=\"\"«."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1096,14 +1124,14 @@ msgstr ""
 "Nicht erwartete schließende Markierung </%s> gefunden. Das Hauptdokument ist "
 "möglicherweise falsch. Es wird fortgefahren …"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Nicht erwartete schließende Markierung </%s> gefunden. Das Hauptdokument ist "
 "möglicherweise falsch."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1112,17 +1140,17 @@ msgstr ""
 "%s: Attribut »%s« ist nicht in den Moduloptionen »attributes« definiert\n"
 "und … ist nicht für den Attributpfad »%s« übersetzt"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Ungültige Attributsyntax. Es wird fortgefahren …"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Ungültige Attributsyntax"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1133,13 +1161,13 @@ msgstr ""
 " *** die ursprüngliche Übersetzungsoption ist hier außer Kraft gesetzt, da "
 "der Elternpfad=»%s« nicht übersetzt ist,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: Einstellung foldattributes ignoriert, da »%s« keine Inline-Markierung ist"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1154,7 +1182,7 @@ msgstr ""
 "\n"
 "Bitte korrigieren Sie Ihre Übersetzung."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1163,10 +1191,10 @@ msgstr ""
 "Die »%s«-Option ist veraltet. Bitte verwenden Sie die Kategorien »translated/"
 "untranslated« und/oder »break/inline/placeholder«."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Markierung »%s« ist in den Kategorien %s und %s enthalten."
@@ -1815,6 +1843,23 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "PO-Datei konnte nicht kopiert werden (%s → %s): %s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Missgebildete Kodierung beim Lesen von Datei %s mit Zeichensatz %s: %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Missgebildete Kodierung beim Schreiben des Zeichens »%s« in Datei %s mit "
+#~ "Zeichensatz %s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Missgebildete Kodierung beim Schreiben in Datei %s mit Zeichensatz %s: %s"
+
+#, perl-format
 #~ msgid ""
 #~ "Force the encoding of %s to UTF-8 (was %s), as mixing encodings may break "
 #~ "msgmerge.\n"
diff --git a/po/bin/eo.po b/po/bin/eo.po
index ee59725..41fefa2 100644
--- a/po/bin/eo.po
+++ b/po/bin/eo.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2022-08-19 18:30+0200\n"
 "Last-Translator: phlostically <phlostically@mailinator.com>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/po4a/po4a/eo/"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -45,7 +45,7 @@ msgstr "Nevalida kongrueca opcio: \"%s\". Ĝi devas esti aŭ \"%s\" aŭ \"%s\"."
 msgid "Unable to parse macro definition: %s"
 msgstr "Nekapabla analizi makro-difinon: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -325,22 +325,22 @@ msgid ""
 msgstr ""
 "Kodŝanĝa sekvenco \\c renkontita. Ĉi tio ankoraŭ ne estas tute traktata."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Senpara '<' kaj '>' en tipara modifilo. Erara mesaĝo: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Nekonata '<' aŭ '>' en vico. Erara mesaĝo: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Neanalizebla linio: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -349,17 +349,17 @@ msgstr ""
 "Nekonata makroo \"%s\". Forigu ĝin el la dokumento, aŭ konsultu la manlibran "
 "paĝon Locale::Po4a::Man por vidi kiel po4a povas trakti novajn makroojn."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Ne eblas analizi komandoparamterojn: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nesubtenata tiparo en: \"%s\"."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, fuzzy, perl-format
 #| msgid ""
 #| "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -392,7 +392,7 @@ msgstr ""
 "Bonvolu konsulti la manpaĝon de Locale::Po4a::Man por pliaj informoj pri ĉi "
 "tiuj parametroj.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -415,7 +415,7 @@ msgstr ""
 "Bonvolu konsulti la manpaĝon de Locale::Po4a::Man por pliaj informoj pri ĉi "
 "tiuj parametroj.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -430,11 +430,11 @@ msgstr ""
 "ĉi tiujn makroojn al la tradukistoj, sed groff-makrooj ne estas facile "
 "uzeblaj por tradukistoj."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "La makroo .ie estas sekvenda de makroo .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -449,7 +449,7 @@ msgstr ""
 "montras ĉi tiujn makroojn al la tradukistoj, sed groff-makrooj ne estas "
 "uzeblaj por tradukistoj."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -458,7 +458,7 @@ msgstr ""
 "La paĝo inkluzivas alian dosieron kun \"%s\". Ne forgesu traduki ĉi tiun "
 "dosieron (\"%s\")."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -467,7 +467,7 @@ msgstr ""
 "La paĝo uzas la peton \"%s\" kun la nombro da linioj en parametro. Tio "
 "ankoraŭ ne estas subtenata."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -507,22 +507,22 @@ msgstr ""
 "Nevalida po dosiero %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Ne eblas legi el %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Ne povas fermi %s leginte: %s"
@@ -536,49 +536,49 @@ msgstr "Mesaĝoj kun pli ol 2 pluralformoj ne estas subtenataj."
 msgid "Parse error at: -->%s<--"
 msgstr "Eraro de analizo ĉe: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Ne eblas skribi al dosiero sen dosiernomo"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Ne eblas skribi al %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Ne eblas skribi PO-dosierojn kun pli ol du pluralformoj."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Cannot close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Ne povas fermi %s skribinte: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Ne eblas forigi %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Ne eblas movi %s al %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Taksado de la provizita filtrilo malsukcesis: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -586,7 +586,7 @@ msgid ""
 msgstr ""
 "\"%s\" estas la singularo de mesaĝo, po4a uzos la tradukon msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -594,12 +594,12 @@ msgid ""
 msgstr ""
 "\"%s\" estas la pluralo de mesaĝo, po4a uzos la tradukon msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definita dufoje: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -618,7 +618,7 @@ msgstr ""
 "%s\n"
 " Malnova traduko preterlasita."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -758,26 +758,26 @@ msgstr ""
 "Por vidi la erarmesaĝon, relanĉi po4a kun ĉi tiu aldona argumento:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "nebalancita %s en \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Eraro dum kontrolado de la parametronombro de la komando \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Nekonata komando: \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Ne povas legi el dosiero sen posedo de dosiernomo"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -785,17 +785,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich ne povas trovi %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Ne povas uzi aliason al la nekonata komando \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -804,39 +804,39 @@ msgstr ""
 "Vi uzas la malnovan formon de difinoj (%s). Bonvolu ĝisdatigi ĉi tiun "
 "difinlinion."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "nekonata medio: \"%s\""
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "nekongrua fino de medio \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Malĝusta nombro de parametroj por la komando \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Nedeviga parametro estis donita, sed iu deviga estas atendita."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Komando \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "registra_genera_komando: nesubtenata formo: \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "La unua parametro de \\begin estas deviga."
 
@@ -896,55 +896,63 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Ne povas fermi %s skribinte: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Ne povas legi po4a-kapon de %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Unua linio de %s ne aspektas kia po4a-kapo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Sintaksa eraro en po4a-kapo de %s, apud \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Nevalida parametro en la po4a-kapo de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "La po4a-kapo de %s ne difinas la reĝimon."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -953,54 +961,54 @@ msgstr ""
 "Reĝimo nevalida en la po4a-kapo de %s: estu 'before' (antaŭe), "
 "'after' (malantaŭe) aŭ 'eof' (fino de dosiero). Anstataŭe, ĝi estas \"%s\"."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "La po4a-kapo de %s ne difinas la pozicion."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Neniu finanta limo donita en la po4a-kapo, sed reĝimo=after malantaŭe."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Ne necesas pozicio kiam mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Neniu fina limo necesas kiam mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Ne povas apliki la aldonon sen donita dosiernomo"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Aldono %s ne ekzistas."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Neniu kandidatpozicio por la aldono %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Pli ol unu kandidatpozicio trovita por la aldono %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Aldono \"%s\" aplikita antaŭ la linio: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Aldono \"%s\" aplikita post la linio: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Aldono \"%s\" aplikita je la fino de la dosiero."
@@ -1044,7 +1052,15 @@ msgstr ">>> dosiernomo = \"%s\""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Interna eraro: nekonata tipindentigilo \"%s\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1053,7 +1069,7 @@ msgstr ""
 "Malbona dokumentotipo. \"%s\" atendita. Vi povas ripari ĉi tiun averton per "
 "opcio -o doctyoe, aŭ ignori ĉi tiun kontrolon per -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1062,13 +1078,13 @@ msgstr ""
 "Neatendita ferma marko </%s> trovita. La ĉefa dokumento povus esti malbona. "
 "Daŭrigas…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Neatendita ferma marko </%s> trovita. La ĉefa dokumento povus esti malbona."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1077,17 +1093,17 @@ msgstr ""
 "%s: atributo \"%s\" ne estas difinita en modula opcio 'atributoj' kaj\n"
 ".... ne estas tradukita por la atributvojo \"%s\" "
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Malbona atributsintakson. Daŭrigas…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Malbona atributsintakson"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1098,13 +1114,13 @@ msgstr ""
 "  *** la originala tradukopcio estas anstataŭigita ĉi tie, ĉar gepatra "
 "vojo=\"%s\" estas netradukita,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: agordo de \"foldattributes\" ignorita ĉar \"%s\" ne estas enreta etikedo"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1119,7 +1135,7 @@ msgstr ""
 "\n"
 "Bonvolu ripari vian tradukon."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1128,10 +1144,10 @@ msgstr ""
 "La opcio \"%s\" estas malrekomendata. Bonvolu uzi la kategoriojn tradukitaj/"
 "netradukitaj kaj/aŭ salto/enlinia/lokokupilo."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Marko \"%s\" en ambaŭ kategorioj %s kaj %s."
diff --git a/po/bin/es.po b/po/bin/es.po
index 3619fbb..23715e5 100644
--- a/po/bin/es.po
+++ b/po/bin/es.po
@@ -29,8 +29,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po4a bin 0.43\n"
-"Report-Msgid-Bugs-To: martin.quinson@debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-05-24 11:09+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/po4a/po4a/es/>\n"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "No se pudo analizar la definición de macro: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -347,24 +347,24 @@ msgstr ""
 "Código de control \\c encontrado. Esto aún no es totalmente compatible. "
 "Entrada incorrecta: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "'<' y '>' no equilibrados en el modificador de tipografía. Mensaje del "
 "fallo: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "La secuencia '<' or '>' es desconocida. Mensaje del fallo: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "La línea no se puede analizar: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -373,17 +373,17 @@ msgstr ""
 "La macro '%s' es desconocida. Elimínela del documento, o consulte la página "
 "de manual Locale::Po4a::Man para ver cómo po4a puede tratar nuevas macros."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "No se han podido analizar los argumentos de la orden: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Tipografía no compatible en: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -406,7 +406,7 @@ msgstr ""
 "Refiérase al manpage de Locale::Po4a::Man para más información sobre estos "
 "parámetros.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -429,7 +429,7 @@ msgstr ""
 "Refiérase al manpage de Locale::Po4a::Man para más información sobre estos "
 "parámetros.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -444,11 +444,11 @@ msgstr ""
 "muestra estas macros a los traductores, pero las macros groff no son "
 "sencillas de utilizar para los traductores."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "La macro '.ie' debe ir seguida de una macro '.el'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -463,7 +463,7 @@ msgstr ""
 "robusto. '%s' muestra estas macros a los traductores, pero las macros groff "
 "no son sencillas de utilizar para los traductores."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -472,7 +472,7 @@ msgstr ""
 "Esta página incluye otro fichero con '%s'. No se olvide de traducir este "
 "fichero ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -481,7 +481,7 @@ msgstr ""
 "Esta página utiliza la petición '%s' con los números de línea como "
 "argumento. Esto no está soportado (aún)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -521,14 +521,14 @@ msgstr ""
 "Archivo po no válido %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "No se ha podido leer desde %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -537,8 +537,8 @@ msgstr ""
 "El archivo %s comienza con un carácter BOM que indica que su codificación es "
 "UTF-8, pero usted especificó %s en su lugar."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "No se pudo cerrar %s después de leer: %s"
@@ -552,16 +552,16 @@ msgstr "Los mensajes con más de dos plurales no están soportados."
 msgid "Parse error at: -->%s<--"
 msgstr "Error de análisis en: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "No se puede escribir en un fichero sin nombre"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "No se pudo escribir en %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -570,32 +570,32 @@ msgstr ""
 "msgmerge sufre algunos errores cuando los ficheros PO no están codificados "
 "en UTF-8; Recodificando %s a UTF-8 (era %s) para evitar el problema.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "No se puede escribir en ficheros PO con más de dos formas del plural."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "No se puede cerrar %s después de escribir: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "No se pudo deshacer el enlace %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "No se ha podido mover %s a %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Falló la evaluación del filtro dado: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -604,7 +604,7 @@ msgstr ""
 "'%s' es la forma singular de un mensaje, po4a usará la traducción presente "
 "en msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -613,12 +613,12 @@ msgstr ""
 "'%s' es la forma plural de un mensaje, po4a usará la traducción presente en "
 "msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "Se ha definido msgid dos veces: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -637,7 +637,7 @@ msgstr ""
 "%s\n"
 " Se ha descartado la traducción anterior."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -786,26 +786,26 @@ msgstr ""
 "argumento adicional:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "%s no equilibrado en '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Error al comprobar el número de parámetros de la orden '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Orden desconocida: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "No se puede leer de un fichero sin nombre de fichero"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -816,17 +816,17 @@ msgstr ""
 "fichero, añada '-o exclude_include=%s' a las opciones, ya sea en la línea de "
 "órdenes o en su fichero po4a.conf."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich no pudo encontrar %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "No se puede usar un alias para la orden desconocida '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -835,39 +835,39 @@ msgstr ""
 "Está usando el formato de definiciones antiguo (%s). Por favor, actualice "
 "ésta línea de definición."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "entorno desconocido: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "final del entorno '%s' sin coincidencia"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "El número de parámetros de la orden '%s' es incorrecto ."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Se ha pasado un parámetro opcional, pero se esperaba uno obligatorio."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Orden '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: formato no compatible: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "El primer parámetro de \\begin es obligatorio."
 
@@ -930,60 +930,63 @@ msgstr ""
 "Bloque cercado div malformado: Bloque iniciado en %s no cerrado antes del "
 "final del archivo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
-"Codificación mal realizada al leer del archivo %s con los caracteres %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Codificación mal realizada al escribir el carácter '%s' en el archivo %s con "
-"el conjunto de caracteres %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Codificación mal realizada al escribir en un archivo %s con juego de "
-"caracteres%s : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "No se pudo cerrar %s después de escribir: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "No se ha podido leer la cabecera de po4a de %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "La primera línea de %s no parece ser una cabecera de po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Error de sintaxis en la cabecera de po4a de %s, cerca de '%s'"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Argumento no válido en la cabecera po4a de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "La cabecera de po4a en %s no define el modo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -992,54 +995,54 @@ msgstr ""
 "Modo inválido en la cabecera po4a de %s: debería ser 'before', 'after' o "
 "'eof' en lugar de '%s'."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "La cabecera de po4a de %s no define la posición."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "No se da límite para el final en la cabecera po4a, sino 'mode=after'."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "No se requiere posición cuando mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "No se requiere límite para el final cuando 'mode=eof'."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "No se puede aplicar el apéndice si no se da el nombre del fichero"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "El apéndice %s no existe."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "No hay posición candidata para el apéndice %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Se ha encontrado más de una posición candidata para el apéndice %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Se ha aplicado el apéndice '%s' antes de ésta línea: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Se ha aplicado el apéndice '%s' después de la línea: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Se ha aplicado el apéndice '%s' al final del fichero."
@@ -1085,7 +1088,21 @@ msgstr ">>> nombre-archivo = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Error interno: identificador de tipo '%s' desconocido."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"El archivo %s declara %s como codificación, pero usted proporcionó %s como "
+"conjunto de caracteres maestro. Por favor, cambie cualquiera de las dos "
+"opciones."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1094,7 +1111,7 @@ msgstr ""
 "El tipo de documento es erróneo, se esperaba '%s'. Puede arreglar este aviso "
 "con la opción '-o doctype', o ignorar esta revisión con'-o doctype=\"\"'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1103,14 +1120,14 @@ msgstr ""
 "La etiqueta de cierre </%s> no se esperaba. Puede que el documento principal "
 "sea incorrecto. Continuando…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "La etiqueta de cierre </%s> no se esperaba. Puede que el documento principal "
 "sea incorrecto."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1120,17 +1137,17 @@ msgstr ""
 "y\n"
 "....  no se ha traducido para la ruta de atributo '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Sintaxis de atributo incorrecta.  Continuando…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Sintaxis de atributo incorrecta"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1141,14 +1158,14 @@ msgstr ""
 " *** La opción de traducción original se ha anulado en este caso ya que la "
 "ruta raíz='%s' no se ha traducido,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: Se ha ignorado el ajuste de foldattributes ya que '%s' no es una "
 "etiqueta en línea"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1163,7 +1180,7 @@ msgstr ""
 "\n"
 "Por favor, corrija su traducción."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1172,10 +1189,10 @@ msgstr ""
 "La opción '%s' es obsoleta. Use las categorías 'translated/untranslated' y/o "
 "'break/inline/placeholder'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "La etiqueta '%s' se encuentra en las categorías '%s' y '%s'."
@@ -1811,6 +1828,25 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "Error al copiar el fichero PO (%s -> %s): %s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Codificación mal realizada al leer del archivo %s con los caracteres %s: "
+#~ "%s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Codificación mal realizada al escribir el carácter '%s' en el archivo %s "
+#~ "con el conjunto de caracteres %s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Codificación mal realizada al escribir en un archivo %s con juego de "
+#~ "caracteres%s : %s"
+
+#, perl-format
 #~ msgid "Cannot find %s with kpsewhich"
 #~ msgstr "No se pudo encontrar %s con kpsewhich"
 
diff --git a/po/bin/et.po b/po/bin/et.po
index e9775d5..23890ed 100644
--- a/po/bin/et.po
+++ b/po/bin/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2021-01-27 03:32+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/po4a/po4a/et/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Makro definitsiooni parsimine nurjus: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -313,22 +313,22 @@ msgid ""
 "input: %s"
 msgstr "Leiti väljumiskäsk \\c. Selle töötlemine ei ole veel lõppenud."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Ebavõrdne '<' ja '>' arv fondi muutjas. Vigane teade: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Tundmatu '<' ja '>' järjekord. Vigane teade: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Mitteparseeritav rida: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -337,17 +337,17 @@ msgstr ""
 "Tundmatu makro '%s'. Eemalda see dokumendist või vaata Locale::Po4a::Man "
 "juhendilehelt, kuidas po4a käsitseb uusi makrosid."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Ei ole võimeline sõeluma käsuargumente: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Mittetoetatav font: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -361,7 +361,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -375,7 +375,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -385,11 +385,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ".ie makrole peab järgnema .el makro."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -399,7 +399,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -408,7 +408,7 @@ msgstr ""
 "Sel lehel on veel üks fail, mis sisaldab '%s'i. Ärge unustage tõlkida seda "
 "faili ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -417,7 +417,7 @@ msgstr ""
 "See leht kasutab '%s' päringut ridade numbriga argumendis. Seda ei toetata "
 "veel."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -463,23 +463,23 @@ msgstr ""
 "Vigane po fail %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "Ei ole võimeline lugema %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -495,75 +495,75 @@ msgstr "Teateid 2 või enama mitmusevormiga ei toetata."
 msgid "Parse error at: -->%s<--"
 msgstr "Imelik rida: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Pole võimeline kirjutama nimeta faili"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Ei saa %s' kirjutada: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 #| msgid "Can't write PO files with more than two plural forms."
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Ei saa kirjutada PO-faile enama kui kahe mitmusevormiga."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Ei saa sulgeda %s' peale kirjutamist: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't unlink %s: %s."
 msgid "Cannot unlink %s: %s."
 msgstr "Ei saa %s'lt linki maha võtta: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't move %s to %s: %s."
 msgid "Cannot move %s to %s: %s."
 msgstr "Ei saa tõsta %s' kohta %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr "'%s' on teate ainsuse vorm, po4a kasutab msgstr[0] tõlget (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr "'%s' on teate mitmuse vorm, po4a kasutab msgstr[1] tõlget (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid defineeriti topelt: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -582,7 +582,7 @@ msgstr ""
 "%s\n"
 " Vana tõlge heideti kõrvale."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -724,28 +724,28 @@ msgstr ""
 "Veateate vaatamiseks käivita po4a selle täiendava argumendiga:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "tasakaalustamata %s '%s's"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Viga käsu '%s' argumentide arvu kontrollimisel: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Tundmatu käsk: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Ei saa lugeda failinimeta failist"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -753,17 +753,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich ei leia %s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Ei saa kasutada aliast tundmatu käsu '%s' jaoks"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -772,39 +772,39 @@ msgstr ""
 "Kasutad vana definitsioonivormingut (%s).  Palun uuenda seda "
 "definitsioonirida."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "tundmatu keskkond: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "ühitamatu keskkonna '%s' lõpp"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Käsule '%s' sobimatu arv argumente."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Anti valikuline argument, kuid vaja on kohustuslikku."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Käsk '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: mittetoetatav vorming: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Käsu \\begin esimene argument on kohustuslik."
 
@@ -852,57 +852,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Ei saa sulgeda %s' peale kirjutamist: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Ei suuda lugeda Po4a päist %s-s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "%s esimene rida ei näi olevat Po4a päis."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Syüntaksi viga po4a %s päises, \"%s\" läheduses"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Vigane argument Po4a päises %s-s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Po4a päis %s-s ei määra töörežiimi."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -914,22 +922,22 @@ msgstr ""
 "Vigane töörežiim Po4a päises %s-s: peaks olema 'before' (enne) või "
 "'after' (pärast), mitte %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Po4a päis %s-s ei määra asukohta."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 "Po4a päises pole antud lõpetamispiirjoont, kuid mode=after "
 "(töörežiim=pärast)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
@@ -937,39 +945,39 @@ msgstr ""
 "Po4a päises pole antud lõpetamispiirjoont, kuid mode=after "
 "(töörežiim=pärast)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Lisa ei saa juurde panna, kui failinimi puudub"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Lisa %s ei eksisteeri."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Lisa %s jaoks puudub sobiv asukoht."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Lisa %s jaoks leitud rohkem kui üks sobiv asukoht."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Lisa '%s' pandud külge enne rida: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Lisa '%s' sisestati pärast rida %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Lisa '%s' pandud külge faili lõppu."
@@ -1016,7 +1024,15 @@ msgstr ">>> fail = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Sisemine viga: tundmatut tüüpi identifikaator '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1025,19 +1041,19 @@ msgstr ""
 "Halb dokumenditüüp. Oodatakse tüüpi '%s'. Seda hoiatust saab parandada "
 "valikuga -o doctype, või ignoreerida seda kontrolli käsuga -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr "Leiti ootamatu lõpumärgis </%s>. Põhidokument võib olla vale.  Jätkan…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "Leiti ootamatu lõpumärgis </%s>. Põhidokument võib olla vale."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1046,17 +1062,17 @@ msgstr ""
 "%s: atribuut '%s' ei ole määratud mooduli valikuna 'attributes' ja\n"
 "....  teda ei ole tõlgitud attribuudi rajaks '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Halb atribuudi süntaks. Jätkan…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Halb atribuudi süntaks"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1067,12 +1083,12 @@ msgstr ""
 " *** algne tõlkevalik on siin tühistatud, sest vanem otsingurada '%s' ei ole "
 "tõlgitud,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr "%s: sätet foldattributes eiratu, sest '%s' ei ole jadasilt"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1082,7 +1098,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1092,10 +1108,10 @@ msgstr ""
 "(tõlgitud/tõlkimata) ja/või break/inline/placeholder (murra/reasisestus/"
 "muutuja)."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Märgi '%s' nii kategoorias %s ja %s."
diff --git a/po/bin/eu.po b/po/bin/eu.po
index 227c50d..9952649 100644
--- a/po/bin/eu.po
+++ b/po/bin/eu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a_0.41-1_eu\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2018-11-06 19:40+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -41,7 +41,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -331,22 +331,22 @@ msgid ""
 "input: %s"
 msgstr "\\c ihes sekuentzia aurkitu da. Hau ez da guztiz kudeatzen oraindik."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Itxi gabeko '<' eta '>' letra-tipo aldatzailean. Errorearen mezua: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "'<' edo '>' sekuentzia ezezaguna. Errorearen mezua: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Lerro analizaezina: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -356,17 +356,17 @@ msgstr ""
 "Man eskuliburuaren orrialdea po4a makro berriak nola kudeatzen dituen "
 "jakiteko."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Ezin dira komandoaren argumentuak analizatu: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Onartzen ez den letra-tipoa: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -380,7 +380,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -394,7 +394,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -404,11 +404,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ".ie makroa .el makroa batez jarraitu behar da."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -418,7 +418,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -427,7 +427,7 @@ msgstr ""
 "Orrialde honek '%s' duen beste fitxategi bat du. Ez ahaztu fitxategi hau "
 "('%s') itzultzeaz."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -436,7 +436,7 @@ msgstr ""
 "Orrialde honek '%s' eskaera argumentuan lerro kopurua duela erabiltzen du. "
 "Hau ez da onartzen oraindik."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -480,23 +480,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "Ezin da %s(e)tik irakurri: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -512,56 +512,56 @@ msgstr "2 plural baino gehiagoko formatuko mezuak ez dira onartzen."
 msgid "Parse error at: -->%s<--"
 msgstr "Lerro arraroa: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Ezin da fitxategi batean idatzi fitxategi-izenik gabe"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Ezin da %s(e)n idatzi: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 #| msgid "Can't write PO files with more than two plural forms."
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Ezin da bi plural forma baino gehiago dituzten PO fitxategiak idatzi."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Ezin da %s itxi idatzi ondoren: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't unlink %s: %s."
 msgid "Cannot unlink %s: %s."
 msgstr "Ezin da %s desestekatu: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't move %s to %s: %s."
 msgid "Cannot move %s to %s: %s."
 msgstr "Ezin da %s lekuz %s(e)ra aldatu: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -570,7 +570,7 @@ msgstr ""
 "'%s' mezuaren formatu singularra da, po4a-ek msgstr[0] itzulpena erabiliko "
 "du (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -579,12 +579,12 @@ msgstr ""
 "'%s' mezuaren formatu plurala da, po4a-ek msgstr[1] itzulpena erabiliko du "
 "(%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid bi aldiz definituta: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -603,7 +603,7 @@ msgstr ""
 "%s\n"
 " Itzulpen zaharra baztertu egin da."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -754,28 +754,28 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "orekatu gabeko %s '%s'(e)n"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Errorea '%s komandoaren argumentu kopurua analizatzean: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Komando ezezaguna: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Ezin da fitxategitik irakurri fitxategi-izen bat gabe"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -783,17 +783,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich-ek ezin du %s aurkitu"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Ezin da ezizen bat erabili '%s' komando ezezagunarentzat"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -802,39 +802,39 @@ msgstr ""
 "Definizioen formatu zaharra erabiltzen ari zara (%s). Eguneratu ezazu "
 "definizioaren lerro hau."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "ingurune ezezaguna: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "bat ez datorren '%s' ingurune amaiera"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Okerreko argumentu kopurua '%s' komandoarentzat."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Aukerako argumentu bat ezarri da baina beharrezko bat espero zen."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "'%s' komandoa: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: onartzen ez den formatua: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "\\begin-en lehen argumentua beharrezkoa da."
 
@@ -883,57 +883,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Ezin da %s itxi idatzi ondoren: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Ezin da po4a goiburua irakurri %s(e)tik."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "%s(r)en lehen lerroak ez dirudi po4a goiburua."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Sintaxi errorea %s(r)en po4a goiburuan, \"%s\"(e)tik gertu"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Argumentu baliogabea %s(r)en po4a goiburuan: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "%s(r)en po4a goiburuak ez du modua ezartzen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -945,58 +953,58 @@ msgstr ""
 "Modu baliogabea %s(r)en po4a goiburuan: 'before' edo 'after' izan behar da, "
 "ez %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "%s(r)en po4a goiburuak ez du kokalekua definitzen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Ez da amaiera ezarri po4a goiburuan, baina modua=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "Ez da amaiera ezarri po4a goiburuan, baina modua=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Ezin da eranskina ezarri fitxategi-izena ez bada ematen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "%s eranskina ez da existitzen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Ez dago kokaleku hautagairik %s eranskinarentzat."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Kokaleku hautagai bat baino gehiago aurkitu da %s eranskinarentzat."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "'%s' eranskina ezarri da lerro honen aurretik: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "'%s' eranskina ezarri da lerro honen ondoren: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "'%s' eranskina fitxategi amaieran ezarri da."
@@ -1043,7 +1051,15 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Barneko errorea: '%s' identifikatzaile mota ezezaguna."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1053,7 +1069,7 @@ msgstr ""
 "doctype aukera erabiliz, edo egiaztapen hau baztertu -o doctype=\"\" "
 "erabiliz."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1062,32 +1078,32 @@ msgstr ""
 "Espero ez zen <%s> itxierako etiketa aurkitu da. Dokumentu nagusia oker egon "
 "daiteke. Jarraitzen…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Espero ez zen <%s> itxierako etiketa aurkitu da. Dokumentu nagusia oker egon "
 "daiteke."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Atributuaren sintaxia oker. Aurrera jarraitzen…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, fuzzy, perl-format
 #| msgid "Bad attribute syntax"
 msgid "%s: Bad attribute syntax"
 msgstr "Atributuaren sintaxia oker"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1095,12 +1111,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1110,7 +1126,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1120,10 +1136,10 @@ msgstr ""
 "itzuli gabea) edo/eta 'break/inline/placeholder' (jauzia/barnekoa/heldu-"
 "lekua) kategoriak."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "'%s' etiketa bai %s bai %s kategorietan."
diff --git a/po/bin/fr.po b/po/bin/fr.po
index f33ad19..46e5a93 100644
--- a/po/bin/fr.po
+++ b/po/bin/fr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po4a bin\n"
-"Report-Msgid-Bugs-To: martin.quinson@debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-05-12 23:06+0000\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/po4a/po4a/fr/>\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Impossible d’analyser la définition de macro : %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -333,22 +333,22 @@ msgstr ""
 "Séquence d’échappement \\c trouvée. Ceci n’est pas encore complètement géré. "
 "Contenu fautif : %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "« < » ou « > » non équilibré pour une police. Message fautif : %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Séquence « < » ou « > » inconnue. Message fautif : %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Échec de l’analyse de %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -357,17 +357,17 @@ msgstr ""
 "Macro « %s » inconnue. Retirez-la du document ou consultez la page de manuel "
 "Locale::Po4a::Man pour voir comment po4a peut traiter de nouvelles macros."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Impossible d’analyser les paramètres de la commande : %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Police non reconnue : « %s »."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -391,7 +391,7 @@ msgstr ""
 "Référez-vous à la page de manuel de Locale::Po4a::Man pour en savoir plus "
 "sur ces paramètres.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -415,7 +415,7 @@ msgstr ""
 "Référez-vous à la page de manuel de Locale::Po4a::Man pour en savoir plus "
 "sur ces paramètres.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -430,11 +430,11 @@ msgstr ""
 "ce n'est pas très robuste. '%s' montre ces macros aux traducteurs, mais les "
 "macros groff ne sont pas conviviales pour les traducteurs."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "La macro « .ie » doit être suivie par une macro « .el »."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -450,7 +450,7 @@ msgstr ""
 "traducteurs, mais les macros groff ne sont pas conviviales pour les "
 "traducteurs."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -459,7 +459,7 @@ msgstr ""
 "Cette page inclut un autre fichier avec « %s ». N’oubliez pas de traduire ce "
 "fichier (« %s »)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -468,7 +468,7 @@ msgstr ""
 "Cette page utilise la requête « %s » avec le nombre de lignes en paramètre. "
 "Cela n’est pas encore géré."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -508,14 +508,14 @@ msgstr ""
 "Fichier po invalide %s :\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Impossible de lire depuis %s : %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -524,8 +524,8 @@ msgstr ""
 "Le fichier %s commence avec un caractère BOM qui indique que son encodage "
 "est UTF-8 alors que vous avez indiqué %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Impossible de fermer %s après lecture : %s"
@@ -540,16 +540,16 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "Erreur d'analyse : -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Impossible d’écrire dans un fichier sans nom de fichier"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Impossible d’écrire dans %s : %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -559,33 +559,33 @@ msgstr ""
 "UTF-8 ; le fichier %s qui était encodé en %s sera réencodé en UTF-8 pour "
 "parer à tout problème.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Impossible d’écrire des fichiers PO avec plus de deux formes plurielles."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Impossible de fermer %s après écriture : %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Impossible de supprimer %s : %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Impossible de déplacer %s vers %s : %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "L'évaluation du filtre proposé a échoué : %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -594,7 +594,7 @@ msgstr ""
 "« %s » est la forme singulière d’un message, po4a utilisera la traduction "
 "msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -603,12 +603,12 @@ msgstr ""
 "« %s » est la forme plurielle d’un message, po4a utilisera la traduction "
 "msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid défini deux fois : %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -627,7 +627,7 @@ msgstr ""
 "%s\n"
 " L’ancienne traduction est oubliée."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -772,28 +772,28 @@ msgstr ""
 "Pouvoir le message d’erreur, relancez po4a avec ce paramètre additionnel :\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "%s non équilibré dans « %s »"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 "Erreur lors de la vérification du nombre de paramètres de la commande "
 "« %s » : %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Commande inconnue : « %s »"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Impossible de lire depuis un fichier sans nom de fichier"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -804,17 +804,17 @@ msgstr ""
 "inclus, ajoutez '-o exclude_include=%s' aux options, soit sur la ligne de "
 "commande, soit dans votre fichier de configuration po4a.conf."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich ne peut pas trouver %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Impossible d’utiliser un alias vers la commande « %s » inconnue"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -823,41 +823,41 @@ msgstr ""
 "Vous utilisez un ancien format de définition (%s). Veuillez mettre à jour "
 "cette ligne de définition."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "Environnement inconnu : « %s »"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "Fin de l’environnement « %s » sans commencement"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Mauvais nombre de paramètres pour la commande « %s »."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Un paramètre optionnel a été fourni, mais un paramètre obligatoire est "
 "attendu."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Commande « %s » : %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command : format non supporté : « %s »."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Le premier paramètre de \\begin est obligatoire."
 
@@ -920,61 +920,63 @@ msgstr ""
 "Bloc div clôturé malformé : le bloc qui commence à %s n'est pas fermé avant "
 "la fin du fichier."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
-"Encodage malformé lors de la lecture du fichier %s avec le jeu de caractères "
-"%s : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Encodage malformé lors de l’écriture du caractère «  %s » dans le fichier %s "
-"avec le jeu de caractères %s : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Encodage malformé lors de l’écriture dans le fichier %s avec le jeu de "
-"caractères %s : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Impossible de fermer %s après écriture : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Impossible de lire l’en-tête po4a depuis %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "La première ligne de %s ne ressemble pas à un en-tête po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Erreur de syntaxe dans l’en-tête po4a du fichier %s, près de « %s »"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Paramètre invalide dans l’en-tête po4a du fichier %s : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "L’en-tête po4a de %s ne définit pas de mode."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -983,54 +985,54 @@ msgstr ""
 "Mode invalide dans l’en-tête po4a de %s : devrait être « before », « after » "
 "ou « eof » au lieu de « %s »."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "L’en-tête po4a de %s ne définit pas de position."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Pas de frontière de fin dans l’en-tête po4a, mais « mode=after »."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Aucune position n’est nécessaire quand le mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "La frontière de fin n’est pas necessaire quand mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Impossible d’appliquer un addendum dont le nom n’est pas donné"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "L’addendum %s n’existe pas."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "L’addendum %s n’a pas de position candidate."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "L’addendum %s a plus d’une position candidate."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Ajout de l’addendum « %s » avant la ligne : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Ajout de l’addendum « %s » après la ligne : %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Application de l’addendum « %s » à la fin du fichier."
@@ -1076,7 +1078,20 @@ msgstr ">>> nomdefichier = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Erreur interne : type de chaîne « %s » inconnu."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Le fichier %s déclare %s comme encodage, mais c'est %s qui est proposé comme "
+"ensemble de caractères principal. Il faut modifier l’un des paramètres."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1085,7 +1100,7 @@ msgstr ""
 "Mauvais type de document. « %s » était attendu. Vous pouvez corriger cela "
 "avec l’option -o doctype, ou ignorer cette vérification avec -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1094,14 +1109,14 @@ msgstr ""
 "Balise fermante </%s> inattendue. Le document principal est peut-être mal "
 "formé. Poursuite…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Balise fermante </%s> inattendue. Le document principal est peut-être mal "
 "formé."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1110,17 +1125,17 @@ msgstr ""
 "%s : l'attribut '%s' n'est pas défini dans le module option 'attributes' et\n"
 "....  n'est pas traduit pour le chemin d'attribut '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s : Syntaxe d’attribut invalide. Poursuite…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s : Syntaxe d’attribut invalide"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1131,14 +1146,14 @@ msgstr ""
 " *** l'option de traduction d'origine est ignorée ici car le chemin "
 "parent='%s' n'est pas traduit,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s : le paramètre foldattributes est ignoré car '%s' n'est pas un marqueur "
 "en-ligne"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1153,7 +1168,7 @@ msgstr ""
 "\n"
 "Veuillez corriger votre traduction."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1162,10 +1177,10 @@ msgstr ""
 "L’option « %s » est obsolète. Utilisez les catégories translated/"
 "untranslated et/ou break/inline/placeholder à la place."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
@@ -1810,6 +1825,25 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "Impossible de copier le fichier PO (%s → %s) : %s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Encodage malformé lors de la lecture du fichier %s avec le jeu de "
+#~ "caractères %s : %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Encodage malformé lors de l’écriture du caractère «  %s » dans le fichier "
+#~ "%s avec le jeu de caractères %s : %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Encodage malformé lors de l’écriture dans le fichier %s avec le jeu de "
+#~ "caractères %s : %s"
+
+#, perl-format
 #~ msgid ""
 #~ "Force the encoding of %s to UTF-8 (was %s), as mixing encodings may break "
 #~ "msgmerge.\n"
diff --git a/po/bin/hr.po b/po/bin/hr.po
index 0e850f9..9f7d6a8 100644
--- a/po/bin/hr.po
+++ b/po/bin/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a: translate documents using the gettext tools\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-05-10 02:46+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: Croatian <https://hosted.weblate.org/projects/po4a/po4a/hr/>\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -40,7 +40,7 @@ msgstr "Neispravna postavka kompatibilnosti: „%s”. Mora biti „%s” ili �
 msgid "Unable to parse macro definition: %s"
 msgstr "Nemoguće obraditi makro definiciju: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -327,23 +327,23 @@ msgstr ""
 "Uočena sekvenca za nagli izlaz (escape sequence) \\c. Ova situacija još nije "
 "do kraja programski riješena."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Neusklađeni znakovi „<” i „>” u modifikatoru fonta. Pogrešna poruka: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Nepoznata sekvenca „<” ili „>”. Pogrešna poruka: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Neobradiv redak: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -352,17 +352,17 @@ msgstr ""
 "Nepoznat makro „%s”. Ukloni ga iz dokumenta ili pogledaj Locale::Po4a::Man "
 "priručnik i saznaj kako po4a barata novim makronaredbama."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Nije moguće obraditi argumente naredbe: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nepodržan font u: „%s”."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -376,7 +376,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -390,7 +390,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -400,11 +400,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Nakon .ie makronaredbe mora slijediti .el makronaredba."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -414,7 +414,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -423,7 +423,7 @@ msgstr ""
 "Ova stranica uključuje drugu datoteku s „%s”. Nemoj zaboraviti prevesti ovu "
 "datoteku („%s”)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -432,7 +432,7 @@ msgstr ""
 "Ova stranica koristi zahtjev „%s” s brojem redaka u argumentu. To još nije "
 "podržano."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -472,22 +472,22 @@ msgstr ""
 "Neispravna po datoteka %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Nije moguće čitati iz %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Nije moguće zatvoriti %s nakon čitanja: %s"
@@ -501,48 +501,48 @@ msgstr "Poruke s više od dva oblika množine se ne podržavaju."
 msgid "Parse error at: -->%s<--"
 msgstr "Greška u obradi pri: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Nije moguće pisati u datoteku bez imena datoteke"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Nije moguće pisati u %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Nije moguće pisati PO datoteke s više od dva oblika množine."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Nije moguće zatvoriti %s nakon zapisivanja: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Nije moguće ukloniti vezu %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Nije moguće premjestiti %s u %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Evaluiranje danog filtra nije uspjelo: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -550,7 +550,7 @@ msgid ""
 msgstr ""
 "„%s” je oblik jednine poruke, po4a će koristiti msgstr[0] prijevod (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -558,12 +558,12 @@ msgid ""
 msgstr ""
 "„%s” je oblik množine poruke, po4a će koristiti msgstr[0] prijevod (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid je određen dvaput: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -582,7 +582,7 @@ msgstr ""
 "%s\n"
 " Stari prijevod odbačen."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -721,26 +721,26 @@ msgstr ""
 "Za prikaz poruke greške, ponovo pokreni po4a s dodatnim argumentom:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "neusklađeni %s u „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Greška tijekom provjere broja argumenata naredbe „%s”: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Nepoznata naredba: „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Nije moguće čitati iz datoteke bez navođenja imena datoteke"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -748,17 +748,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich ne može pronaći %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Nije moguće koristiti alias za nepoznatu naredbu „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -766,39 +766,39 @@ msgid ""
 msgstr ""
 "Koristiš stari format definicija (%s). Aktualiziraj ovaj redak definicija."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "nepoznato okruženje: „%s”"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "neusklađen kraj okruženja „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Krivi broj argumenata za „%s” naredbu."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Naveden je opcionalni argument, ali očekuje se obavezni."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Naredba „%s”: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: nepodržani format: „%s”."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Prvi argument od \\begin je obavezan."
 
@@ -846,55 +846,63 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Nije moguće zatvoriti %s nakon pisanja: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Nije moguće čitati po4a zaglavlje od %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Prvi redak u %s ne sliči po4a zaglavlju."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Pogreška u sintaksi u po4a zaglavlju od %s, blizu \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Neispravni argument u po4a zaglavlju od %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "po4a zaglavlje od %s ne određuje modus."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -903,54 +911,54 @@ msgstr ""
 "Modus je neispravan u po4a zaglavlju od %s: trebao bi biti „before”, „after” "
 "ili „eof”. Umjesto toga, on je „%s”."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "po4a zaglavlje od %s ne određuje poziciju."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "U po4a zaglavlju nije zadana krajnja granica, ali mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Pozicija nije potrebna kad je mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Krajnja granica nije potrebna kad je mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Nije moguće primijeniti nadopunu kad ime datoteke nije navedeno"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Nadopuna %s ne postoji."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Nema moguće pozicije za nadopunu %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Pronađeno je više mogućih pozicija za nadopunu %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Nadopuna „%s” primijenjena prije ovog retka: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Nadopuna „%s” primijenjena nakon ovog retka: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Nadopuna „%s” primijenjena na kraju datoteke."
@@ -994,7 +1002,15 @@ msgstr ">>> ime datoteke = „%s”"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Interna greška: nepoznata vrsta identifikatora „%s”."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1003,7 +1019,7 @@ msgstr ""
 "Loša vrsta dokumenta. Očekuje se „%s”. Ovo upozorenje možeš ispraviti pomoću "
 "opcije -o doctype ili zanemari ovu provjeru pomoću -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1012,14 +1028,14 @@ msgstr ""
 "Pronađena je neočekivana završna oznaka </%s>. Glavni dokument možda nije u "
 "redu. Nastavlja se …"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Pronađena je neočekivana završna oznaka </%s>. Glavni dokument možda nije u "
 "redu."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1028,17 +1044,17 @@ msgstr ""
 "%s: atribut „%s” nije definiran u opciji modula „attributes” i\n"
 "....  nije preveden za stazu atributa „%s”"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Loša sintaksa atributa. Nastavlja se …"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Loša sintaksa atributa"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1049,12 +1065,12 @@ msgstr ""
 " *** izvorna opcija za prijevod je ovdje prepisana, jer je nadređena "
 "staza=„%s” neprevedena,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr "%s: foldattributes postavka zanemarena, jer „%s” nije ugrađena oznaka"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1069,7 +1085,7 @@ msgstr ""
 "\n"
 "Ispravi prijevod."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1078,10 +1094,10 @@ msgstr ""
 "Opcija „%s” se više ne koristi. Koristi kategorije translated/untranslated i-"
 "ili break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Oznaka „%s” u kategoriji %s i %s."
diff --git a/po/bin/hu.po b/po/bin/hu.po
index a550719..bc32d64 100644
--- a/po/bin/hu.po
+++ b/po/bin/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.56\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2021-10-27 22:11+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/po4a/po4a/hu/"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Nem lehet feldolgozni a makró meghatározást: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -324,23 +324,23 @@ msgid ""
 "input: %s"
 msgstr "Egy \\c elfedési sorozat található. Ez még nincs teljesen lekezelve."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Nem egyforma számú „<” és „>” a betűkészlet-módosítóban. Hibaüzenet: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Ismeretlen „<” vagy „>” sorozat. Hibaüzenet: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Feldolgozhatatlan sor: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -350,17 +350,17 @@ msgstr ""
 "Locale::Po4a::Man kézikönyvoldalt annak megtekintéséhez, hogy a po4a hogyan "
 "tudja kezelni az új makrókat."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Nem lehet feldolgozni a parancs argumentumait: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nem támogatott betűkészlet ebben: „%s”."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -374,7 +374,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -388,7 +388,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -398,11 +398,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Az .ie makrót egy .el makrónak kell követnie."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -412,7 +412,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -421,7 +421,7 @@ msgstr ""
 "Ez az oldal beágyaz egy másik fájlt ezzel: „%s”. Ne felejtse el lefordítani "
 "ezt a fájlt (%s)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -430,7 +430,7 @@ msgstr ""
 "Ez az oldal a(z) „%s” kérést használja a sorok számával az argumentumban. Ez "
 "még nem támogatott."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -470,22 +470,22 @@ msgstr ""
 "Érvénytelen PO fájl (%s):\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Nem lehet olvasni ebből: %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "A(z) %s nem zárható le olvasás után: %s"
@@ -500,49 +500,49 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "Feldolgozási hiba itt: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Nem lehet írni egy fájlba fájlnév nélkül"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Nem lehet írni ebbe: %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Nem lehet kiírni a PO fájlokat kettőnél több többes számú alakkal."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Cannot close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "A(z) %s nem zárható le írás után: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Nem lehet eltávolítani: %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Nem lehet áthelyezni: %s -> %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "A megadott szűrő kiértékelése sikertelen: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -551,7 +551,7 @@ msgstr ""
 "A(z) „%s” egy üzenet egyes számú alakja, a po4a az msgstr[0] fordítást (%s) "
 "fogja használni."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -560,12 +560,12 @@ msgstr ""
 "A(z) „%s” egy üzenet többes számú alakja, a po4a az msgstr[1] fordítást (%s) "
 "fogja használni."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "Az msgid kétszer van meghatározva: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -584,7 +584,7 @@ msgstr ""
 "%s\n"
 " A régi fordítás eldobva."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -729,26 +729,26 @@ msgstr ""
 "argumentummal:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "kiegyensúlyozatlan %s itt: „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Hiba a(z) „%s” parancs argumentumai számának ellenőrzésekor: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Ismeretlen parancs: „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Nem lehet olvasni egy fájlból fájlnév nélkül"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -756,17 +756,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "A kpsewhich nem találja ezt: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Nem lehet álnevet használni az ismeretlen parancshoz: „%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -775,40 +775,40 @@ msgstr ""
 "A régi meghatározások formátumát használja (%s). Frissítse ezt a "
 "meghatározási sort."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "ismeretlen környezet: „%s”"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "a(z) „%s” környezet nem illeszkedő vége"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Hibás argumentumszám a(z) „%s” parancsnál."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Egy elhagyható argumentum lett megadva, de egy kötelező argumentum az elvárt."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "„%s” parancs: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: nem támogatott formátum: „%s”."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "A \\begin első argumentuma kötelező."
 
@@ -856,55 +856,63 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "A(z) %s nem zárható le írás után: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Nem olvasható a po4a fejléc innen: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "A(z) %s első sora nem néz ki po4a fejlécnek."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Szintaktikai hiba a(z) %s po4a fejlécében, „%s” közelében"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Érvénytelen argumentum a(z) %s po4a fejlécében: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "A(z) %s po4a fejléce nem határozza meg a módot."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -913,54 +921,54 @@ msgstr ""
 "A mód érvénytelen a(z) %s po4a fejlécében: csak „before”, „after” vagy „eof” "
 "lehet. Ehelyett ez „%s”."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "A(z) %s po4a fejléce nem határozza meg a pozíciót."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Nincs végződéshatároló megadva a po4a fejlécben, de a mód „after”."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Nem szükséges pozíció, ha a mód „eof”."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Nem szükséges végződéshatároló, ha a mód „eof”."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Nem lehet alkalmazni a függeléket, ha nincs megadva a fájlnév"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "A(z) %s függelék nem létezik."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Nincs jelölt pozíció a(z) %s függeléknél."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Egynél több jelölt pozíció található a(z) %s függeléknél."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "A(z) „%s” függelék alkalmazva ezen sor előtt: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "A(z) „%s” függelék alkalmazva ezen sor után: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "A(z) „%s” függelék alkalmazva a fájl végénél."
@@ -1004,7 +1012,15 @@ msgstr ">>> fájlnév = „%s”"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Belső hiba: ismeretlen típusazonosító: „%s”."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1014,7 +1030,7 @@ msgstr ""
 "kapcsolóval, vagy mellőzze ezt az ellenőrzést a -o doctype=\"\" "
 "használatával."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1023,12 +1039,12 @@ msgstr ""
 "Váratlan lezáró címke (</%s>) található. A fődokumentum rossz lehet. "
 "Folytatás…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "Váratlan lezáró címke (</%s>) található. A fődokumentum rossz lehet."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1038,17 +1054,17 @@ msgstr ""
 "és\n"
 "....  nincs lefordítva a(z) „%s” attribútum-útvonalnál"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Rossz attribútumszintaxis. Folytatás…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Rossz attribútumszintaxis"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1059,14 +1075,14 @@ msgstr ""
 " *** az eredeti fordítási kapcsoló felül van bírálva itt, mivel a "
 "szülőútvonal = „%s” nincs lefordítva,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: a foldattributes beállítás figyelmen kívül van hagyva, mivel a(z) „%s” "
 "nem sorközi címke"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1081,7 +1097,7 @@ msgstr ""
 "\n"
 "Javítsa a fordítását."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1090,10 +1106,10 @@ msgstr ""
 "A(z) „%s” kapcsoló elavult. Használja a translated/untranslated és/vagy a "
 "break/inline/placeholder kategóriákat."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "A(z) „%s” címke mindkét kategóriában szerepel (%s és %s)."
diff --git a/po/bin/id.po b/po/bin/id.po
index f370119..42a8339 100644
--- a/po/bin/id.po
+++ b/po/bin/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.47-2\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2021-06-03 00:38+0000\n"
 "Last-Translator: Reza Almanda <rezaalmanda27@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/po4a/po4a/id/"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -42,7 +42,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Tidak dapat mem-parse definisi macro: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -327,23 +327,23 @@ msgid ""
 "input: %s"
 msgstr "Urutan keluar \\c bertemu. Hal ini belum seluruhnya dapat ditangani."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Tidak seimbang '<' dan '>' pada pemodifikasi huruf. Pesan untuk kesalahan: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Urutan '<' atau '>' tidak diketahui. Pesan kesalahan: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Baris yang tidak dapat diparse: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -353,17 +353,17 @@ msgstr ""
 "Locale::Po4a::Man manpage untuk melihat bagaimana po4a dapat mengatasi macro "
 "terbaru."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Agumen tidak dapat diparse: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Huruf yang tidak didukung: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -377,7 +377,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -391,7 +391,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -401,11 +401,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "makro .ie harusnya diikuti oleh sebuah makro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -415,7 +415,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -424,7 +424,7 @@ msgstr ""
 "Pada halaman ini terdapat berkas lain dengan '%s'. Jangan lupa untuk "
 "menerjemahkan file ini ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -433,7 +433,7 @@ msgstr ""
 "Halaman ini menggunakan permintaan '%s' dengan nomor baris pada argumen. Hal "
 "ini belum didukung."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -479,22 +479,22 @@ msgstr ""
 "Berkas po tidak valid %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Tidak bisa membaca dari %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -510,49 +510,49 @@ msgstr "Pesan dengan lebih dari dua form jamak tidak didukung."
 msgid "Parse error at: -->%s<--"
 msgstr "Baris aneh: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Tidak bisa menulis ke berkas tanpa nama berkas"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Tidak dapat menulis ke %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Tidak dapat menulis berkas PO dengan lebih dari dua form jamak."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Tidak bisa menutup %s setealh menulis: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Tidak dapat tidak menaut %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Tidak dapat memindahkan %s ke %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -561,7 +561,7 @@ msgstr ""
 "'%s' adalah form tunggal dari sebuah pesan, po4a akan menggunakan msgstr[0] "
 "terjemahan (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -570,12 +570,12 @@ msgstr ""
 "'%s' adalah form jamak dari sebuah pesan, po4a akan menggunakan msgstr[1] "
 "terjemahan (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid didefinisikan dua kali: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -594,7 +594,7 @@ msgstr ""
 "%s\n"
 " Terjemahan lama dibuang."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -743,30 +743,30 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "tidak-seimbang %s di dalam '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 "Kesalahan ketika memeriksa jumlah dari argumen-argumen dari perintah '%s\": "
 "%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Perintah yang tidak diketahui: '%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Tidak bisa membaca dari berkas tanpa harus memiliki nama-berkas"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -774,17 +774,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich tidak dapat menemukan %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Tidak bisa menggunakan alias pada perintah yang tidak diketahui '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -793,40 +793,40 @@ msgstr ""
 "Anda menggunakan format definisi lama (%s). Tolong perbarui definisi baris "
 "ini."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "lingkungan yang tidak diketahui: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "akhir yang tidak cocok dari lingkungan '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Jumlah yang salah dari argumen-argumen untuk perintah '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Sebuah argumen opsional telah disediakan, tetapi wajib satu yang diharapkan."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Perintah '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: format yang tidak didukung: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Argumen pertama dari \\begin adalah sebuah keharusan."
 
@@ -874,57 +874,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Tidak bisa menutup %s setealh menulis: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Tidak bisa membaca header po4a dari %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Baris pertama dari %s tidak seperti sebuah header po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Kesalahan sintaks pada header po4a dari %s, didekat \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Argumen tidak valid pada header po4a dari %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Header po4a dari %s tidak mendefinisikan mode."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -936,58 +944,58 @@ msgstr ""
 "Mode tidak valid pada header po4a dari %s: seharusnya 'sebelum' atau "
 "'setelah' bukan %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Header po4a dari %s tidak mendefinisikan posisi."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Tidak ada batas akhir diberikan pada header po4a, tapi mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "Tidak ada batas akhir diberikan pada header po4a, tapi mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Tidak bisa menerapkan addendum ketika tidak diberikan nama-berkas"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Addendum %s tidak ada."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Tidak ada posisi kandidat untuk addendum %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Lebih dari satu posisi kandidat ditemukan untuk tambahan %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Addendum '%s' diterapkan sebelum baris ini: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Addendum '%s' diterapkan setelah baris ini: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Addendum '%s' diterapkan pada akhir dari berkas."
@@ -1031,7 +1039,15 @@ msgstr ">>> nama file = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Kesalahan internal: tidak diketahui tipe identifier '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1041,7 +1057,7 @@ msgstr ""
 "dengan sebuah -o opsi doctype, atau abaikan pemeriksaan ini dengan -o "
 "doctyope=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1050,30 +1066,30 @@ msgstr ""
 "Tag penutup tidak diharapkan </%s> ditemukan. Dokumen utama mungkin salah.  "
 "Dilanjutkan…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Tidak diharapkan tag penutup </%s> ditemukan. Dokumen utama mungkin salah."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Atribut sintaks buruk.  Dilanjutkan…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Atribut sintaks buruk"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1081,12 +1097,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1096,7 +1112,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1105,10 +1121,10 @@ msgstr ""
 "Opsi '%s' telah ditinggalkan. Tolong gunakan kategori translated/"
 "untranslated dan/atau break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Tag '%s' baik dalam kategori %s dan %s."
diff --git a/po/bin/it.po b/po/bin/it.po
index f9c5dd5..289d9f7 100644
--- a/po/bin/it.po
+++ b/po/bin/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.23\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-05-13 13:29+0200\n"
 "Last-Translator: Marco Ciampa <ciampix@posteo.net>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/po4a/po4a/it/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Impossibile elaborare la definizione macro: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -322,26 +322,28 @@ msgstr ""
 msgid ""
 "Escape sequence \\c encountered. This is not completely handled yet. Faulty "
 "input: %s"
-msgstr "Rilevata sequenza di escape \\c. La sequenza non è ancora completamente supportata. Ingresso errato: %s\""
+msgstr ""
+"Rilevata sequenza di escape \\c. La sequenza non è ancora completamente "
+"supportata. Ingresso errato: %s\""
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Simboli \"<\" e \">\" non bilanciati in un modificatore di carattere. "
 "Messaggio errato: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Sequenza \"<\" o \">\" sconosciuta. Messaggio errato: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Riga impossibile da analizzare: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -351,17 +353,17 @@ msgstr ""
 "pagina man di Locale::Po4a::Man per vedere come po4a può gestire le nuove "
 "macro."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Impossibile analizzare gli argomenti: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Tipo di carattere non supportato in «%s»."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -385,7 +387,7 @@ msgstr ""
 "Fare riferimento alla magina man di Locale::Po4a::Man per ulteriori "
 "informazioni su questi parametri.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -408,7 +410,7 @@ msgstr ""
 "Fare riferimento alla magina man di Locale::Po4a::Man per ulteriori "
 "informazioni su questi parametri.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -423,11 +425,11 @@ msgstr ""
 "robusto. '%s' mostra queste macro ai traduttori, ma le macro groff non sono "
 "amichevoli per i traduttori."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "La macro .ie deve essere seguita da una macro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -442,7 +444,7 @@ msgstr ""
 "ciò non è molto robusto. '%s' mostra queste macro ai traduttori, ma le macro "
 "groff non sono amichevoli per i traduttori."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -451,7 +453,7 @@ msgstr ""
 "La pagina include un altro file con «%s». Non dimenticarsi di tradurre "
 "questo file («%s»)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -460,7 +462,7 @@ msgstr ""
 "La pagina usa la richiesta «%s» con il numero di righe come argomento. "
 "Questo non è ancora supportato."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -500,14 +502,14 @@ msgstr ""
 "File po non valido %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Impossibile leggere da %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -516,8 +518,8 @@ msgstr ""
 "Il file %s comincia con un carattere BOM che indica che la sua codifica è "
 "UTF-8, ma invece è stato specificato %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Impossibile chiudere %s dopo la lettura: %s"
@@ -531,16 +533,16 @@ msgstr "Messaggi con più di 2 plural forms non sono supportati."
 msgid "Parse error at: -->%s<--"
 msgstr "Errore di analisi in: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Impossibile scrivere un file senza nomefile"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Impossibile scrivere su %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -549,32 +551,32 @@ msgstr ""
 "msgmerge è piagato da alcuni difetti quando i file PO non sono codificati in "
 "UTF-8; registrazione di %s come UTF-8 (era %s) per evitare il problema.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Impossibile scrivere file PO con più di due plural forms."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Impossibile chiudere %s dopo la scrittura: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Impossibile rimuovere %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Impossibile spostare %s in %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Valutazione del filtro fornito fallita: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -583,7 +585,7 @@ msgstr ""
 "«%s» è la forma singolare di un messaggio, po4a userà la traduzione "
 "msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -592,12 +594,12 @@ msgstr ""
 "«%s» è la forma plurale di un messaggio, po4a userà la traduzione msgstr[1] "
 "(%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid «%s» definito due volte"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -616,7 +618,7 @@ msgstr ""
 "%s\n"
 " La vecchia traduzione è stata scartata."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -761,26 +763,26 @@ msgstr ""
 "aggiuntivo:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "simbolo \"%s\" solitario in «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Errore nel controllo del numero di argomenti per il comando «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Comando «%s» sconosciuto"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Impossibile leggere un file senza avere un nomefile"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -791,17 +793,17 @@ msgstr ""
 "file, aggiungere '-o exclude_include=%s' alle opzioni, sulla riga di comanda "
 "o nel file po4a.conf."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich non riesce a trovare %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Impossibile usare un alias per il comando sconosciuto «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -810,7 +812,7 @@ msgstr ""
 "Si stanno usando delle definizioni in un vecchio formato (%s). Aggiornare "
 "questa riga di definizioni."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "ambiente «%s» sconosciuto"
@@ -818,32 +820,32 @@ msgstr "ambiente «%s» sconosciuto"
 # NdT: Messaggio dato quando incontra \end{} senza \begin{}.
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "fine dell'ambiente «%s» non prevista"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Numero di argomenti errato per il comando «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "È stato fornito un argomento opzionale, ma serviva uno obbligatorio."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Comando «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: formato non supportato: «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Il primo argomento di \\begin è obbligatorio."
 
@@ -906,57 +908,63 @@ msgstr ""
 "Blocco delimitato div malformato: un blocco che partiva da %s non si è "
 "chiuso prima della fine del file."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
-msgstr "Codifica errata leggendo il file %s con set di caratteri %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
+msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Codifica errata scrivendo il carattere '%s' sul file %s con set di caratteri "
-"%s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
-msgstr "Codifica errata scrivendo sul file %s con set di caratteri %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
+msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Impossibile chiudere %s dopo la scrittura: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Impossibile leggere l'intestazione po4a da %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "La prima riga di %s non sembra un intestazione po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Errore di sintassi nell'intestazione po4a di %s, vicino a «%s»"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Argomento non valido nell'intestazione po4a di %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "L'intestazione po4a di %s non definisce il modo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -965,55 +973,55 @@ msgstr ""
 "Modalità non valida nell'intestazione po4a di %s: dovrebbe essere \"before\" "
 "o \"after\" o \"eof\". Invece è \"%s\"."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "L'intestazione po4a di %s non definisce la posizione."
 
 # NdT: Rivedere quando si traduce anche la documentazione
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Nessun limite finale nell'intestazione po4a, ma mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Posizione non necessaria se mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Nessun limite file necessario quando mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Impossibile applicare l'addendum senza dare il nomefile"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "L'addendum %s non esiste."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "L'addendum %s non ha nessuna posizione candidata."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Trovata più di una posizione candidata per l'addendum %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Addendum «%s» aggiunto prima della linea: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Addendum «%s» aggiunto dopo la linea: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Addendum «%s» aggiunto in fondo al file."
@@ -1059,7 +1067,20 @@ msgstr ">>> nomefile = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Errore interno: tipo di identificatore «%s» sconosciuto."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Il file %s dichiara %s come codifica, ma è stato fornito %s come set di "
+"caratteri master. Cambiare le impostazioni."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1069,7 +1090,7 @@ msgstr ""
 "segnalazione con l'opzione -o tipodoc, o ignorare questo controllo con -o "
 "tipodoc=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1078,13 +1099,13 @@ msgstr ""
 "Tag di chiusura </%s> non previsto. Forse il documento principale è errato. "
 "Continuo…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Tag di chiusura </%s> non previsto. Forse il documento principale è errato."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1093,17 +1114,17 @@ msgstr ""
 "%s: l'attributo '%s' non è definito nell'opzione del modulo 'attributes' e\n"
 "....  non è tradotto per il percorso attributo '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: sintassi dell'attributo errata. Continuo…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: sintassi dell'attributo errata"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1114,14 +1135,14 @@ msgstr ""
 " *** l'opzione di traduzione originale viene scavalcata qui dato che il "
 "percorso genitore='%s' non è tradotto,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: le impostazioni di \"foldattributes\" sono ignorate dato che \"%s\" non "
 "è una tag inline"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1136,7 +1157,7 @@ msgstr ""
 "\n"
 "Prego sistemare la traduzione."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1145,10 +1166,10 @@ msgstr ""
 "L'opzione «%s» è deprecata. Usare le categorie translated/untranslated and/"
 "or break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "La tag «%s» è in entrambe %s e %s le categorie."
@@ -1708,7 +1729,9 @@ msgstr ""
 #: ../../po4a-normalize:184
 msgid ""
 "Both B<--blank> and B<--capitalize> can't be specified at the same time."
-msgstr "B<--blank> e B<--capitalize> non possono essere specificati contemporaneamente."
+msgstr ""
+"B<--blank> e B<--capitalize> non possono essere specificati "
+"contemporaneamente."
 
 #: ../../po4a-normalize:197
 msgid ""
@@ -1779,3 +1802,18 @@ msgstr "fatto."
 #, perl-format
 msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "Impossibile copiare il file PO (%s -> %s): %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr "Codifica errata leggendo il file %s con set di caratteri %s: %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Codifica errata scrivendo il carattere '%s' sul file %s con set di "
+#~ "caratteri %s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr "Codifica errata scrivendo sul file %s con set di caratteri %s: %s"
diff --git a/po/bin/ja.po b/po/bin/ja.po
index 65b6951..d13d3b4 100644
--- a/po/bin/ja.po
+++ b/po/bin/ja.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: martin.quinson@debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
-"PO-Revision-Date: 2024-05-12 23:06+0000\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
+"PO-Revision-Date: 2024-06-13 07:43+0000\n"
 "Last-Translator: gemmaro <gemmaro.dev@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/po4a/po4a/ja/>\n"
 "Language: ja\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.5.4\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "マクロ定義を構文解析できません: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -314,26 +314,27 @@ msgstr ""
 msgid ""
 "Escape sequence \\c encountered. This is not completely handled yet. Faulty "
 "input: %s"
-msgstr "エスケープシーケンス \\c "
-"を検出しましたが、まだ完全に扱えません。失敗した入力： %s"
+msgstr ""
+"エスケープシーケンス \\c を検出しましたが、まだ完全に扱えません。失敗した入"
+"力： %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "フォント修飾子の '<' と '>' の対応が取れていません。不完全なメッセージ: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "'<' や '>' の不明な連続です。不完全なメッセージ: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "解析不能行: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -342,17 +343,17 @@ msgstr ""
 "不明なマクロ '%s' です。ドキュメントから取り除くか、po4aが新しいマクロを扱う"
 "方法について、Locale::Po4a::Man の manpage を参照してください。"
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "コマンド引数を解析できません: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "サポートしないフォントがあります: '%s'。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -375,7 +376,7 @@ msgstr ""
 "これらの引数についての詳細はLocale::Po4a::Manのマニュアルページを参照してくだ"
 "さい。\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -398,7 +399,7 @@ msgstr ""
 "これらの引数についての詳細はLocale::Po4a::Manのマニュアルページを参照してくだ"
 "さい。\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -413,11 +414,11 @@ msgstr ""
 "はこれらのマクロを翻訳者に示しますが、groffのマクロは翻訳者にとってユーザーフ"
 "レンドリーではありません。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ".ie マクロの後には .el マクロがなければなりません。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -432,7 +433,7 @@ msgstr ""
 "これらのマクロを翻訳者に示しますが、groffのマクロは翻訳者にとってユーザーフレ"
 "ンドリーではありません。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -441,7 +442,7 @@ msgstr ""
 "このページには '%s' で別のファイルを読み込んでいます。このファイル ('%s') を"
 "訳し忘れないようにしてください。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -450,7 +451,7 @@ msgstr ""
 "このページでは、引数の行番号に '%s' リクエストを使用しています。これはまだサ"
 "ポートしていません。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -490,14 +491,14 @@ msgstr ""
 "不正なpoファイル %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "%s から読み込めません: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -506,8 +507,8 @@ msgstr ""
 "ファイル%sはBOM文字から始まるため符号化方式はUTF-8であることを示しています"
 "が、%sが指定されました。"
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "読み込み後に %s をクローズできません: %s"
@@ -521,16 +522,16 @@ msgstr "2 種類以上の複数形を持つメッセージはサポートして�
 msgid "Parse error at: -->%s<--"
 msgstr "構文解析エラー: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "ファイル名がないためファイルに書き込めません"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "%s へ書き込めません: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -539,32 +540,32 @@ msgstr ""
 "POファイルがUTF-8で符号化されていないと不具合の影響を受けます。%sをUTF-8（以"
 "前は%s）に符号化し直して問題を回避します。\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "2種類以上の複数形を持つPOファイルは書き込めません。"
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "書き込み後に %s をクローズできません: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "%s を削除(unlink)できません: %s。"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "%s から %s に移動できません: %s。"
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "与えられたフィルタの評価に失敗しました：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -572,7 +573,7 @@ msgid ""
 msgstr ""
 "'%s' はメッセージの単数形です。po4a は 翻訳 (%s) に msgstr[0] を使用します。"
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -580,12 +581,12 @@ msgid ""
 msgstr ""
 "'%s' はメッセージの複数形です。po4a は 翻訳 (%s) に msgstr[1] を使用します。"
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid が二度定義されています: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -604,7 +605,7 @@ msgstr ""
 "%s\n"
 " 古い翻訳を破棄しました。"
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -745,26 +746,26 @@ msgstr ""
 "エラーメッセージを見るには、po4a を次の引数付きで再実行してください:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "'%s' の対応が取れていません ('%s' 内)"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "'%s' コマンドの引数の数チェックでエラーが発生しました: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "未知のコマンド: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "ファイル名がないためファイルから読み込めません"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -775,56 +776,56 @@ msgstr ""
 "ションまたはコマンドラインまたはpo4a.confファイルに「-o exclude_include=%s」"
 "を追加してください。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich は %s を見つけられません"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "不明なコマンド '%s' への別名を使用できません"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr "古い定義の形式 (%s) を使用しています。定義行を更新してください。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "不明な環境です: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "環境 '%s' の最後にマッチしません"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "'%s' コマンドの引数の数が正しくありません。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "オプション引数が指定されていますが、必須引数を期待しています。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "コマンド '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: 非対応形式: '%s'。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "\\begin の第一引数が必須です。"
 
@@ -886,56 +887,72 @@ msgstr ""
 "書式の崩れたdivブロックの囲みです：%sで開始したブロックがファイルの終端までに"
 "閉じられませんでした。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
-msgstr "ファイル %s を文字集合 %s で読み込む際に、符号化が崩れました： %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
+msgstr ""
+"ファイル%sから文字集合%sで読む際に不正な符号化がありました：%s\n"
+"%sが期待する文字集合でなければ、正しいものを--master-"
+"charsetや他の類するフラグで構成する必要があります。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"文字「%s」をファイル %s に文字集合 %s で書き出す際に、符号化が崩れました： %s"
+"文字%sをファイル%sに文字集合%sで書き込む際に不正な符号化がありました：%s\n"
+"%sが期待する文字集合でなければ、正しいものを--localized-"
+"charsetや他の類するフラグで構成する必要があります。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
-msgstr "ファイル %s に文字集合 %s で書き出す際に、符号化が崩れました： %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
+msgstr ""
+"ファイル%sに文字集合%sで書き込む際に不正な符号化がありました：%s\n"
+"%sが期待する文字集合でなければ、正しいものを--localized-"
+"charsetや他の類するフラグで構成する必要があります。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "書き込み後に %s をクローズできません: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "%s から po4a ヘッダを読み込めません。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "%s の先頭行が po4a ヘッダではないようです。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "%s の po4a ヘッダで構文エラーです。\"%s\" 付近"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "%s の po4a ヘッダに不正な引数があります %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "%s の po4a ヘッダではモードを定義していません。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -944,54 +961,54 @@ msgstr ""
 "%s の po4a ヘッダでモードが不正です：'before' や 'after' や 'eof' であるべき"
 "です。一方で %s になっています。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "%s の po4a ヘッダでは位置を定義していません。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "po4a ヘッダの boundary の最後がありませんが、mode=after です。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "mode=eofのときは位置は必要ありません。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "po4a ヘッダに boundary の終端が与えられていませんが、mode=after です。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "ファイル名を与えないと、追加内容を適用できません"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "追加内容 %s が存在しません。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "追加内容 %s の位置候補がありません。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "追加内容 %s の位置候補が複数あります。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "追加内容 '%s' をこの行の前に適用しました: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "追加内容 '%s' をこの行の後に適用しました: %s。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "追加内容 '%s' をファイルの最後に適用しました。"
@@ -1035,7 +1052,19 @@ msgstr ">>> ファイル名 = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "内部エラー: 不明な型識別子 '%s' です。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"ファイル%sは%sを符号化方式として宣言していますが、%sをマスター文書の文字集合"
+"として与えています。Perlでは実際には異なる符号化であるため何れかの設定に変更"
+"してください。 https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8 "
+"を参照してください"
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1044,7 +1073,7 @@ msgstr ""
 "文書型が不正です。'%s' と仮定します。この警告を修正するには、-o doctype オプ"
 "ションを指定するか、-o doctype=\"\" としてチェックを無視してください。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1053,14 +1082,14 @@ msgstr ""
 "想定外の終了タグ </%s> がありました。メインドキュメントが誤っている可能性があ"
 "ります。継続します…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "想定外の終了タグ </%s> がありました。メインドキュメントが誤っている可能性があ"
 "ります。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1069,17 +1098,17 @@ msgstr ""
 "%s: 属性 '%s' がモジュールのオプション 'attributes' で定義されておらず\n"
 "……属性パス '%s' について翻訳されていません"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: 属性構文が不正です。継続します…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: 属性構文が不正です"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1090,12 +1119,12 @@ msgstr ""
 " *** 親要素のパス='%s' が未翻訳のためここでは元の翻訳オプションが上書きされま"
 "す、"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr "%s: '%s' はインラインタグではないため折り畳み属性の設定が無視されます"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1110,7 +1139,7 @@ msgstr ""
 "\n"
 "翻訳を修正してください。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1119,10 +1148,10 @@ msgstr ""
 "'%s' オプションは廃止予定です。translated/untranslated や break/inline/"
 "placeholder カテゴリを使用してください。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "タグ '%s' が %s カテゴリと %s カテゴリにあります。"
@@ -1746,6 +1775,21 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "POファイルのコピー（%s→%s）ができませんでした：%s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr "ファイル %s を文字集合 %s で読み込む際に、符号化が崩れました： %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "文字「%s」をファイル %s に文字集合 %s で書き出す際に、符号化が崩れまし"
+#~ "た： %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr "ファイル %s に文字集合 %s で書き出す際に、符号化が崩れました： %s"
+
+#, perl-format
 #~ msgid ""
 #~ "Force the encoding of %s to UTF-8 (was %s), as mixing encodings may break "
 #~ "msgmerge.\n"
diff --git a/po/bin/ka.po b/po/bin/ka.po
index bbfb33c..bd02913 100644
--- a/po/bin/ka.po
+++ b/po/bin/ka.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.68\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-01-14 05:24+0000\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <https://hosted.weblate.org/projects/po4a/po4a/ka/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -273,39 +273,39 @@ msgid ""
 "input: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "არადამუშავებადი ხაზი: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
 "Po4a::Man manpage to see how po4a can handle new macros."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "მხარდაუჭერელი ფონტი '%s'-ში."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -319,7 +319,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -333,7 +333,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -343,11 +343,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -357,21 +357,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -403,22 +403,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr ""
@@ -432,67 +432,67 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "დამუშავების შეცდომა მისამარტზე: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "ჩაწერის შემდეგ %s ვერ დავხურე: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "%s-ის ბმის მოხსნის შეცდომა: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid ორჯერაა აღწერილი: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -504,7 +504,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -622,26 +622,26 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "უცნობი ბრძანება: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -649,56 +649,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "უცნობი გარემო: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "ბრძანება '%s':%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr ""
 
@@ -746,109 +746,117 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -890,43 +898,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -934,12 +950,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -949,17 +965,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/kn.po b/po/bin/kn.po
index 2a0428f..1cd1385 100644
--- a/po/bin/kn.po
+++ b/po/bin/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2007-08-12 21:47+0200\n"
 "Last-Translator: Shashidhar Honnungar <shashidhar.honnungar@gmail.com>\n"
 "Language-Team: Kannada <debian-l10n-kannada@lists.debian.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -278,39 +278,39 @@ msgid ""
 "input: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
 "Po4a::Man manpage to see how po4a can handle new macros."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, fuzzy, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "%s ಇದನ್ನು ಓದಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -324,7 +324,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -338,7 +338,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -348,11 +348,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -362,21 +362,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -408,23 +408,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "%s ಇದನ್ನು ಓದಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -441,72 +441,72 @@ msgstr "ಕಡತದ ಹೆಸರಿಲ್ಲದೆ ಕಡತಕ್ಕೆ ಬರ
 msgid "Parse error at: -->%s<--"
 msgstr "ವಿಚಿತ್ರ ಸಾಲು: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "ಕಡತದ ಹೆಸರಿಲ್ಲದೆ ಕಡತಕ್ಕೆ ಬರೆಯಲಾಗದು"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "%s ಇದಕ್ಕೆ ಬರೆಯಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "ಕಡತದ ಹೆಸರಿಲ್ಲದೆ ಕಡತಕ್ಕೆ ಬರೆಯಲಾಗದು"
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "ಬರೆದ ಬಳಿಕ %s ಮುಚ್ಚಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "%s ತೆರೆಯಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "%s ಇಂದ %s ಗೆ ಮರುನಾಮಕರಣ ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid ಎರಡು ಬಾರಿ ಕೊಡಲಾಗಿದೆ: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -518,7 +518,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -636,28 +636,28 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, fuzzy, perl-format
 msgid "Unknown command: '%s'"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಆಯ್ಕೆ: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "ಕಡತದ ಹೆಸರಿಲ್ಲದೆ ಕಡತದಿಂದ ಓದಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -665,56 +665,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, fuzzy, perl-format
 msgid "unknown environment: '%s'"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಆಯ್ಕೆ: %s"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, fuzzy, perl-format
 msgid "Command '%s': %s"
 msgstr "%s ತೆರೆಯಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr ""
 
@@ -763,110 +763,118 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "ಬರೆದ ಬಳಿಕ %s ಮುಚ್ಚಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "%s ಇದನ್ನು ಓದಲಾಗುತ್ತಿಲ್ಲ: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, fuzzy, perl-format
 msgid "Addendum %s does not exist."
 msgstr "ಕಡತ %s ಆಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -910,43 +918,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -954,12 +970,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -969,17 +985,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/ko.po b/po/bin/ko.po
index f5a5970..67c6ee9 100644
--- a/po/bin/ko.po
+++ b/po/bin/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2018-11-06 19:41+0100\n"
 "Last-Translator: Chel Hee Lee <gnustats@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -311,39 +311,39 @@ msgid ""
 "input: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
 "Po4a::Man manpage to see how po4a can handle new macros."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -357,7 +357,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -371,7 +371,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -381,11 +381,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -395,21 +395,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -441,23 +441,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "%s으로부터 읽어들일 수 없습니다: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after reading: %s"
@@ -472,73 +472,73 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "파일명 없이 파일에 작성할 수 없습니다"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "%s에 기록할 수 없습니다: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "%2$s을 작성한 뒤에 %1$s을 닫을 수 없습니다"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot unlink %s: %s."
 msgstr "%s을 열 수 없습니다: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
 msgid "Cannot move %s to %s: %s."
 msgstr "%s을 열 수 없습니다: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -550,7 +550,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -670,28 +670,28 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "알 수 없는 명령어: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "파일명을 가지지 않는 파일로부터 읽어 올 수 없습니다"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -699,56 +699,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich cannot find %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "알 수 없는 환경: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "명령 '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr ""
 
@@ -797,111 +797,119 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "%2$s을 작성한 뒤에 %1$s을 닫을 수 없습니다"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "%s로부터 po4a 헤더를 읽을 수 없습니다."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "po4a의 헤더 %s에서 인식할 수 없는 인수 %s입니다"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -946,43 +954,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -990,12 +1006,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1005,17 +1021,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/nb.po b/po/bin/nb.po
index 219e139..e099fe5 100644
--- a/po/bin/nb.po
+++ b/po/bin/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-02-17 08:01+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/po4a/"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -39,7 +39,7 @@ msgstr "Ikke samsvarende oppsett: «%s». Det må være enten «%s» eller «%s�
 msgid "Unable to parse macro definition: %s"
 msgstr "Klarte ikke tolke makrodefinisjon: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -323,22 +323,22 @@ msgid ""
 msgstr ""
 "Traff på avbrudds-sekvensen \\c. Komplett støtte for denne finnes ennå ikke."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Ubalansert «<» og «>» i skrifttypeendrer. Feilmelding: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Ukjent «<»- eller «>»-sekvens. Feilmelding: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Ikke tolkbar linje: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -347,17 +347,17 @@ msgstr ""
 "Ukjent makro «%s». Fjern den fra dokumentet, eller les manualsiden Locale::"
 "Po4a::Man for å se hvordan po4a kan håndtere nye makroer."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Klarte ikke tolke kommandoargumenter: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Ikke støttet font i: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -379,7 +379,7 @@ msgstr ""
 "forblir skjult for oversettere.\n"
 "Se manualsiden Locale::Po4a::Man for mer info om disse parametrene.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -401,7 +401,7 @@ msgstr ""
 "makroen forblir skjult for oversettere.\n"
 "Se manualsiden Locale::Po4a::Man for mer informasjon om disse parametrene.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -416,11 +416,11 @@ msgstr ""
 "robust. «%s» viser disse makroene til oversetterne, men groff-makroer er "
 "ikke brukervennlig mot oversettere."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Makroen .ie skal følges av en .el-makro."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -435,7 +435,7 @@ msgstr ""
 "robust. «%s» viser disse makroene til oversetterne, men groff-makroer er "
 "ikke brukervennlig mot oversetterne."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -444,7 +444,7 @@ msgstr ""
 "Denne siden inkluderer en annen fil med «%s». Ikke glem å oversett denne "
 "filen («%s»)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -453,7 +453,7 @@ msgstr ""
 "Denne siden bruker '%s' forespørselen med antallet linjer i argumentet. "
 "Dette er ikke støttet enda."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -493,14 +493,14 @@ msgstr ""
 "Ugyldig po-fil %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Kan ikke lese fra %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -509,8 +509,8 @@ msgstr ""
 "Filen %s starter med et BOM-tegn som indikerer at dens koding er UTF-8, men "
 "du spesifiserte i stedet %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Klarer ikke lukke %s etter lesing: %s"
@@ -524,16 +524,16 @@ msgstr "Meldinger med mer enn 2 flertallsformer er ikke støttet."
 msgid "Parse error at: -->%s<--"
 msgstr "Tolkingsfeil på: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Kan ikke skrive til fil uten filnavn"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Kan ikke skrive til %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -542,32 +542,32 @@ msgstr ""
 "msgmerge lider av noen feil når PO-filer ikke er kodet i UTF-8. Omkoder %s "
 "til UTF-8 (var %s) for å unngå denne situasjonen.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Kan ikke skrive PO-filer med mer enn to flertallsformer."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Klarer ikke lukke %s etter skriving: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Klarer ikke fjerne lenke %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Klarer ikke flytte %s til %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Evalueringen av det vedlagte filteret feilet: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -576,7 +576,7 @@ msgstr ""
 "«%s» er entallsformen på en melding, po4a vil bruke oversettelsen fra "
 "msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -585,12 +585,12 @@ msgstr ""
 "\"%s\" er flertallsformen av en melding, po4a vil bruke msgstr[1]-"
 "oversettelsen (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definert to ganger: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -609,7 +609,7 @@ msgstr ""
 "%s\n"
 "Forkastet tidligere oversettelse."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -753,26 +753,26 @@ msgstr ""
 "For å se feilmeldingen, kjør po4a på nytt med dette ekstra argumentet:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "Ubalansert %s i «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Feil under kontroll av antall argumenter for kommandoen «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Ukjent kommando: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Klarer ikke lese fra fil uten et filnavn"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -783,17 +783,17 @@ msgstr ""
 "legg til «-o exclude_include=%s» som tilvalg, enten på kommandolinjen eller "
 "i din po4a.conf-fil."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich klarte ikke finne %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Kan ikke bruke et alias for den ukjente kommandoen '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -802,40 +802,40 @@ msgstr ""
 "Du bruker det gamle definisjonsformat (%s). Denne definisjonslinjen bør "
 "oppdateres."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "ukjent miljø: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "finner ikke slutt på omgivelse «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Feil antall argumenter for kommandoen «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Et valgfritt argument ble oppgitt, mens et påkrevd argument er forventet."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Kommando «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: Ustøttet format: \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Det første argument i \\begin er obligatorisk."
 
@@ -897,55 +897,63 @@ msgstr ""
 "Feilutformet innhengende div-blokk: Blokken som starter på %s lukkes ikke "
 "før filen tar slutt."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Klarer ikke lukke %s etter skriving: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Klarer ikke lese po4a-hode fra %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Første linje i %s ser ikke ut som et po4a hode."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Ugyldig argument i po4a headeren til %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Ugyldig argument i po4a headeren til %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Po4a headeren til %s definerer ikke tilstanden."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -954,54 +962,54 @@ msgstr ""
 "Ugylding tilstand for po4a-hodet for %s: Skal være «before», «after» eller "
 "«eof», ikke «%s»."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Po4a-hodet til %s definerer ikke posisjonen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Ingen sluttgrense oppgitt i po4a-hodet, men mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Trenger ingen posisjon når mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Ingen sluttgrense trengs når mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Klarer ikke påføre tillegg uten at filnavn oppgis"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Tillegget %s finnes ikke."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Finner ingen mulig posisjon for tillegget %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Finner mer enn én mulig posisjon for tillegget %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Påførte tillegget «%s» før denne linjen: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Påførte tillegget «%s» etter linjen: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Påførte tillegget «%s» nederst i filen."
@@ -1045,7 +1053,20 @@ msgstr ">>> filnavn = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Intern feil: Ukjent typeidentifikator «%s»."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Filen %s erklærer %s som tegnkoding, men du oppga %s som hovedtegnsett. En "
+"av innstillingene må endres."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1054,7 +1075,7 @@ msgstr ""
 "Ugyldig dokumenttype: Forventet «%s». Du kan få bort denne advarselen ved å "
 "bruke tilvalget -o doctype, eller ignoere denne sjekken med -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1063,12 +1084,12 @@ msgstr ""
 "Fant uventet avslutningsmerke </%s>.  Hoveddokumentet kan være feil.  "
 "Fortsetter…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "Fant uventet avslutningsmerke </%s>. Hoveddokumentet kan være feil."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1077,17 +1098,17 @@ msgstr ""
 "%s: attributt '%s' er ikke definert i modulvalget 'attributter' og\n"
 "…  er ikke oversatt for attributtstien '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Ugyldig attributtsyntaks.  Fortsetter…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Ugyldig attributtsyntaks"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1098,13 +1119,13 @@ msgstr ""
 " *** Det opprinnelige oversettelsesvalget overskrives, siden ovennevnt "
 "mappe='%s' er uoversatt,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: Brettattributtinnstilling ignorert siden '%s' ikke er en innebygd tagg"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1119,7 +1140,7 @@ msgstr ""
 "\n"
 "Korriger oversettelsen din."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1128,10 +1149,10 @@ msgstr ""
 "Tilvalget «%s» fases ut. Vær så snill å bruk de oversatte / ikke oversatte "
 "og/eller kategoriene break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Merket «%s» finnes i både kategori %s og %s."
diff --git a/po/bin/nl.po b/po/bin/nl.po
index e13c7ae..a192d1a 100644
--- a/po/bin/nl.po
+++ b/po/bin/nl.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po4a_0.52-1\n"
-"Report-Msgid-Bugs-To: martin.quinson@debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-05-14 01:52+0000\n"
 "Last-Translator: Frans Spiesschaert <frans.spiesschaert@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/po4a/po4a/nl/>\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Kan macrodefinitie niet ontleden: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -333,24 +333,24 @@ msgstr ""
 "Stuurcode \\c aangetroffen. Dit wordt nog niet volledig ondersteund. "
 "Foutieve invoer: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Er ontbreekt een '<' of '>' aan de instructie waarmee het lettertype "
 "ingesteld wordt. Foutief opgemaakte tekst: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Onbekende sequentie met '<' of '>'. Foutief opgemaakte tekst: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Onverwerkbare regel: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -360,17 +360,17 @@ msgstr ""
 "manpagina Locale::Po4a::Man om te weten hoe po4a nieuwe macro's kan "
 "verwerken."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Niet-verwerkbare commando-argumenten: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Niet ondersteund lettertype in: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -394,7 +394,7 @@ msgstr ""
 "Raadpleeg de manpagina van Locale::Po4a::Man voor meer informatie over deze "
 "parameters.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -418,7 +418,7 @@ msgstr ""
 "Raadpleeg de manpagina van Locale::Po4a::Man voor meer informatie over deze "
 "parameters.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -433,11 +433,11 @@ msgstr ""
 "bestand, maar dit is niet erg robuust. '%s' toont deze macro's aan de "
 "vertalers, maar groff-macro's zijn niet gebruiksvriendelijk voor vertalers."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Een .ie-macro moet gevolgd worden door een .el-macro."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -453,7 +453,7 @@ msgstr ""
 "toont deze macro's aan de vertalers, maar groff-macro's zijn niet "
 "gebruiksvriendelijk voor vertalers."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -462,7 +462,7 @@ msgstr ""
 "Deze pagina voegt een ander bestand in met '%s'. Vergeet niet dat bestand "
 "('%s') te vertalen."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -471,7 +471,7 @@ msgstr ""
 "Deze pagina gebruikt de aanvraag '%s' met het aantal regels als argument. "
 "Dit wordt nog niet ondersteund."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -511,14 +511,14 @@ msgstr ""
 "Ongeldig po-bestand %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Kan niet lezen uit %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -527,8 +527,8 @@ msgstr ""
 "Het bestand %s begint met een BOM-teken dat aangeeft dat de codering UTF-8 "
 "is, maar u heeft in plaats daarvan %s opgegeven."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Kan %s na lezen niet afsluiten: %s"
@@ -544,53 +544,53 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "Ontleedfout bij: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Kan niet schrijven naar een bestand zonder bestandsnaam"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Kan niet schrijven naar %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 "msgmerge heeft last van enkele bugs wanneer PO-bestanden niet gecodeerd zijn "
-"in UTF-8; Hercoderen van %s naar UTF-8 (was %s) om het probleem te omzeilen."
-"\n"
+"in UTF-8; Hercoderen van %s naar UTF-8 (was %s) om het probleem te "
+"omzeilen.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Kan geen PO-bestanden wegschrijven waarin meer dan 2 varianten van een "
 "tekstfragment (enkelvoud en meervoud) voorkomen."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Kan na het schrijven %s niet sluiten: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Kan %s niet ontkoppelen: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Kan %s niet verplaatsen naar %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Het evalueren van de verstrekte filter is mislukt: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -599,7 +599,7 @@ msgstr ""
 "'%s' is de versie in het enkelvoud van een tekst. po4a zal de vertaling "
 "gebruiken uit msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -608,12 +608,12 @@ msgstr ""
 "'%s' is de versie in het meervoud van een tekst. po4a zal de vertaling "
 "gebruiken uit msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid kreeg twee invullingen: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -632,7 +632,7 @@ msgstr ""
 "%s\n"
 " Oude afgedankte vertaling."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -779,28 +779,28 @@ msgstr ""
 "argument:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "niet-symmetrische %s in '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr ""
 "Fout bij het controleren van het aantal argumenten voor het commando '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Onbekend commando: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr ""
 "Kan niet uit een bestand lezen zonder over de bestandsnaam te beschikken"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -811,17 +811,17 @@ msgstr ""
 "opgenomen, voegt u '-o exclude_include=%s' toe aan de opties op de "
 "opdrachtregel of in uw configuratiebestand po4a.conf."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich kan %s niet vinden"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Kan geen alias gebruiken voor het onbekende commando '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -830,41 +830,41 @@ msgstr ""
 "U gebruikt het oude formaat voor definities (%s). Gelieve deze "
 "definitieregel bij te werken."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "onbekende omgeving: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "niet overeenkomend einde van omgeving '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Verkeerd aantal argumenten voor het commando '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Er werd een facultatief argument opgegeven waar er een verplicht verwacht "
 "werd."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Commando '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: niet ondersteund formaat: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Het eerste argument van \\begin is verplicht."
 
@@ -927,58 +927,63 @@ msgstr ""
 "Misvormd afgeschermd div-blok: blok beginnend bij %s niet gesloten voor het "
 "einde van het bestand."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
-msgstr "Misvormde codering tijdens het lezen van bestand %s met tekenset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
+msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Misvormde codering tijdens het schrijven van teken '%s' naar bestand %s met "
-"tekenset %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
-"Misvormde codering tijdens het schrijven naar bestand %s met tekenset %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Kan %s na schrijven niet afsluiten: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Kan de po4a-header van %s niet lezen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "De eerste regel van %s lijkt geen po4a-header te zijn."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Syntactische fout in de po4a-header van %s, bij \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Ongeldig argument in de po4a-header van %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "De po4a-header van %s definieert de modus niet."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -987,57 +992,57 @@ msgstr ""
 "Ongeldige modus in de po4a-header van %s: moet 'before', 'after' of 'eof' "
 "zijn. Maar het is '%s'."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "De po4a-header van %s definieert de positie niet."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 "In de po4a-header werd geen begrenzing voor het einde opgegeven, maar de "
 "modus=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Er is geen position vereist bij mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Geen eindbegrenzing nodig wanneer mode = eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 "Kan het addendum niet toepassen omdat de bestandsnaam niet opgegeven werd"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Addendum %s bestaat niet."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Geen kandidaat-positie voor het addendum %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Meer dan één kandidaat-positie aangetroffen voor het addendum %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Addendum '%s' werd toegepast voor deze regel: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Addendum '%s' werd toegepast na de regel: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Addendum '%s' werd toegepast aan het einde van het bestand."
@@ -1060,7 +1065,8 @@ msgstr "%s: Kan %s niet afsluiten na lezen: %s"
 #: ../../lib/Locale/Po4a/Xml.pm:163
 #, perl-format
 msgid "Cannot have more than one input charset in XML files (%s and %s)"
-msgstr "Kan niet meer dan één invoertekenset hebben in XML-bestanden (%s en %s)"
+msgstr ""
+"Kan niet meer dan één invoertekenset hebben in XML-bestanden (%s en %s)"
 
 #: ../../lib/Locale/Po4a/Xml.pm:235
 #, perl-format
@@ -1081,7 +1087,20 @@ msgstr ">>> bestandsnaam = '%s1'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Interne fout: onbekende type-naam '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Het bestand %s declareert %s als codering, maar u heeft %s opgegeven als "
+"hoofdtekenset. Wijzig een van beide instellingen."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1090,7 +1109,7 @@ msgstr ""
 "Fout documenttype. Er werd '%s' verwacht. U kunt deze waarschuwing repareren "
 "via een optie voor -o doctype, of deze controle negeren met -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1099,14 +1118,14 @@ msgstr ""
 "Onverwachte afsluitende tag </%s> aangetroffen. Misschien zit het "
 "hoofddocument fout. Er wordt voortgedaan…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Onverwachte afsluitende tag </%s> aangetroffen. Misschien zit het "
 "hoofddocument fout."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1115,17 +1134,17 @@ msgstr ""
 "%s: attribuut '%s' is niet gedefinieerd in de moduleoptie 'attributes' en\n"
 "....  is niet vertaald voor het attribuutpad '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Slechte attribuutsyntaxis. Er wordt voortgedaan…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Slechte attribuutsyntaxis"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1136,13 +1155,13 @@ msgstr ""
 " *** de originele vertaaloptie is hier opgeheven aangezien ouderpad='%s' "
 "niet vertaald is,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: instelling foldattributes genegeerd omdat '%s' geen inline-markering is"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1157,7 +1176,7 @@ msgstr ""
 "\n"
 "Corrigeer uw vertaling."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1166,10 +1185,10 @@ msgstr ""
 "De optie '%s' is verouderd. Gebruik liever de categorieën translated/"
 "untranslated en/of break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Tag '%s' zowel in categorie %s als %s."
@@ -1810,6 +1829,24 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "Kon het PO-bestand niet kopiëren (%s -> %s): %s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Misvormde codering tijdens het lezen van bestand %s met tekenset %s: %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Misvormde codering tijdens het schrijven van teken '%s' naar bestand %s "
+#~ "met tekenset %s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Misvormde codering tijdens het schrijven naar bestand %s met tekenset %s: "
+#~ "%s"
+
+#, perl-format
 #~ msgid "Cannot find %s with kpsewhich"
 #~ msgstr "Kan %s niet vinden met kpsewhich"
 
diff --git a/po/bin/pl.po b/po/bin/pl.po
index 84765e7..a112ee7 100644
--- a/po/bin/pl.po
+++ b/po/bin/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.40.1\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2019-08-19 15:23+0000\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/po4a/po4a/pl/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -37,7 +37,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Błąd parsowania definicji makra: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -327,24 +327,24 @@ msgid ""
 msgstr ""
 "Napotkano sekwencję omijającą \\c. Nie jest to jeszcze w pełni obsługiwane."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Niesparowane \"<\" i \">\" w modyfikatorze czcionki. Komunikat powodujący "
 "ten błąd: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Nieznana sekwencja \"<\" lub \">\". Komunikat powodujący ten błąd: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Niepoprawna linia: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -354,17 +354,17 @@ msgstr ""
 "podręcznika Locale::Po4a::Man, by dowiedzieć się, w jaki sposób po4a może "
 "obsługiwać nowe makra."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Nieznany przetworzyć argumentów polecenia: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nieobsługiwana czcionka: \"%s\"."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -378,7 +378,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -392,7 +392,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -402,11 +402,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Po makrze .ie musi występować makro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -416,7 +416,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -425,7 +425,7 @@ msgstr ""
 "Strona dołącza inny plik, używając \"%s\". Proszę nie zapomnieć o "
 "przetłumaczeniu tego pliku (\"%s\")."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -434,7 +434,7 @@ msgstr ""
 "Strona używa żądania \"%s\", którego argument jest podzielony na wiele "
 "linii. Nie jest to jeszcze obsługiwane."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -480,23 +480,23 @@ msgstr ""
 "Niepoprawny plik po: %s\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "Nie można czytać z %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -513,57 +513,57 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "Dziwna linia: -->%s--<"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Nie można zapisać do pliku, nie znając jego nazwy"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Nie można pisać do %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 #| msgid "Can't write PO files with more than two plural forms."
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Nie można zapisać pliku PO, mającego więcej niż dwie formy liczby mnogiej."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Nie można zamknąć %s po zapisaniu: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't unlink %s: %s."
 msgid "Cannot unlink %s: %s."
 msgstr "Nie można usunąć %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't move %s to %s: %s."
 msgid "Cannot move %s to %s: %s."
 msgstr "Nie można przenieść %s do %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -572,7 +572,7 @@ msgstr ""
 "\"%s\" jest formą liczby pojedynczej komunikatu, po4a użyje tłumaczenia z "
 "msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -581,12 +581,12 @@ msgstr ""
 "\"%s\" jest formą liczby mnogiej komunikatu, po4a użyje tłumaczenia z "
 "msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid zdefiniowane dwukrotnie: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -605,7 +605,7 @@ msgstr ""
 "%s\n"
 "Stare tłumaczenie wyrzucone."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -749,28 +749,28 @@ msgstr ""
 "argumentem:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "niezamknięte %s w \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Błąd sprawdzania liczby argumentów polecenia \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Nieznane polecenie: \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Nie można czytać z pliku, nie znając jego nazwy"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -778,17 +778,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich nie może znaleźć %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Nie można używać aliasu do nieznanego polecenia \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -796,39 +796,39 @@ msgid ""
 msgstr ""
 "Używasz starego formatu definicji (%s). Proszę uaktualnić tę linię definicji."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "nieznane środowisko: \"%s\""
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "niepasujący koniec środowiska \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Niepoprawna liczba argumentów polecenia \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Podano opcjonalny argument, a oczekiwano argumentu obowiązkowego."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Polecenie \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: nieobsługiwany format: \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Pierwszy argument komendy \\begin jest obowiązkowy."
 
@@ -876,57 +876,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Nie można zamknąć %s po zapisaniu: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Nie można odczytać nagłówka po4a z %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Pierwsze linia %s nie wygląda jak nagłówek po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Błąd składni nagłówka po4a w %s, nieopodal \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Niepoprawny argument w nagłówku po4a w %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Nagłówek po4a w %s nie określa trybu."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -938,58 +946,58 @@ msgstr ""
 "Niepoprawny tryb w nagłówku po4a w %s: powinno to być \"before\" lub "
 "\"after\", ale nie %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Nagłówek po4a w %s nie określa pozycji."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Nie podano końcowego ograniczenia w nagłówku po4a dla trybu \"after\"."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "Nie podano końcowego ograniczenia w nagłówku po4a dla trybu \"after\"."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Nie można dodać załącznika, nie znając jego nazwy pliku"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Załącznik %s nie istnieje."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Brak kandydującej pozycji dla załącznika %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Możliwa więcej niż jedna pozycja dla załącznika %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Załącznik \"%s\" dodany przed tą linią: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Załącznik %s dodany po tej linii: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Załącznik %s dodany po na końcu pliku."
@@ -1036,7 +1044,15 @@ msgstr ">>> nazwa pliku = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Błąd wewnętrzny: nieznany identyfikator typu \"%s\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1046,7 +1062,7 @@ msgstr ""
 "używając opcji -o lub zignorować podobne sprawdzania, używając -o "
 "doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1055,14 +1071,14 @@ msgstr ""
 "Znaleziono nieoczekiwany tag zamykający </%s>. Główny dokument może być "
 "niepoprawny. Kontynuowanie…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Znaleziono nieoczekiwany tag zamykający </%s>. Główny dokument może być "
 "niepoprawny."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1071,17 +1087,17 @@ msgstr ""
 "%s: atrybut \"%s\" nie jest zdefiniowany w opcji \"attributes\" modułu i\n"
 "....  nie jest tłumaczony dla ścieżki atrybutu \"%s\""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Zła składnia atrybutu. Kontynuowanie…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Zła składnia atrybutu"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1092,14 +1108,14 @@ msgstr ""
 " *** oryginalna opcja tłumaczenia została nadpisana, ponieważ ścieżka "
 "nadrzędna=\"%s\" jest nieprzetłumaczona,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: ustawienie foldattributes zignorowane, ponieważ \"%s\" nie jest "
 "znacznikiem inline"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1109,7 +1125,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1118,10 +1134,10 @@ msgstr ""
 "Opcja \"%s\" jest przestarzała. Proszę używać kategorii translated/"
 "untranslated lub break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Element \"%s\" zarówno w kategorii %s, jak i %s."
diff --git a/po/bin/po4a.pot b/po/bin/po4a.pot
index 767636b..1faa361 100644
--- a/po/bin/po4a.pot
+++ b/po/bin/po4a.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: po4a 0.72\n"
+"Project-Id-Version: po4a 0.73\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-26 00:33+0200\n"
+"POT-Creation-Date: 2024-06-17 22:06+0200\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"
@@ -404,13 +404,13 @@ msgid ""
 msgstr ""
 
 #: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -418,7 +418,7 @@ msgid ""
 msgstr ""
 
 #: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr ""
@@ -432,67 +432,67 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -504,7 +504,7 @@ msgid ""
 " Old translation discarded."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -746,109 +746,117 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
 "Instead, it is '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
@@ -890,43 +898,51 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
 "option, or ignore this check with -o doctype=\"\"."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -934,12 +950,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -949,17 +965,17 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr ""
diff --git a/po/bin/pt.po b/po/bin/pt.po
index 25ac471..a62cc93 100644
--- a/po/bin/pt.po
+++ b/po/bin/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Po4a 0.40\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2023-01-10 11:47+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/po4a/po4a/pt/"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -43,7 +43,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Não foi possível analisar definição macro: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -327,23 +327,23 @@ msgid ""
 msgstr ""
 "Encontradas sequências de escape \\c. Isto não é ainda totalmente manipulado."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "'<' e '>' desequilibrados no modificador de fontes. Mensagem errónea: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Sequência '<' ou '>' desconhecida. Mensagem errónea: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Linha não interpretável: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -352,17 +352,17 @@ msgstr ""
 "Macro desconhecida '%s'. Remova-a do documento, ou consulte a página do "
 "manual Locale::Po4a:: para ver como po4a pode lidar com macros novas."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Não é possível analisar os argumentos do comando: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Fonte não suportada em: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -385,7 +385,7 @@ msgstr ""
 "Para mais informações sobre estes parâmetros, consulte a manpage de Locale::"
 "Po4a::Man.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -408,7 +408,7 @@ msgstr ""
 "Para mais informações sobre estes parâmetros, consulte a manpage de Locale::"
 "Po4a::Man.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -423,11 +423,11 @@ msgstr ""
 "é muito robusta. A opção '%s' mostra estas macros aos tradutores, mas as "
 "macros de groff não são de fácil utilização para os tradutores."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "A macro .ie deve ser seguida por uma macro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -443,7 +443,7 @@ msgstr ""
 "tradutores, mas as macros de groff não são de fácil utilização para os "
 "tradutores."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -452,7 +452,7 @@ msgstr ""
 "Esta página inclui outro ficheiro com '%s'. Não se esqueça de traduzir este "
 "ficheiro ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -461,7 +461,7 @@ msgstr ""
 "Esta página usa o pedido '%s' com o número de linhas no argumento. Isto "
 "ainda não é suportado."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -501,22 +501,22 @@ msgstr ""
 "Ficheiro po inválido %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Não foi possível ler de %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Não foi possível fechar %s após a leitura: %s"
@@ -530,50 +530,50 @@ msgstr "Mensagens com mais de 2 formas de plural não são suportadas."
 msgid "Parse error at: -->%s<--"
 msgstr "Erro de análise em: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Não foi possível gravar num ficheiro sem nome"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Não foi possível gravar a %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Não foi possível gravar ficheiros PO com mais de duas formas de plural."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Cannot close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Não foi possível fechar %s depois de escrever: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Não foi possível separar %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Não foi possível mover %s para %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "A avaliação do filtro fornecido falhou: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -582,7 +582,7 @@ msgstr ""
 "'%s' é a forma singular de uma mensagem, o po4a usará a tradução (%s) "
 "msgstr[0]."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -590,12 +590,12 @@ msgid ""
 msgstr ""
 "'%s' é a forma plural de uma mensagem, po4a usará a tradução (%s) msgstr[1]."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definida duas vezes: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -614,7 +614,7 @@ msgstr ""
 "%s\n"
 " Tradução antiga descartada."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -757,26 +757,26 @@ msgstr ""
 "adicional:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "%s não balanceado em '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Erro enquanto o número de argumentos do comando '%s' é verificado: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Comando desconhecido: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Não foi possível ler de um ficheiro sem ter um nome"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -784,17 +784,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich não pode encontrar %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Não é possível usar um alias para o comando desconhecido '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -803,39 +803,39 @@ msgstr ""
 "Você está usando o formato de definições antigas (%s). Por favor actualize o "
 "ficheiro de definições."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "ambiente desconhecido: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "fim de ambiente '%s' não correspondente"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Número errado de argumentos para o comando '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Um argumento opcional foi fornecido, mas é esperado um obrigatório."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Comando '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: formato não suportado '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "O primeiro argumento de \\begin é obrigatório."
 
@@ -893,55 +893,63 @@ msgstr ""
 "Bloco div vedado malformado: bloco que começa em %s não fechado antes do "
 "final do ficheiro."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Não foi possível fechar %s depois de escrever: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Não foi possível ler o cabeçalho de po4a de %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "A primeira linha de %s não parece ser um cabeçalho po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Erro de sintaxe no cabeçalho po4a de %s, perto de \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Argumento inválido no cabeçalho po4a de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "O cabeçalho po4a de %s não define o modo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -950,54 +958,54 @@ msgstr ""
 "Modo inválido no cabeçalho do po4a de %s: deve ser 'before', 'after' ou "
 "'eof'. Ao invés disso, é '%s'."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "O cabeçalho po4a de %s não define a posição."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Sem limite de fim dado no cabeçalho po4a, mas mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Nenhuma posição necessária quando mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Não é necessário um limite final quando mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Não foi possível aplicar apêndice quando o nome do ficheiro não é dado"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Apêndice %s não existe."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Nenhuma posição para o apêndice %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Mais do que uma posição encontrada para o apêndice %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Apêndice '%s' aplicado antes desta linha: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Apêndice '%s' aplicado depois desta linha: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Apêndice '%s' aplicado no fim deste ficheiro."
@@ -1041,7 +1049,15 @@ msgstr ">>> nome do ficheiro = \"%s\""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Erro interno: identificador de tipo desconhecido '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1050,7 +1066,7 @@ msgstr ""
 "Tipo de documento mau. '%s' esperado. Você pode corrigir esse aviso com "
 "opção -o doctype, ou ignorar esta verificação com -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1059,14 +1075,14 @@ msgstr ""
 "Encontrada etiqueta de fecho </%s> inesperada. O documento principal pode "
 "estar errado. Continuando…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Encontrada etiqueta de fecho </%s> inesperada. O documento principal pode "
 "estar errado."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1075,17 +1091,17 @@ msgstr ""
 "%s: o atributo \"%s\" não está definido na opção do módulo \"attributes\" e\n"
 "....  não está traduzido para o caminho do atributo \"%s\""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Sintaxe de atributo incorreta.  A continuar…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Sintaxe de atributo incorreta"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1096,14 +1112,14 @@ msgstr ""
 " *** a opção de tradução original é sobrescrita aqui já que o caminho "
 "pai=\"%s\" não está traduzido,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: configuração de foldattributes ignorada já que \"%s\" não é uma tag em "
 "linha"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1118,7 +1134,7 @@ msgstr ""
 "\n"
 "Por favor, conserte a sua tradução."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1127,10 +1143,10 @@ msgstr ""
 "A opção '%s' é obsoleta. Por favor utilize as categorias traduzida/não "
 "traduzida e/ou break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Etiqueta '%s' tanto em categorias %s como %s."
diff --git a/po/bin/pt_BR.po b/po/bin/pt_BR.po
index 8683211..c201370 100644
--- a/po/bin/pt_BR.po
+++ b/po/bin/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.45\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-02-17 08:01+0000\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/po4a/"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -41,7 +41,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Não foi possível analisar definição macro: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -323,23 +323,23 @@ msgid ""
 "input: %s"
 msgstr "Sequência de escape \\c encontrada. Não suporte completo a isso."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "\"<\" e \">\" não balanceados no modificador de fonte. Mensagem errônea: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Sequência \"<\" e \">\" desconhecida. Mensagem errônea: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Linha não analisável: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -348,17 +348,17 @@ msgstr ""
 "Macro desconhecida \"%s\". Remova-a do documento ou veja a página man de "
 "Locale::Po4a::Man para ver como po4a pode manipular novas macros."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Não foi possível analisar os argumentos do comando: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Fonte não suportada em: \"%s\"."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -382,7 +382,7 @@ msgstr ""
 "Consulte a página man de Locale::Po4a::Man para obter mais informações sobre "
 "esses parâmetros.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -405,7 +405,7 @@ msgstr ""
 "Consulte a página man de Locale::Po4a::Man para obter mais informações sobre "
 "esses parâmetros.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -420,11 +420,11 @@ msgstr ""
 "essas macros para os tradutores, mas as macros groff não são fáceis de usar "
 "para os tradutores."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "A macro .ie deve vir seguida por uma macro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -439,7 +439,7 @@ msgstr ""
 "mostra essas macros para os tradutores, mas as macros groff não são fáceis "
 "de usar para os tradutores."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -448,7 +448,7 @@ msgstr ""
 "Essa página inclui outro arquivo com \"%s\". Não se esqueça de traduzir este "
 "arquivo (\"%s\")."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -457,7 +457,7 @@ msgstr ""
 "Esta página usa a requisição \"%s\" com o número de linhas em argumento. Não "
 "há suporte a isso."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -497,14 +497,14 @@ msgstr ""
 "Arquivo po inválido %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Não foi possível ler de %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -513,8 +513,8 @@ msgstr ""
 "O arquivo %s começa com um caractere BOM indicando que sua codificação é "
 "UTF-8, mas você especificou %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Não foi possível fechar %s depois de ler: %s"
@@ -528,16 +528,16 @@ msgstr "Não há suporte a mais do que 2 formas de plural nas mensagens."
 msgid "Parse error at: -->%s<--"
 msgstr "Erro de análise em: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Não é possível escrever em um arquivo sem nome"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Não é possível escrever em %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -546,33 +546,33 @@ msgstr ""
 "msgmerge sofre alguns bugs quando arquivos PO não são codificados em UTF-8, "
 "Recodificando %s para UTF-8 (era %s) para contornar o problema.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Não foi possível escrever arquivos PO com mais do que duas formas de plural."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Não foi possível fechar %s depois de escrever: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Não é possível desvincular %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Não é possível mover %s para %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "A avaliação do filtro fornecido falhou: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -581,7 +581,7 @@ msgstr ""
 "\"%s\" é a forma singular de uma mensagem, po4a vai usar a tradução de "
 "msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -590,12 +590,12 @@ msgstr ""
 "\"%s\" é a forma plural de uma mensagem, po4a vai usar a tradução de "
 "msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definida duas vezes: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -614,7 +614,7 @@ msgstr ""
 "%s\n"
 " Tradução antiga descartada."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -757,26 +757,26 @@ msgstr ""
 "adicional:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "%s desbalanceado em \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Erro enquanto verificava o número de argumentos do comando \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Comando desconhecido: \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Não é possível ler de arquivo sem ter um nome de arquivo"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -787,18 +787,18 @@ msgstr ""
 "seja incluído, adicione '-o exclude_include=%s' às opções, na linha de "
 "comando ou em seu arquivo po4a.conf."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich não pôde localizar %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr ""
 "Não foi possível usa um apelido (alias) para o comando desconhecido \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -807,39 +807,39 @@ msgstr ""
 "Você está usando formato de definições antigo (%s). Atualize a linha de "
 "definição."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "Ambiente desconhecido: \"%s\""
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "Fim de ambiente \"%s\" não confere"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Número errado de argumentos para o comando \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Um argumento opcional foi fornecido, mas um obrigatório é esperado."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Comando \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: formato sem suporte: \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "O primeiro argumento de \\begin é obrigatório."
 
@@ -902,55 +902,63 @@ msgstr ""
 "Bloco div cercado malformado: Bloco começando em %s não fechado antes do "
 "final do arquivo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Não foi possível fechar %s depois de escrever: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Não foi possível o cabeçalho po4a de %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Primeira linha de %s não parece um cabeçalho po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Erro de sintaxe no cabeçalho po4a de %s, perto de \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Argumento inválido no cabeçalho po4a de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "O cabeçalho po4a de %s não define o modo."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -959,57 +967,57 @@ msgstr ""
 "Modo inválido no cabeçalho po4a de %s: deve ser \"before\", \"after\" ou "
 "\"eof\", e não \"%s\"."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "O cabeçalho po4a de %s não define a posição."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 "Nenhum limite de finalização fornecido no cabeçalho po4a, mas modo é igual a "
 "after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Nenhuma posição necessária quando mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Nenhum limite de finalização necessário quando mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 "Não é possível aplicar adendo quando nenhum nome de arquivo é fornecido"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Adendo %s não existe."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Nenhuma posição candidata ao adendo %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Mais do que uma posição candidata encontrada para o adendo %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Adendo \"%s\" aplicada antes desta linha: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Adendo \"%s\" aplicada após a linha: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Adendo \"%s\" aplicado no fim do arquivo."
@@ -1055,7 +1063,20 @@ msgstr ">>> nome do arquivo = \"%s\""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Erro interno: identificador de tipo desconhecido \"%s\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"O arquivo %s declara %s como codificação, mas você forneceu %s como conjunto "
+"de caracteres mestre. Altere qualquer uma dessas configurações."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1064,7 +1085,7 @@ msgstr ""
 "Tipo de documento inválido. \"%s\" esperado. Você pode corrigir este aviso "
 "com uma opção -o doctype ou ignore essa verificação com -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1073,14 +1094,14 @@ msgstr ""
 "Tag de fechamento inesperada </%s> encontrada. O documento principal pode "
 "estar errado. Continuando…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Tag de fechamento inesperada </%s> encontrada. O documento principal pode "
 "estar errado."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1089,17 +1110,17 @@ msgstr ""
 "%s: o atributo \"%s\" não está definido na opção do módulo \"attributes\" e\n"
 "....  não está traduzido para o caminho do atributo \"%s\""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Sintaxe de atributo incorreta. Continuando…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Sintaxe de atributo incorreta"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1110,14 +1131,14 @@ msgstr ""
 " *** a opção de tradução original é sobrescrita aqui já que o caminho "
 "pai=\"%s\" não está traduzido,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: configuração de foldattributes ignorada já que \"%s\" não é uma tag em "
 "linha"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1132,7 +1153,7 @@ msgstr ""
 "\n"
 "Por favor, conserte a sua tradução."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1141,10 +1162,10 @@ msgstr ""
 "A opção \"%s\" está obsoleta. Use as categorias translated/untranslated e/ou "
 "break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Tag \"%s\" tanto nas categorias %s e %s."
diff --git a/po/bin/ru.po b/po/bin/ru.po
index 98de3a9..d86e2f6 100644
--- a/po/bin/ru.po
+++ b/po/bin/ru.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.52-pre\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-02-28 21:43+0000\n"
 "Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/po4a/po4a/ru/>\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Не удалось разобрать макроопределение: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -330,22 +330,22 @@ msgstr ""
 "Обнаружена управляющая последовательность \\c. На данный момент она пока "
 "поддерживается лишь частично."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Непарные «<» и «>» в модификаторе шрифта. Сообщение с ошибкой: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Неизвестная последовательность «<» или «>». Сообщение с ошибкой: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Не удалось разобрать строку: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -355,17 +355,17 @@ msgstr ""
 "на man-странице Locale::Po4a::Man о том, как обрабатывать новые макросы в "
 "po4a."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Невозможно разобрать аргументы команды: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Неподдерживаемый шрифт в: «%s»."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -388,7 +388,7 @@ msgstr ""
 "Больше сведений о данных параметрах вы можете почерпнуть из man-страницы "
 "Locale::Po4a::Man.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -411,7 +411,7 @@ msgstr ""
 "Больше сведений о данных параметрах вы можете почерпнуть из man-страницы "
 "Locale::Po4a::Man.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -428,11 +428,11 @@ msgstr ""
 "учтите, что groff-макросы не слишком приятны на глаз, так что это несколько "
 "осложнит задачу последних."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "После макроса .ie должен быть макрос .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -449,7 +449,7 @@ msgstr ""
 "учтите, что groff-макросы не слишком приятны на глаз, так что это несколько "
 "осложнит задачу последних."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -458,7 +458,7 @@ msgstr ""
 "В эту страницу включается другой файл с помощью «%s». Не забудьте его "
 "перевести («%s»)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -467,7 +467,7 @@ msgstr ""
 "В данной странице выполняется запрос «%s» с параметром, который содержит "
 "несколько строк. Это пока не поддерживается."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -507,14 +507,14 @@ msgstr ""
 "Неверный формат po файла %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Не удалось прочитать из %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -523,8 +523,8 @@ msgstr ""
 "В начале файла %s обнаружена BOM-последовательность, что говорит о том, что "
 "его кодировка UTF-8, однако вы указали кодировку '%s'."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Не удалось закрыть %s после чтения: %s"
@@ -539,16 +539,16 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "Ошибка разбора: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Не удалось записать в файл без имени"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Не удалось записать в %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -558,34 +558,34 @@ msgstr ""
 "отлична от UTF-8. Файл %s будет перекодирован в UTF-8 (из %s), дабы обойти "
 "эту проблему.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Запись PO-файлов, в которых более двух форм множественного числа, не "
 "поддерживается."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Не удалось закрыть %s после записи: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Не удалось удалить %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Не удалось переместить %s в %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Не удалось выполнить заданный фильтр: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -594,7 +594,7 @@ msgstr ""
 "«%s» — форма единственного числа сообщения, po4a будет использовать перевод "
 "msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -603,12 +603,12 @@ msgstr ""
 "«%s» — форма множественного числа сообщения, po4a будет использовать перевод "
 "msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid определён дважды: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -627,7 +627,7 @@ msgstr ""
 "%s\n"
 " Старый перевод отброшен."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -770,26 +770,26 @@ msgstr ""
 "аргументами:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "нет пары для %s в «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Ошибка во время проверки числа аргументов команды «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Неизвестная команда: «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Не удалось прочитать из файла без указания имени файла"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -800,17 +800,17 @@ msgstr ""
 "добавьте '-o exclude_include=%s' в параметры (непосредственно в командной "
 "строке или же в po4a.conf)."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich не может найти %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Невозможно использовать псевдоним на неизвестную команду «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -818,39 +818,39 @@ msgid ""
 msgstr ""
 "Вы используете старый формат определений (%s). Обновите строку определения."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "неизвестное окружение: «%s»"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "несовпадающий конец окружения «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Некорректное количество аргументов команды «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Указан необязательный аргумент, но ожидается сначала обязательный."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Команда «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: неподдерживаемый формат: «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Первый аргумент для \\begin обязателен."
 
@@ -915,55 +915,63 @@ msgstr ""
 "Некорректное обрамление блока: Блок, начинается на строке %s, но не "
 "закрывается до конца файла."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
-msgstr "Ошибка чтения из файла %s в кодировке %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
+msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
-msgstr "Ошибка записи символа '%s' при записи в файл %s в кодировке %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
+msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
-msgstr "Ошибка при записи в файл %s в кодировке %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
+msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Не удалось закрыть %s после записи: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Не удалось прочитать заголовок po4a из %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Первая строка %s не является началом заголовка po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Синтаксическая ошибка в заголовке po4a %s, рядом с «%s»"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Неправильный аргумент в заголовке po4a %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "В заголовке po4a %s не определён режим."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -972,55 +980,55 @@ msgstr ""
 "Неправильный режим в заголовке po4a %s: должно быть «before», «after» или "
 "«eof», хотя указан «%s»."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "В заголовке po4a %s не определена позиция."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 "Не указана конечная граница в заголовке po4a при заданном режиме after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Если mode=eof, задавать позицию не нужно."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Не указана конечная граница, которая необходима, когда mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Невозможно применить дополнение, если не задано имя файла"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Дополнение %s не существует."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Не указана позиция для дополнения %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Найдено более одной позиции для дополнения %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Дополнение «%s» применено перед строкой: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Дополнение «%s» применено после строки: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Дополнение «%s» применено в конце файла."
@@ -1064,7 +1072,20 @@ msgstr ">>> имя файла = «%s»"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Внутренняя ошибка: неизвестный тип идентификатора «%s»."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Данный файл (%s) заявляет кодировку %s, однако в качестве кодировки мастер-"
+"файла указана %s . Приведите эти параметры в соответствие."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1074,7 +1095,7 @@ msgstr ""
 "указав параметр -o тип_документа, или игнорировать эту проверку с помощью -o "
 "doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1083,14 +1104,14 @@ msgstr ""
 "Обнаружен неожиданный закрывающий тег </%s>. Вероятно, ошибка в мастер-"
 "документе. Продолжаем…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Обнаружен неожиданный закрывающий тег </%s>. Вероятно, ошибка в мастер-"
 "документе."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1099,17 +1120,17 @@ msgstr ""
 "%s: атрибут «%s» не определён в опции «attributes» модуля и\n"
 ".... и не переведён для пути атрибута «%s»"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Неправильный синтаксис атрибута. Продолжаем…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Неправильный синтаксис атрибута"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1120,14 +1141,14 @@ msgstr ""
 " *** оригинальная опция перевода переопределена, так как родительский "
 "путь=«%s» не переведён,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: настройка foldattributes игнорируется, так как «%s» не является "
 "вложенным тегом"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1142,7 +1163,7 @@ msgstr ""
 "\n"
 "Исправьте свой перевод."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1151,10 +1172,10 @@ msgstr ""
 "Параметр «%s» устарел. Используйте категории translated/untranslated и/или "
 "break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Тег «%s» одновременно входит в категории %s и %s."
@@ -1782,6 +1803,19 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "Не удалось скопировать PO-файл (%s -> %s): %s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr "Ошибка чтения из файла %s в кодировке %s: %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr "Ошибка записи символа '%s' при записи в файл %s в кодировке %s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr "Ошибка при записи в файл %s в кодировке %s: %s"
+
+#, perl-format
 #~ msgid ""
 #~ "Force the encoding of %s to UTF-8 (was %s), as mixing encodings may break "
 #~ "msgmerge.\n"
diff --git a/po/bin/sl.po b/po/bin/sl.po
index 91f1ab5..79c3534 100644
--- a/po/bin/sl.po
+++ b/po/bin/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2018-11-06 19:42+0100\n"
 "Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <ubuntu-l10n-slv@lists.ubuntu.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -42,7 +42,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -334,23 +334,23 @@ msgid ""
 "input: %s"
 msgstr "Najdeno je bilo zaporedje izhoda \\c. To še ni popolnoma upravljano."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Neuravnotežena '<' in '>' v spremenilniku pisave. Okvarjeno sporočilo: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Neznano zaporedje '<' ali '>' sequence. Okvarjeno sporočilo: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Nerazčlenjiva vrstica: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -359,17 +359,17 @@ msgstr ""
 "Neznan makro '%s'. Odstranite ga iz dokumenta ali pa si oglejte stran man "
 "Locale::Po4a::Manza ogled kako lahko po4a upravlja nove makre."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Ni mogoče razčleniti argumentov ukaza: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Nepodprta pisava v: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -383,7 +383,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -397,7 +397,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -407,11 +407,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Makru .ie mora slediti makro .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -421,7 +421,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -430,7 +430,7 @@ msgstr ""
 "Ta stran vključuje drugo datoteko z '%s'. Ne pozabite prevesti te datoteke "
 "('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -439,7 +439,7 @@ msgstr ""
 "Ta stran uporablja zahtevo '%s' s številom vrstic v argumentu. To še ni "
 "podprto."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -483,23 +483,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "Ni mogoče brati iz %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -515,56 +515,56 @@ msgstr "Sporočila z več kot 2 množinskima oblikama niso podprta."
 msgid "Parse error at: -->%s<--"
 msgstr "Čudna vrstica: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Ni mogoče pisati v datoteko brez imena datoteke"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Ni mogoče zapisati v %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 #| msgid "Can't write PO files with more than two plural forms."
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "V PO datoteke z več kot dvema množinskima oblikama ni mogoče pisati."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Ni mogoče zapreti %s po zapisovanju: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't unlink %s: %s."
 msgid "Cannot unlink %s: %s."
 msgstr "Ni mogoče razvezati %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't move %s to %s: %s."
 msgid "Cannot move %s to %s: %s."
 msgstr "%s ni mogoče premakniti v %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -572,7 +572,7 @@ msgid ""
 msgstr ""
 "'%s' je edninska oblika sporočila, po4a bo uporabil prevod msgstr[0]  (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -580,12 +580,12 @@ msgid ""
 msgstr ""
 "'%s' je množinska oblika sporočila. po4a bo uporabil prevod msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid je določen dvakrat: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -604,7 +604,7 @@ msgstr ""
 "%s\n"
 " Star prevod je bil zavzržen."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -751,28 +751,28 @@ msgid ""
 "   -o debug=onsgmls"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "ne-uravnotežen %s v '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Napaka med preverjanjem števila argumentov ukaza '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Neznan ukaz: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Iz datoteke ni mogoče brati brez imena datoteke"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -780,17 +780,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpseqhich ne more najti %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Za neznan ukaz '%s' ni mogoče uporabiti vzdevka"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -798,39 +798,39 @@ msgid ""
 msgstr ""
 "Uporabljate staro obliko definicij (%s). Posodobite to vrstico definicij."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "neznano okolje: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "neujemajoč konec okolja '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Napačno število argumentov za ukaz '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Zagotovljen je bil izbirni argument, vendar je bil pričakovan obvezen."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Ukaz '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: nepodprta vrsta: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Prvi argument \\begin je obvezen."
 
@@ -879,57 +879,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Ni mogoče zapreti %s po zapisovanju: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Ni mogoče brati glave po4a iz %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Prva vrstica %s ni videti kot glava po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Napaka skladnje v po4a glavi %s, blizu \"%s\" "
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Neveljaven agrument v glavi po4a %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "po4a glava %s ne določi načina."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -941,58 +949,58 @@ msgstr ""
 "Način v po4a glavi %s je neveljaven: moral bi biti 'before' ali 'after' ne "
 "%s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "po4a glava %s ne določi položaja. "
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "V glavi po4a ni bila podana končna meja, vendar je mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "V glavi po4a ni bila podana končna meja, vendar je mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Ni mogoče uveljaviti dopolnila, ko ime datoteke ni podano"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Dopolnilo %s ne obstaja."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Ni kandidata za položaj za dopolnilo %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Za dopolnilo %s je bil najden več kot en kandidat za položaj."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Dopolnilo '%s' je bilo uveljavljeno pred to vrstico: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Dopolnilo '%s' je bilo uveljavljeno po vrstici: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Dopolnilo '%s' je bilo uveljavljeno na koncu datoteke."
@@ -1039,7 +1047,15 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Notranja napaka: neznana vrsta določila '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1048,7 +1064,7 @@ msgstr ""
 "Slava vrsta dokumenta. Pričakovan je bil '%s'. To opozorilo lahko popravite "
 "z možnostjo -o doctype ali to preverjanje prezrete z -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1057,32 +1073,32 @@ msgstr ""
 "Najdena je bila nepričakovana oznaka zaprtja </%s>. Glavni dokument je morda "
 "napačen. Nadaljevanje…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Najdena je bila nepričakovana oznaka zapiranja </%s>. Glavni dokument je "
 "morda napačen."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Slaba skladnja atributa. Nadaljevanje…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, fuzzy, perl-format
 #| msgid "Bad attribute syntax"
 msgid "%s: Bad attribute syntax"
 msgstr "Slaba skladnja atributa"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1090,12 +1106,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1105,7 +1121,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1114,10 +1130,10 @@ msgstr ""
 "Možnost '%s' je zastarela. Uporabite kategorije prevedeno/neprevedeno in/ali "
 "premor/v vrstici/vsebnik."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Označi '%s' tako v kategorijah %s in %s."
diff --git a/po/bin/sr.po b/po/bin/sr.po
new file mode 100644
index 0000000..38ce8a6
--- /dev/null
+++ b/po/bin/sr.po
@@ -0,0 +1,1805 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the po4a package.
+# eevan78 <ivan.pesic@gmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: po4a 0.72\n"
+"Report-Msgid-Bugs-To: martin.quinson@debian.org\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
+"PO-Revision-Date: 2024-06-13 07:43+0000\n"
+"Last-Translator: eevan78 <ivan.pesic@gmail.com>\n"
+"Language-Team: Serbian <https://hosted.weblate.org/projects/po4a/po4a/sr/>\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.6-dev\n"
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
+#: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
+#: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
+#: ../../lib/Locale/Po4a/Yaml.pm:107
+#, perl-format
+msgid "Unknown option: %s"
+msgstr "Непозната опција: %s"
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:239
+#, perl-format
+msgid "Invalid compatibility setting: '%s'. It must be either '%s' or '%s'."
+msgstr ""
+"Неважећа поставка компатибилности: '%s'. Мора да буде било '%s' или '%s'."
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:308
+#, perl-format
+msgid "Unable to parse macro definition: %s"
+msgstr "Дефиниција макроа не може да се парсира: %s"
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
+#: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
+#, perl-format
+msgid "Cannot open %s: %s"
+msgstr "Не може да се отвори %s: %s"
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:392
+#, perl-format
+msgid ""
+"Detection of two line titles failed at %s\n"
+"Please install the Unicode::GCString module (error: %s)."
+msgstr ""
+"Детекција дволинијских наслова није успела у %s\n"
+"Инсталирајте модул Unicode::GCString (грешка: %s)."
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:568
+#, perl-format
+msgid ""
+"'%s' seems to be a two-lines title underlined with '%s', but the underlines "
+"are too short or too long compared to the title length. You may want to fix "
+"your master document."
+msgstr ""
+"Изгледа да је '%s' дворедни наслов подвучен са '%s', али је подвлака или "
+"прекратка или предугачка у поређењу са дужином наслова. Вероватно је "
+"потребно да поправите свој мастер документ."
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:769
+msgid ""
+"Po4a's tablecells mode only supports PSV formatted tables with '|' "
+"separators. Disabling tablecells and falling back to block mode for this "
+"table."
+msgstr ""
+"Po4a режим ћелија табеле подржава само PSV форматиране табеле са '|' "
+"граничницима. За ову табелу се искључује режим ћелија табеле и прелази на "
+"блоковски режим."
+
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:1084
+msgid ""
+"It seems that you are adding unindented content to an item. The standard "
+"allows this, but you may still want to change your document to use indented "
+"text to provide better visual clues to writers."
+msgstr ""
+"Изгледа да ставки додајете неувучени садржај. Стандард то дозвољава, али би "
+"ипак требало да измените свој документ тако да се користи увучени текст, као "
+"би писци имали бољу визуелну помоћ."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:25
+msgid "Please provide a module name"
+msgstr "Молимо да задате име модула"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:50
+#, perl-format
+msgid "Unknown format type: %s."
+msgstr "Тип формата се не препознаје: %s."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:51
+#, perl-format
+msgid "Module loading error: %s"
+msgstr "Грешка код учитавања модула: %s"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:61
+msgid "List of valid formats:"
+msgstr "Листа важећих формата:"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:65
+msgid "asciidoc: AsciiDoc format."
+msgstr "asciidoc: AsciiDoc формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:67
+msgid "dia: uncompressed Dia diagrams."
+msgstr "dia: некомпресовани Dia дијаграми."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:69
+msgid "docbook: DocBook XML."
+msgstr "docbook: DocBook XML формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:71
+msgid "guide: Gentoo Linux's XML documentation format."
+msgstr "guide: XML формат Gentoo Linux документације."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:73
+msgid "ini: INI format."
+msgstr "ini: INI формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:75
+msgid "kernelhelp: Help messages of each kernel compilation option."
+msgstr "kernelhelp: Поруке помоћи сваке опције код компајлирања кернела."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:77
+msgid "latex: LaTeX format."
+msgstr "latex: LaTeX формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:79
+msgid "man: Good old manual page format."
+msgstr "man: Добри стари формат странице документације."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:81
+msgid "pod: Perl Online Documentation format."
+msgstr "pod: Perl Online Documentation формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:83
+msgid "rubydoc: Ruby Documentation (RD) format."
+msgstr "rubydoc: Ruby Documentation (RD) формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:85
+msgid "sgml: either DebianDoc or DocBook DTD."
+msgstr "sgml: било DebianDoc или DocBook DTD."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:87
+msgid "texinfo: The info page format."
+msgstr "texinfo: info page формат."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:89
+msgid "tex: generic TeX documents (see also latex)."
+msgstr "tex: генерички TeX документи (погледајте такође latex)."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:91
+msgid "text: simple text document."
+msgstr "text: прости текстуални документ."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:93
+msgid "wml: WML documents."
+msgstr "wml: WML документи."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:95
+msgid "xhtml: XHTML documents."
+msgstr "xhtml: XHTML документи."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:97
+msgid "xml: generic XML documents (see also docbook)."
+msgstr "xml: генерички XML документи (погледајте такође docbook)."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:99
+msgid "yaml: YAML documents."
+msgstr "yaml: YAML документи."
+
+#: ../../lib/Locale/Po4a/Common.pm:108
+#, perl-format
+msgid ""
+"%s version %s.\n"
+"Written by Martin Quinson and Denis Barbier.\n"
+"\n"
+"Copyright © 2002-2022 Software in the Public Interest, Inc.\n"
+"This is free software; see source code for copying\n"
+"conditions. There is NO warranty; not even for\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+"%s верзија %s.\n"
+"Написали Мартин Квинсон и Денис Барбије.\n"
+"\n"
+"Ауторска права © 2002–2022 Software in the Public Interest, Inc.\n"
+"Ово је слободан софтвер; погледајте изворни код за услове\n"
+"копирања. НЕМА гаранције; чак ни за МОГУЋНОСТ\n"
+"ПРОДАЈЕ или ПОДОБНОСТ ЗА ОДРЕЂЕНУ НАМЕНУ."
+
+#: ../../lib/Locale/Po4a/InProgress/Debconf.pm:178
+#, perl-format
+msgid "Translated field in master document: %s"
+msgstr "Преведено поље у мастер документу: %s"
+
+#: ../../lib/Locale/Po4a/InProgress/NewsDebian.pm:90
+msgid "Begin of a new entry before the end of previous one"
+msgstr "Почетак нове ставке пре краја претходне"
+
+#: ../../lib/Locale/Po4a/KernelHelp.pm:98
+msgid "Syntax error"
+msgstr "Синтаксна грешка"
+
+#: ../../lib/Locale/Po4a/Man.pm:513
+msgid ""
+"Invalid 'groff_code' value. Must be one of 'fail', 'verbatim', 'translate'."
+msgstr ""
+"Неважећа 'groff_code' вредност. Мора да буде једно од 'fail', 'verbatim', "
+"'translate'."
+
+#: ../../lib/Locale/Po4a/Man.pm:561
+msgid ""
+"The no_wrap parameters must be a set of comma-separated begin:end couples.\n"
+msgstr ""
+"no_wrap параметри морају да буду скуп begin:end парова радвојених зарезима.\n"
+
+#: ../../lib/Locale/Po4a/Man.pm:608
+msgid "Invalid 'unknown_macros' value. Must be one of:\n"
+msgstr "Неисправна 'unknown_macros' вредност. Мора да буде једно од:\n"
+
+#: ../../lib/Locale/Po4a/Man.pm:674
+msgid ""
+"This file was generated with Pod::Man. Translate the POD file with the pod "
+"module of po4a."
+msgstr ""
+"Овај фајл је генерисан са Pod::Man. Преведите POD фајл користећи pod модул "
+"програма po4a."
+
+#: ../../lib/Locale/Po4a/Man.pm:684
+msgid ""
+"This file was generated with help2man. Translate the source file with the "
+"regular gettext."
+msgstr ""
+"Овај фајл је генерисан са help2man. Преведите изворни фајл обичним gettext."
+
+#: ../../lib/Locale/Po4a/Man.pm:693
+msgid ""
+"This file was generated with docbook-to-man. Translate the source file with "
+"the sgml module of po4a."
+msgstr ""
+"Овај фајл је генериса са docbook-to-man. Преведите изворни фајл користећи "
+"sgml модул програма po4a."
+
+#: ../../lib/Locale/Po4a/Man.pm:703
+msgid ""
+"This file was generated with docbook2man. Translate the source file with the "
+"sgml module of po4a."
+msgstr ""
+"Овај фајл је генерисан са docbook2man. Преведите изворни фајл користећи sgml "
+"модул програма po4a."
+
+#: ../../lib/Locale/Po4a/Man.pm:713 ../../lib/Locale/Po4a/Man.pm:734
+#, perl-format
+msgid ""
+"This file was generated with %s. You should translate the source file, but "
+"continuing anyway."
+msgstr ""
+"Овај фајл је генерисан са %s. Требало би да преведете изворни фајл, али се "
+"ипак наставља даље."
+
+#: ../../lib/Locale/Po4a/Man.pm:724
+msgid ""
+"This file was generated with db2man.xsl. Translate the source file with the "
+"xml module of po4a."
+msgstr ""
+"Овај фајл је генерисан са db2man.xsl. Преведите изворни фајл користећи xml "
+"модул програма po4a."
+
+#: ../../lib/Locale/Po4a/Man.pm:748
+#, perl-format
+msgid ""
+"This file contains the line '%s'. You should translate the source file, but "
+"continuing anyway."
+msgstr ""
+"Овај фајл садржи линију '%s'. Требало би да преведете изворни фајл, али се "
+"ипак наставља даље."
+
+#: ../../lib/Locale/Po4a/Man.pm:821
+#, perl-format
+msgid ""
+"Font modifiers followed by a command may disturb po4a.  You should either "
+"remove the font modifier '%s', or integrate a \\f font modifier in the "
+"following command ('%s'), but continuing anyway."
+msgstr ""
+"Модификатори фонта иза којих следи команда могу да сметају програму po4a. "
+"Требало би или да уклоните модификатор фонта '%s', или да интегришете "
+"модификатор фонта \\f  у наредну команду ('%s'), али се ипак наставља даље."
+
+#: ../../lib/Locale/Po4a/Man.pm:942
+msgid ""
+"The unshiftline is not supported for the man module. Please send a bug "
+"report with the groff page that generated this error."
+msgstr ""
+"Unshiftline се не подржава за man модул. Молимо пошаљите извештај о багу "
+"заједно са groff страницом која је изазвала ову грешку."
+
+#: ../../lib/Locale/Po4a/Man.pm:1002
+#, perl-format
+msgid ""
+"macro %s called without arguments. Even if placing the macro arguments on "
+"the next line is authorized by man(7), handling this would make the po4a "
+"parser too complicate. Please simply put the macro args on the same line."
+msgstr ""
+"макро %s је позван без аргумената. Мада је према man(7) дозвољено постављање "
+"аргумената у наредну линију, обрађивање тога би превише искомпликовало po4a "
+"парсер. Молимо да једноставно ставите аргументе макроа у исту линију."
+
+#: ../../lib/Locale/Po4a/Man.pm:1034
+#, perl-format
+msgid ""
+"Escape sequence \\c encountered. This is not completely handled yet. Faulty "
+"input: %s"
+msgstr ""
+"Наишло се на секвенцу означавања \\c. Ово се још увек не обрађује у "
+"потпуности. Неисправан унос: %s"
+
+#: ../../lib/Locale/Po4a/Man.pm:1216
+#, perl-format
+msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
+msgstr "Неупарено '<' и '>' у модификатору фонта. Неисправна порука: %s"
+
+#: ../../lib/Locale/Po4a/Man.pm:1257
+#, perl-format
+msgid "Unknown '<' or '>' sequence. Faulty message: %s"
+msgstr "Непозната '<' или '>' секвенца. Неисправна порука: %s"
+
+#: ../../lib/Locale/Po4a/Man.pm:1411
+#, perl-format
+msgid "Unparsable line: %s"
+msgstr "Линија не може да се парсира: %s"
+
+#: ../../lib/Locale/Po4a/Man.pm:1494
+#, perl-format
+msgid ""
+"Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
+"Po4a::Man manpage to see how po4a can handle new macros."
+msgstr ""
+"Непознат макро '%s'. Уклоните га из документа, или погледајте Locale::Po4a::"
+"Man man страницу да сазнате како po4a може да обради нове макрое."
+
+#: ../../lib/Locale/Po4a/Man.pm:1702
+#, perl-format
+msgid "Cannot parse command arguments: %s"
+msgstr "Аргументи команде не могу да се парсирају: %s"
+
+#: ../../lib/Locale/Po4a/Man.pm:1832
+#, perl-format
+msgid "Unsupported font in: '%s'."
+msgstr "Фонт није подржан у: '%s'."
+
+#: ../../lib/Locale/Po4a/Man.pm:2254
+#, perl-format
+msgid ""
+"This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
+"did not specify the expected po4a behavior when '%s' is used. You will get "
+"an error if this macro is actually used in your page.\n"
+"Add your macro to one of the '%s', '%s', '%s', '%s', '%s' or '%s' parameters "
+"to avoid issues.\n"
+"For example, passing '%s' to po4a will ensure that the defined macro remains "
+"hidden from translators.\n"
+"Please refer to the manpage of Locale::Po4a::Man for more info on these "
+"parameters.\n"
+msgstr ""
+"Ова страница дефинише нови макро ’%s’ са ’%s’ (коментар унутар линије: %s), "
+"али нисте навели очекивано понашање po4a програма када се употреби ’%s’. "
+"Јавиће се грешка ако у страници заиста и употребите овај макро.\n"
+"Да спречите проблеме, додајте макро у један од параметара ’%s’, ’%s’, ’%s’, "
+"’%s’, ’%s’ или ’%s’.\n"
+"Ако на пример, програму po4a проследите ’%s’ обезбедићете да се дефинисани "
+"макро сакрије од преводилаца.\n"
+"За више информација о овим параметрима, молимо вас да погледате man страницу "
+"Locale::Po4a::Man.\n"
+
+#: ../../lib/Locale/Po4a/Man.pm:2277
+#, perl-format
+msgid ""
+"This page defines a new macro '%s' with '%s', but you did not specify the "
+"expected po4a behavior when '%s' is used. You will get an error if this "
+"macro is actually used in your page.\n"
+"Add your macro to one of the '%s', '%s', '%s', '%s', '%s' or '%s' parameters "
+"to avoid issues.\n"
+"For example, passing '%s' to po4a will ensure that the defined macro remains "
+"hidden from translators.\n"
+"Please refer to the manpage of Locale::Po4a::Man for more info on these "
+"parameters.\n"
+msgstr ""
+"Ова страница дефинише нови макро ’%s’ са ’%s’, али нисте навели очекивано "
+"понашање po4a програма када се користи ’%s’. Јавиће се грешка ако у страници "
+"заиста и употребите овај макро.\n"
+"Да спречите проблеме, додајте макро у један од параметара ’%s’, ’%s’, ’%s’, "
+"’%s’, ’%s’ или ’%s’.\n"
+"Ако на пример, програму po4a проследите ’%s’ обезбедићете да се дефинисани "
+"макро сакрије од преводилаца.\n"
+"За више информација о овим параметрима, молимо вас да погледате man страницу "
+"Locale::Po4a::Man.\n"
+
+#: ../../lib/Locale/Po4a/Man.pm:2322
+#, perl-format
+msgid ""
+"This page defines a new macro with '%s'. Since po4a is not a real groff "
+"parser, this is not supported. The option '%s' gets these macros copied "
+"verbatim in the translated file, but it's not very robust. '%s' shows these "
+"macros to the translators, but groff macros are not user-friendly for "
+"translators."
+msgstr ""
+"Ова страница дефинише нови макро са ’%s’. Пошто po4a није прави groff "
+"парсер, то се не подржава. Опцијом ’%s’ се у преведени фајл овај макро "
+"копира дословно, али то није баш толико робусни. ’%s’ приказује преводиоцима "
+"ове макрое, али groff макрои баш и нису пригодни преводиоцима."
+
+#: ../../lib/Locale/Po4a/Man.pm:2390
+msgid "The .ie macro must be followed by a .el macro."
+msgstr "Након .ie макроа мора да следи .el макро."
+
+#: ../../lib/Locale/Po4a/Man.pm:2418
+#, perl-format
+msgid ""
+"This page uses conditionals with '%s'. Since po4a is not a real groff "
+"parser, this is not supported by default. The option '%s' gets these macros "
+"copied verbatim in the translated file, but it's not very robust. '%s' shows "
+"these macros to the translators, but groff macros are not user-friendly for "
+"translators."
+msgstr ""
+"Ова страница користи кондиционале са ’%s’. Пошто po4a није прави groff "
+"парсер, овде подразумевано не подржава. Опцијом ’%s’ се ови макрои дословно "
+"копирају у преведени фајл, али то није баш робусно. ’%s’ приказује ове "
+"макрое преводиоцу, али groff макрои баш и нису пригодни преводиоцима."
+
+#: ../../lib/Locale/Po4a/Man.pm:2478
+#, perl-format
+msgid ""
+"This page includes another file with '%s'. Do not forget to translate this "
+"file ('%s')."
+msgstr ""
+"Ова страна укључује неки други фајл са '%s'. Не заборавите да преведете и "
+"тај фајл ('%s')."
+
+#: ../../lib/Locale/Po4a/Man.pm:2646
+#, perl-format
+msgid ""
+"This page uses the '%s' request with the number of lines in argument. This "
+"is not supported yet."
+msgstr ""
+"Ова страна користи '%s' захтев са бројем линија у аргументу. То још увек "
+"није подржано."
+
+#: ../../lib/Locale/Po4a/Man.pm:2666
+#, perl-format
+msgid ""
+"This page uses the '%s' request. This request is only supported when no "
+"argument is provided."
+msgstr ""
+"Ова страна користи '%s' захтев. Овај захтев се подржава само када се не зада "
+"никакав аргумент."
+
+#: ../../lib/Locale/Po4a/Po.pm:242
+#, perl-format
+msgid ""
+"Invalid value for option 'wrap-po' ('%s' is not 'no' nor 'newlines' nor a "
+"number)"
+msgstr ""
+"Неважећа вредност за опцију 'wrap-po' ('%s' није ни 'no' ни 'newlines' ни "
+"број)"
+
+#: ../../lib/Locale/Po4a/Po.pm:251
+#, perl-format
+msgid ""
+"Invalid value for option 'porefs' ('%s' is not one of 'full', 'counter', "
+"'noline', 'file' or 'never')"
+msgstr ""
+"Неважећа вредност за опцију 'porefs' ('%s' није једно од 'full', 'counter', "
+"'noline', 'file' или 'never')"
+
+#: ../../lib/Locale/Po4a/Po.pm:319
+msgid "Please provide a non-null filename"
+msgstr "Молимо наведите непразно име фајла"
+
+#: ../../lib/Locale/Po4a/Po.pm:339
+#, perl-format
+msgid ""
+"Invalid po file %s:\n"
+"%s"
+msgstr ""
+"Неважећи po фајл %s:\n"
+"%s"
+
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
+#, perl-format
+msgid "Cannot read from %s: %s"
+msgstr "Није могуће читање из %s: %s"
+
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
+#, perl-format
+msgid ""
+"The file %s starts with a BOM char indicating that its encoding is UTF-8, "
+"but you specified %s instead."
+msgstr ""
+"Фајл %s почиње BOM карактером који означава да је кодирање фајла UTF-8, али "
+"сте уместо тога навели %s."
+
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
+#, perl-format
+msgid "Cannot close %s after reading: %s"
+msgstr "%s не може да се затвори након читања: %s"
+
+#: ../../lib/Locale/Po4a/Po.pm:451
+msgid "Messages with more than 2 plural forms are not supported."
+msgstr "Нису подржане поруке са више од два облика множине."
+
+#: ../../lib/Locale/Po4a/Po.pm:459
+#, perl-format
+msgid "Parse error at: -->%s<--"
+msgstr "Грешка парсирања код: -->%s<--"
+
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
+msgid "Cannot write to a file without filename"
+msgstr "Није могуће уписивање у фајл који нема име"
+
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
+#, perl-format
+msgid "Cannot write to %s: %s"
+msgstr "Не може да се упише у %s: %s"
+
+#: ../../lib/Locale/Po4a/Po.pm:558
+#, perl-format
+msgid ""
+"msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
+"%s to UTF-8 (was %s) to circumvent the issue.\n"
+msgstr ""
+"msgmerge има неке багове када кодирање PO фајлова није UTF-8; Мења се "
+"кодирање %s у UTF-8 (било је %s) да би се заобишао проблем.\n"
+
+#: ../../lib/Locale/Po4a/Po.pm:612
+msgid "Cannot write PO files with more than two plural forms."
+msgstr "Не могу да се запишу PO фајлови са више од два облика множине."
+
+#: ../../lib/Locale/Po4a/Po.pm:625
+#, perl-format
+msgid "Cannot close %s after writing: %s\n"
+msgstr "%s не може да се затвори након уписивања: %s\n"
+
+#: ../../lib/Locale/Po4a/Po.pm:646
+#, perl-format
+msgid "Cannot unlink %s: %s."
+msgstr "Не може да се раскине веза %s: %s."
+
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
+#: ../../po4a:1917
+#, perl-format
+msgid "Cannot move %s to %s: %s."
+msgstr "%s не може да се премести у %s: %s."
+
+#: ../../lib/Locale/Po4a/Po.pm:879
+#, perl-format
+msgid "Evaluating the provided filter failed: %s"
+msgstr "Није успело одређивање задатог филтера: %s"
+
+#: ../../lib/Locale/Po4a/Po.pm:986
+#, perl-format
+msgid ""
+"'%s' is the singular form of a message, po4a will use the msgstr[0] "
+"translation (%s)."
+msgstr ""
+"'%s' је облик једнине поруке, po4a ће да употреби msgstr[0] превод (%s)."
+
+#: ../../lib/Locale/Po4a/Po.pm:996
+#, perl-format
+msgid ""
+"'%s' is the plural form of a message, po4a will use the msgstr[1] "
+"translation (%s)."
+msgstr ""
+"'%s' је облик множине поруке, po4a ће да употреби msgstr[1] превод (%s)."
+
+#: ../../lib/Locale/Po4a/Po.pm:1210
+#, perl-format
+msgid "msgid defined twice: %s"
+msgstr "msgid је дефинисан двапут: %s"
+
+#: ../../lib/Locale/Po4a/Po.pm:1247
+#, perl-format
+msgid ""
+"Translations don't match for:\n"
+"%s\n"
+"-->First translation:\n"
+"%s\n"
+" Second translation:\n"
+"%s\n"
+" Old translation discarded."
+msgstr ""
+"Преводи се не подударају за:\n"
+"%s\n"
+"-->Први превод:\n"
+"%s\n"
+" Други превод:\n"
+"%s\n"
+" Стари превод је одбачен."
+
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting."
+msgstr ""
+"Фајл %s декларише %s као своје кодирање, али сте као главни скуп карактера "
+"навели %s. Молимо вас да промените једно од ова два подешавања."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:228
+msgid ""
+"The needed module SGMLS.pm was not found and needs to be installed. It can "
+"be found on the CPAN, in package libsgmls-perl on debian, etc."
+msgstr ""
+"Није пронађен потребни модул SGMLS.pm и потребно је да се инсталира. Може да "
+"се пронађе на CPAN, у пакету libsgmls-perl на систему debian, итд."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:273
+#, perl-format
+msgid ""
+"Unknown debug category: %s. Known categories:\n"
+"%s"
+msgstr ""
+"Непозната дибаг категорија: %s. Познате категорије:\n"
+"%s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:305
+msgid "msgid skipped to help translators (contains only an entity)"
+msgstr ""
+"msgid је прескочен како би се помогло преводиоцима (пошто садржи само "
+"ентитет)"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:314
+msgid "msgid skipped to help translators (contains only tags)"
+msgstr ""
+"msgid је прескочен како би се помогло преводиоцима (пошто садржи само ознаке)"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:327
+msgid ""
+"msgid skipped to help translators (contains only opening or closing tags of "
+"marked sections)"
+msgstr ""
+"msgid је прескочен како би се помогло преводиоцима (пошто садржи само "
+"отварајуће или затварајуће ознаке маркираних одељака)"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:415 ../../lib/Locale/Po4a/Sgml.pm:867
+#, perl-format
+msgid "Cannot close tempfile: %s"
+msgstr "Не може да се затвори привремени фајл: %s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:421
+msgid ""
+"Error while running onsgmls -p.  Please check if onsgmls and the DTD are "
+"installed."
+msgstr ""
+"Грешка током извршавања onsgmls -p. Молимо проверите да ли су инсталирани "
+"onsgmls и DTD."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:434
+msgid ""
+"Trying to handle a XML document as a SGML one. Feel lucky if it works, help "
+"us implementing a proper XML backend if it does not."
+msgstr ""
+"Покушава се обрада XML документа као да је SGML. Сматрајте се срећним у "
+"случају да ради, а помозите нам да имплементирамо прави XML бекенд у случају "
+"да не ради."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:453
+msgid ""
+"This file is not a master SGML document (no DOCTYPE). It may be a file to be "
+"included by another one, in which case it should not be passed to po4a "
+"directly. Text from included files is extracted/translated when handling the "
+"master file including them."
+msgstr ""
+"Овај фајл није мастер SGML документ (нема DOCTYPE). Може да буде фајл који "
+"треба да се укључи у неки други, па у том случају не би требало директно да "
+"се проследи програму po4a. Текст из укључених фајлова се издваја/преводи "
+"онда када се обрађује мастер фајл који их укључује."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:576
+msgid "DTD of this file is unknown, but proceeding as requested."
+msgstr "DTD фајла је непознат, али се наставља као што је захтевано."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:580
+msgid ""
+"DTD of this file is unknown. (supported: DebianDoc, DocBook). The prolog "
+"follows:"
+msgstr "DTD фајла је непознат. (подржани: DebianDoc, DocBook). Следи пролог:"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:678 ../../lib/Locale/Po4a/Sgml.pm:762
+#, perl-format
+msgid "Cannot open %s (content of entity %s%s;): %s"
+msgstr "Не може да се отвори %s (садржај ентитета %s%s;): %s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:733
+#, perl-format
+msgid "unrecognized prolog inclusion entity: %%%s;"
+msgstr "непрепознат ентитет прикључивања пролога: %%%s;"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:872
+#, perl-format
+msgid "Cannot run onsgmls: %s"
+msgstr "Не може да се покрене onsgmls: %s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:991
+#, perl-format
+msgid "Unknown tag %s"
+msgstr "Непозната ознака %s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:1029
+#, perl-format
+msgid "bad translation '%s' for '%s' in '%s'"
+msgstr "лош превод '%s' за '%s' у '%s'"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:1085 ../../lib/Locale/Po4a/Sgml.pm:1170
+#, perl-format
+msgid "Closing tag for a translation container missing before %s"
+msgstr "Недостаје затварајућа ознака за контејнер превода пре %s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:1255
+#, perl-format
+msgid "Unknown SGML event type: %s"
+msgstr "Непознат тип SGML догађаја: %s"
+
+#: ../../lib/Locale/Po4a/Sgml.pm:1269
+msgid ""
+"Warning: onsgmls produced some errors.  This is usually caused by po4a, "
+"which modifies the input and restores it afterwards, causing the input of "
+"onsgmls to be invalid.  This is usually safe, but you may wish to verify the "
+"generated document with onsgmls -wno-valid."
+msgstr ""
+"Упозорење: onsgmls је вратио неке грешке. Узрок овога је обично po4a, јер "
+"мења улаз и враћа га поново на првобитну вредност, чиме улаз програма "
+"onsgmls постаје неважећи. Ово је углавном безбедно, али можда бисте хтели да "
+"верификујете генерисани документ са onsgmls -wno-valid."
+
+#: ../../lib/Locale/Po4a/Sgml.pm:1281
+msgid ""
+"To see the error message, rerun po4a with this additional argument:\n"
+"   -o debug=onsgmls"
+msgstr ""
+"Да бисте видели поруку о грешки, поново покрените po4a са следећим додатним "
+"аргументом:\n"
+"   -o debug=onsgmls"
+
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
+#, perl-format
+msgid "un-balanced %s in '%s'"
+msgstr "неупарено %s у '%s'"
+
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
+#, perl-format
+msgid "Error while checking the number of arguments of the '%s' command: %s"
+msgstr "Грешка приликом провере броја аргумената команде '%s': %s"
+
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
+#, perl-format
+msgid "Unknown command: '%s'"
+msgstr "Непозната команда: '%s'"
+
+#: ../../lib/Locale/Po4a/TeX.pm:956
+msgid "Cannot read from file without having a filename"
+msgstr "Немогуће је читање из фајла када се на зада име фајла"
+
+#: ../../lib/Locale/Po4a/TeX.pm:1005
+#, perl-format
+msgid ""
+"Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
+"o exclude_include=%s' to the options, either on the command line or in your "
+"po4a.conf file."
+msgstr ""
+"kpsewhich не може да пронађе ’%s’. Да бисте спречили узимање овог фајла у "
+"обзир, додајте ’-o exclude_include=%s’ у опције или у командној линији, или "
+"у po4a.conf фајл."
+
+#: ../../lib/Locale/Po4a/TeX.pm:1051
+#, perl-format
+msgid "kpsewhich cannot find %s"
+msgstr "kpsewhich не може да пронађе %s"
+
+#: ../../lib/Locale/Po4a/TeX.pm:1097
+#, perl-format
+msgid "Cannot use an alias to the unknown command '%s'"
+msgstr "Не може да се користи алијас на непознату команду '%s'"
+
+#: ../../lib/Locale/Po4a/TeX.pm:1104
+#, perl-format
+msgid ""
+"You are using the old definitions format (%s).  Please update this "
+"definition line."
+msgstr ""
+"Користите стари формат дефиниција (%s). Молимо да ажурирате ову линију "
+"дефиниције."
+
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
+#, perl-format
+msgid "unknown environment: '%s'"
+msgstr "непознато окружење: '%s'"
+
+#. a begin may have been hidden in the middle of a translated
+#. buffer. FIXME: Just warn for now.
+#: ../../lib/Locale/Po4a/TeX.pm:1336
+#, perl-format
+msgid "unmatched end of environment '%s'"
+msgstr "неупарени крај окружења '%s'"
+
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
+#, perl-format
+msgid "Wrong number of arguments for the '%s' command."
+msgstr "Погрешан број аргумената за команду '%s'."
+
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
+msgid "An optional argument was provided, but a mandatory one is expected."
+msgstr "Наведен је опционални аргумент, али се очекује обавезан."
+
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
+#, perl-format
+msgid "Command '%s': %s"
+msgstr "Команда '%s': %s"
+
+#: ../../lib/Locale/Po4a/TeX.pm:1455
+#, perl-format
+msgid "register_generic_command: unsupported format: '%s'."
+msgstr "register_generic_command: неподржани формат: '%s'."
+
+#: ../../lib/Locale/Po4a/TeX.pm:1561
+msgid "The first argument of \\begin is mandatory."
+msgstr "Први аргумент за \\begin је обавезан."
+
+#: ../../lib/Locale/Po4a/Text.pm:273
+#, perl-format
+msgid "Option %s is only valid when parsing markdown files."
+msgstr "Опција %s важи само онда када се парсирају markdown фајлови."
+
+#: ../../lib/Locale/Po4a/Text.pm:435
+#, perl-format
+msgid "Unrecognized section: %s"
+msgstr "Непрепозната секција: %s"
+
+#: ../../lib/Locale/Po4a/Text.pm:627 ../../lib/Locale/Po4a/Yaml.pm:143
+#, perl-format
+msgid ""
+"Inline lists and dictionaries on a single line are not correctly handled the "
+"parser we use (YAML::Tiny): they are interpreted as regular strings. Please "
+"use multi-lines definitions instead. Offending line:\n"
+" %s"
+msgstr ""
+"Парсер који користимо (YAML::Tiny) не обрађује исправно уграђене листе и "
+"речнике у једној линији: они се интерпретирају као обични стрингови. Молимо "
+"вас да уместо њих употребите вишелинијске дефиниције. Проблематична линија:\n"
+" %s"
+
+#: ../../lib/Locale/Po4a/Text.pm:652
+#, perl-format
+msgid ""
+"Proceeding even if the YAML Front Matter could not be parsed. Remove the "
+"'yfm_lenient' option for a stricter behavior.\n"
+"Ignored error: %s"
+msgstr ""
+"Наставља се чак и ако YAML Front Matter не може да се парсира. Уклоните "
+"опцију ’yfm_lenient’ да би понашање било стриктније.\n"
+"Игнорисана грешка: %s"
+
+#: ../../lib/Locale/Po4a/Text.pm:669
+#, perl-format
+msgid ""
+"Could not get the YAML Front Matter from the file. If you did not intend to "
+"add a YAML front matter but an horizontal ruler, please use '----' instead, "
+"or pass the 'yfm_lenient' option.\n"
+"Error: %s\n"
+"Content of the YFM: %s"
+msgstr ""
+"Из фајла није могао да се издвоји YAML Front Matter. Ако нисте ни намеравали "
+"да додате YAML front matter већ хоризонталну линију, молимо вас да уместо "
+"тога употребите ’----’, или проследите опцију ’yfm_lenient’.\n"
+"Грешка: %s\n"
+"Садржај YFM: %s"
+
+#: ../../lib/Locale/Po4a/Text.pm:823
+#, perl-format
+msgid ""
+"Malformed fenced div block: Block starting at %s not closed before the end "
+"of the file."
+msgstr ""
+"Неисправан огрђени div блок: блок који почиње на %s није затворен пре краја "
+"фајла."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
+#, perl-format
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
+msgstr ""
+"Неисправно кодирање током читања из фајла %s користећи скуп карактера %s: "
+"%s\n"
+"Ако се скуп карактера %s не очекује, потребно је да заставицом --master-"
+"charset или сличном подесите одговарајући."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
+#, perl-format
+msgid ""
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
+msgstr ""
+"Неисправно кодирање током уписа карактера ’%s’ у фајл %s користећи скуп "
+"карактера %s: %s\n"
+"Ако се скуп карактера %s не очекује, потребно је да заставицом --localized-"
+"charset или сличном подесите одговарајући."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
+#, perl-format
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
+msgstr ""
+"Неисправно кодирање током уписа карактера у фајл %s користећи скуп карактера "
+"%s: %s\n"
+"Ако се скуп карактера %s не очекује, потребно је да заставицом --localized-"
+"charset или сличном подесите одговарајући."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
+#, perl-format
+msgid "Cannot close %s after writing: %s"
+msgstr "%s не може да се затвори након уписивања: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
+#, perl-format
+msgid "Cannot read po4a header from %s."
+msgstr "Не може да се прочита po4a заглавље из %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#, perl-format
+msgid "First line of %s does not look like a po4a header."
+msgstr "Прва линија у %s не личи на po4a заглавље."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
+#, perl-format
+msgid "Syntax error in po4a header of %s, near \"%s\""
+msgstr "Синтаксна грешка у po4a заглављу фајла %s, у близини \"%s\""
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
+#, perl-format
+msgid "Invalid argument in the po4a header of %s: %s"
+msgstr "Неважећи аргумент у po4a заглављу фајла %s: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
+#, perl-format
+msgid "The po4a header of %s does not define the mode."
+msgstr "po4a заглавље фајла %s не дефинише режим."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
+#, perl-format
+msgid ""
+"Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
+"Instead, it is '%s'."
+msgstr ""
+"Неважећи режим у po4a заглављу фајла %s: требало би да је 'before', 'after' "
+"или 'eof', а не '%s'."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
+#, perl-format
+msgid "The po4a header of %s does not define the position."
+msgstr "po4a заглавље фајла %s не дефинише позицију."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
+msgid "No ending boundary given in the po4a header, but mode=after."
+msgstr "У po4a заглављу није наведена завршавајућа граница, већ mode=after."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
+msgid "No position needed when mode=eof."
+msgstr "Позиција није потребна када је mode=eof."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
+msgid "No ending boundary needed when mode=eof."
+msgstr "Завршавајућа граница није потребна када је mode=eof."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
+msgid "Cannot apply addendum when not given the filename"
+msgstr "addendum не може да се примени када није наведено име фајла"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
+#, perl-format
+msgid "Addendum %s does not exist."
+msgstr "Addendum %s не постоји."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
+#, perl-format
+msgid "No candidate position for the addendum %s."
+msgstr "За addendum %s нема могуће позиције."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#, perl-format
+msgid "More than one candidate position found for the addendum %s."
+msgstr "За addendum %s је пронађено више од једне могуће позиције."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
+#, perl-format
+msgid "Addendum '%s' applied before this line: %s"
+msgstr "Addendum '%s' је примењен пре ове линије: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
+#, perl-format
+msgid "Addendum '%s' applied after the line: %s."
+msgstr "Addendum '%s' је примењен иза линије: %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
+#, perl-format
+msgid "Addendum '%s' applied at the end of the file."
+msgstr "Addendum '%s' је примењен на крају фајла."
+
+#: ../../lib/Locale/Po4a/Wml.pm:93
+#, perl-format
+msgid "Cannot create a temporary XML file: %s"
+msgstr "Не може да се креира привремени XML фајл: %s"
+
+#: ../../lib/Locale/Po4a/Xml.pm:120
+#, perl-format
+msgid "%s: Cannot read from %s: %s"
+msgstr "%s: Не може да се чита из %s: %s"
+
+#: ../../lib/Locale/Po4a/Xml.pm:129
+#, perl-format
+msgid "%s: Cannot close %s after reading: %s"
+msgstr "%s: %s не може да се затвори након читања: %s"
+
+#: ../../lib/Locale/Po4a/Xml.pm:163
+#, perl-format
+msgid "Cannot have more than one input charset in XML files (%s and %s)"
+msgstr ""
+"Не може да се прихвати више од једног улазног скупа карактера у XML "
+"фајловима (%s и %s)"
+
+#: ../../lib/Locale/Po4a/Xml.pm:235
+#, perl-format
+msgid ""
+"'po4a-id=%d' in the translation does not exist in the original string (or "
+"'po4a-id=%d' used twice in the translation)."
+msgstr ""
+"'po4a-id=%d' у преводу не постоји у оригиналном стрингу (или је у преводу "
+"'po4a-id=%d' коришћено двапут)."
+
+#: ../../lib/Locale/Po4a/Xml.pm:275
+#, perl-format
+msgid ">>> filename = '%s'"
+msgstr ">>> име фајла = '%s'"
+
+#: ../../lib/Locale/Po4a/Xml.pm:758
+#, perl-format
+msgid "Internal error: unknown type identifier '%s'."
+msgstr "Интерна грешка: непознат идентификатор типа '%s'."
+
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Фајл %s декларише %s као своје кодирање, али сте као главни скуп карактера "
+"навели %s. Молимо вас да промените једно од ова два подешавања јер су у "
+"језику Perl то уствари два различита кодирања. Погледајте https://perldoc."
+"perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
+#, perl-format
+msgid ""
+"Bad document type. '%s' expected. You can fix this warning with a -o doctype "
+"option, or ignore this check with -o doctype=\"\"."
+msgstr ""
+"Лош тип документа. Очекује се '%s'. Ово упозорење можете да исправите са -o "
+"doctype опцијом, или можете да игноришете ову проверу са -o doctype=\"\"."
+
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
+#, perl-format
+msgid ""
+"Unexpected closing tag </%s> found. The main document may be wrong.  "
+"Continuing…"
+msgstr ""
+"Пронађена је неочекивана затварајућа ознака </%s>. Можда је погрешан главни "
+"документ. Наставља се даље…"
+
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
+#, perl-format
+msgid "Unexpected closing tag </%s> found. The main document may be wrong."
+msgstr ""
+"Пронађена је неочекивана затварајућа ознака </%s>. Можда је погрешан главни "
+"документ."
+
+#: ../../lib/Locale/Po4a/Xml.pm:1464
+#, perl-format
+msgid ""
+"%s: attribute '%s' is not defined in module option 'attributes' and\n"
+"....  is not translated for the attribute path '%s'"
+msgstr ""
+"%s: атрибут '%s' није дефинисан у 'attributes' опцији модула и\n"
+"....  није преведено за путању атрибута '%s'"
+
+#: ../../lib/Locale/Po4a/Xml.pm:1483
+#, perl-format
+msgid "%s: Bad attribute syntax.  Continuing…"
+msgstr "%s: Лоша синтакса атрибута. Наставља се даље…"
+
+#: ../../lib/Locale/Po4a/Xml.pm:1485
+#, perl-format
+msgid "%s: Bad attribute syntax"
+msgstr "%s: Лоша синтакса атрибута"
+
+#: ../../lib/Locale/Po4a/Xml.pm:1608
+#, perl-format
+msgid ""
+"%s: translation option='%s'.\n"
+" *** the original translation option is overridden here since parent "
+"path='%s' is untranslated,"
+msgstr ""
+"%s: опција превода='%s'.\n"
+" *** оригинална опција превода је овде преиначена јер родитељска путања='%s' "
+"није преведена,"
+
+#: ../../lib/Locale/Po4a/Xml.pm:1622
+#, perl-format
+msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
+msgstr ""
+"%s: foldattributes подешавање је игнорисано јер '%s' није inline ознака"
+
+#: ../../lib/Locale/Po4a/Xml.pm:2080
+#, perl-format
+msgid ""
+"Invalid placeholder in the translation (the 'type' and 'id' must be present, "
+"in this order).\n"
+"%s\n"
+"\n"
+"Please fix your translation."
+msgstr ""
+"Неисправно место за аргумент у преводу ('type' и 'id' морају да буду "
+"присутни, у овом редоследу).\n"
+"%s\n"
+"\n"
+"Молимо поправите свој превод."
+
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
+#, perl-format
+msgid ""
+"The '%s' option is deprecated. Please use the translated/untranslated and/or "
+"break/inline/placeholder categories."
+msgstr ""
+"Опција '%s' је превазиђена. Молимо да користите категорије translated/"
+"untranslated и/или break/inline/placeholder."
+
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
+#, perl-format
+msgid "Tag '%s' both in the %s and %s categories."
+msgstr "Ознака '%s' и у %s и у %s категоријама."
+
+#. Argument checking
+#: ../../msguntypot:163 ../../msguntypot:165
+#, perl-format
+msgid "Mandatory argument '%s' missing."
+msgstr "Недостаје обавезни аргумент '%s'."
+
+#. Check file existence
+#: ../../msguntypot:164 ../../msguntypot:166 ../../po4a:1040
+#: ../../po4a-gettextize:565 ../../po4a-normalize:205 ../../po4a-translate:229
+#: ../../po4a-translate:230 ../../po4a-updatepo:285
+#, perl-format
+msgid "File %s does not exist."
+msgstr "Фајл %s не постоји."
+
+#: ../../msguntypot:174
+#, perl-format
+msgid ""
+"The new and old POT files have different amount of strings (%d != %d). "
+"Something's seriously wrong here."
+msgstr ""
+"Нови и стари POT фајлови имају различити број стрингова (%d != %d). Нешто "
+"озбиљно није у реду овде."
+
+#: ../../msguntypot:192
+#, perl-format
+msgid "Found %d modified entries."
+msgstr "Пронађено је %d измењених ставки."
+
+#: ../../msguntypot:203 ../../po4a:1764
+#, perl-format
+msgid "Cannot create a temporary PO file: %s"
+msgstr "Не може да се креира привремени PO фајл: %s"
+
+#: ../../msguntypot:208
+#, perl-format
+msgid "Handling %s"
+msgstr "Обрађује се %s"
+
+#: ../../msguntypot:213 ../../po4a-updatepo:324
+#, perl-format
+msgid ""
+"Could not run msgmerge: %s\n"
+"The command was: %s"
+msgstr ""
+"Није могао да се покрене msgmerge: %s\n"
+"Команда је била: %s"
+
+#: ../../msguntypot:227
+#, perl-format
+msgid "msguntypot changed msgid \"%s\" to \"%s\" in %s\n"
+msgstr "msguntypot је променио msgid „%s” на „%s” у %s\n"
+
+#: ../../msguntypot:234
+#, perl-format
+msgid "Modified %d entries in %d files."
+msgstr "Измењено је %d ставки у %d фајлова."
+
+#: ../../po4a:855 ../../po4a:859
+#, perl-format
+msgid "Option %s invalid. Directory %s does not exist (current directory: %s)."
+msgstr ""
+"Неважећа опција %s. Директоријум %s не постоји (текући директоријум је: %s)."
+
+#: ../../po4a:1021
+#, perl-format
+msgid "failed to execute '%s': %s."
+msgstr "није успело извршавање '%s': %s."
+
+#: ../../po4a:1024
+#, perl-format
+msgid "'%s' died with signal %d, with coredump."
+msgstr "'%s' је угинуло са сигналом %d, уз coredump."
+
+#: ../../po4a:1026
+#, perl-format
+msgid "'%s' died with signal %d, without coredump."
+msgstr "'%s' је угинуло са сигналом %d, без coredump."
+
+#: ../../po4a:1029
+#, perl-format
+msgid "'%s' exited with value %d."
+msgstr "'%s' је завршило рад са вредношћу %d."
+
+#: ../../po4a:1032
+#, perl-format
+msgid "Error: %s"
+msgstr "Грешка: %s"
+
+#: ../../po4a:1076 ../../po4a:1164 ../../po4a:1429
+#, perl-format
+msgid "Unknown variable: %s"
+msgstr "Непозната променљива: %s"
+
+#: ../../po4a:1085
+#, perl-format
+msgid "Syntax error: %s"
+msgstr "Синтаксна грешка: %s"
+
+#: ../../po4a:1118 ../../po4a:1182
+#, perl-format
+msgid "'%s' redeclared"
+msgstr "'%s' је редекларисано"
+
+#: ../../po4a:1126
+#, perl-format
+msgid ""
+"Your POT file '%s' file name does not end with the 'pot' extension. This is "
+"unusual and will trouble the translators."
+msgstr ""
+"Име вашег POT фајла '%s' се не завршава са 'pot' екстензијом. Ово није "
+"уобичајено и направиће проблем преводиоцима."
+
+#: ../../po4a:1133
+#, perl-format
+msgid ""
+"No PO file provided as subsequent parameters to '%s'. Your documentation "
+"will not be translated."
+msgstr ""
+"Није наведен ниједан PO фајл као наредни параметар за '%s'. Ваша "
+"документација неће бити преведена."
+
+#: ../../po4a:1140
+#, perl-format
+msgid "Unparsable argument '%s'."
+msgstr "Аргумент '%s' не може да се парсира."
+
+#: ../../po4a:1187
+msgid "The list of languages cannot be set twice."
+msgstr "Листа језика не може да се постави двапут."
+
+#: ../../po4a:1189
+msgid "The POT file cannot be set twice."
+msgstr "POT фајл не може да се постави двапут."
+
+#. Only display the message the first time we find the right directory
+#: ../../po4a:1204 ../../po4a:1226
+#, perl-format
+msgid "Using '%s' as a %s."
+msgstr "Употреба '%s' као %s."
+
+#: ../../po4a:1206
+#, perl-format
+msgid "'%s' is not a directory (current dir: %s)"
+msgstr "'%s' није директоријум (текући дир: %s)"
+
+#: ../../po4a:1211
+#, perl-format
+msgid "Cannot list the '%s' directory"
+msgstr "Директоријум '%s' не може да се излиста"
+
+#: ../../po4a:1221
+#, perl-format
+msgid "Cannot list directory '%s' in '%s' "
+msgstr "Директоријум '%s' не може да се излиста у '%s' "
+
+#: ../../po4a:1232
+#, perl-format
+msgid "Directory '%s' not found in '%s'."
+msgstr "Директоријум '%s' није пронађен у '%s'."
+
+#: ../../po4a:1235 ../../po4a:1238
+#, perl-format
+msgid "Directory '%s' not found in '%s' nor in '%s'."
+msgstr "Директоријум '%s' није пронађен ни у '%s', нити у '%s'."
+
+#: ../../po4a:1242
+#, perl-format
+msgid "Directory '%s' not found in '%s' nor in '%s' nor in '%s'."
+msgstr "Директоријум '%s' није пронађен ни у '%s', нити у '%s', нити у '%s'."
+
+#: ../../po4a:1253
+#, perl-format
+msgid "Language '%s' found twice in '%s' and '%s'."
+msgstr "Језик '%s' је пронађен двапут у '%s' и у '%s'."
+
+#: ../../po4a:1257
+#, perl-format
+msgid "Found language '%s' in the provided po_directory: %s"
+msgstr "Језик '%s' је пронађен у наведеном po_directory: %s"
+
+#: ../../po4a:1261
+#, perl-format
+msgid "%s:%d: too many POT files: '%s' and '%s'."
+msgstr "%s:%d: превише POT фајлова: '%s' и '%s'."
+
+#: ../../po4a:1265
+#, perl-format
+msgid "Found POT file '%s' in the provided po_directory."
+msgstr "У наведеном po_directory је пронађен POT фајл '%s'."
+
+#: ../../po4a:1275
+#, perl-format
+msgid "No PO files found in '%s'/'%s'."
+msgstr "У '%s'/'%s' нису пронађени PO фајлови."
+
+#: ../../po4a:1278 ../../po4a:1281
+#, perl-format
+msgid "No PO files found in '%s'/'%s' nor in '%s'/'%s'."
+msgstr "PO фајлови нису пронађени ни у '%s'/'%s' нити у '%s'/'%s'."
+
+#: ../../po4a:1285
+#, perl-format
+msgid "No PO files found in '%s'/'%s' nor in '%s'/'%s' nor in '%s'/'%s'."
+msgstr ""
+"PO фајлови нису пронађени ни у '%s'/'%s', нити у '%s'/'%s', нити у '%s'/'%s'."
+
+#: ../../po4a:1289
+msgid "Your project will not be translated to any language."
+msgstr "Ваш пројекат се неће преводити ни на један језик."
+
+#: ../../po4a:1295
+#, perl-format
+msgid "No POT files found in '%s'/'%s'."
+msgstr "У '%s'/'%s' нису пронађени POT фајлови."
+
+#: ../../po4a:1298 ../../po4a:1301
+#, perl-format
+msgid "No POT files found in '%s'/'%s' nor in '%s'/'%s'."
+msgstr "POT фајлови нису пронађени ни у '%s'/'%s', нити у '%s'/'%s'."
+
+#: ../../po4a:1305
+#, perl-format
+msgid "No POT files found in '%s'/'%s' nor in '%s'/'%s' nor in '%s'/'%s'."
+msgstr ""
+"POT фајлови нису пронађени ни у '%s'/'%s', нити у '%s'/'%s', нити у "
+"'%s'/'%s'."
+
+#: ../../po4a:1309
+msgid ""
+"Please create an empty file with the 'pot' extension (e.g. 'myproject.pot')."
+msgstr ""
+"Молимо креирајте празан фајл са 'pot' екстензијом (нпр. 'myproject.pot')."
+
+#: ../../po4a:1320
+#, perl-format
+msgid ""
+"The master file '%s' was specified earlier in the configuration file. This "
+"may cause problems with options."
+msgstr ""
+"Мастер фајл '%s' је наведен раније у конфигурационом фајлу. Ово може да "
+"направи проблеме са опцијама."
+
+#: ../../po4a:1325
+#, perl-format
+msgid "The master file '%s' does not exist."
+msgstr "Мастер фајл '%s' не постоји."
+
+#: ../../po4a:1378
+msgid ""
+"Option 'master:file=' is deprecated. Please use 'pot=' instead for the same "
+"effect."
+msgstr ""
+"Опција ’master:фајл=’ је застарела. Уместо ње употребите ’pot=’, ефекат је "
+"исти."
+
+#: ../../po4a:1401
+#, perl-format
+msgid "Unparsable argument '%s' (%s)."
+msgstr "Аргумент '%s' не може да се парсира (%s)."
+
+#: ../../po4a:1404
+msgid "The translated and master file are the same."
+msgstr "Преведени и мастер фајл су исти."
+
+#: ../../po4a:1446
+#, perl-format
+msgid "Translation of %s in %s redefined"
+msgstr "Превод %s у %s је редефинисан"
+
+#: ../../po4a:1479
+#, perl-format
+msgid "Unparsable command '%s'."
+msgstr "Команда '%s' не може да се парсира."
+
+#. don't care about error here
+#: ../../po4a:1485
+msgid ""
+"'po4a_paths' is not defined in the configuration file. Where are the POT and "
+"PO files?"
+msgstr ""
+"У конфигурационом фајлу није дефинисано po4a_paths. Где се налазе POT и PO "
+"фајлови?"
+
+#: ../../po4a:1501
+#, perl-format
+msgid "Cannot parse option line (missing >%s<?): %s"
+msgstr "Линија опција не може да се парсира (да ли недостаје >%s<?): %s"
+
+#: ../../po4a:1529
+#, perl-format
+msgid "Split mode, creating a temporary POT:"
+msgstr "Split режим, креира се привремени POT фајл:"
+
+#: ../../po4a:1532
+msgid "Disabling --translate-only option, it is not supported in split mode"
+msgstr "Искључује се --translate-only опција, она није подржана у split режиму"
+
+#: ../../po4a:1546
+#, perl-format
+msgid "Document %s kept for update (--translate-only)."
+msgstr "Документ %s је задржан за ажурирање (--translate-only)."
+
+#: ../../po4a:1549
+#, perl-format
+msgid "Skip the update of %s as requested (--translate-only)."
+msgstr "Прескаче се ажурирање %s, као што је и захтевано (--translate-only)."
+
+#: ../../po4a:1569
+#, perl-format
+msgid "Languages skipped because of --translate-only: %s; kept languages: %s."
+msgstr ""
+"Прескочени су језици због --translate-only: %s; задржани су језици: %s."
+
+#: ../../po4a:1606
+#, perl-format
+msgid "NOT updating %s as requested (--no-update)."
+msgstr "%s се НЕ освежава, као што је и захтевано (--no-update)."
+
+#: ../../po4a:1610 ../../po4a:1830 ../../po4a-updatepo:317
+#, perl-format
+msgid "Updating %s:"
+msgstr "Ажурира се %s:"
+
+#: ../../po4a:1614
+#, perl-format
+msgid "NOT creating %s as requested (--no-update)."
+msgstr "%s се НЕ креира, као што је и захтевано (--no-update)."
+
+#: ../../po4a:1617 ../../po4a-updatepo:330
+#, perl-format
+msgid "Creating %s:"
+msgstr "Креира се %s:"
+
+#: ../../po4a:1675 ../../po4a:1731 ../../po4a:1870 ../../po4a-updatepo:295
+#, perl-format
+msgid "Cannot create a temporary POT file: %s"
+msgstr "Не може да се креира привремени POT фајл: %s"
+
+#: ../../po4a:1685
+#, perl-format
+msgid " (%d entries)"
+msgstr " (%d ставки)"
+
+#: ../../po4a:1689
+#, perl-format
+msgid "NOT updating the POT file %s as requested (--no-update)."
+msgstr "POT фајл %s се НЕ освежава, као што је и захтевано (--no-update)."
+
+#: ../../po4a:1692
+#, perl-format
+msgid "NOT updating the POT file %s because of --translate-only."
+msgstr "POT фајл %s се НЕ освежава због опције --translate-only."
+
+#: ../../po4a:1695
+#, perl-format
+msgid "POT file %s already up to date."
+msgstr "POT фајл %s је већ ажуриран."
+
+#: ../../po4a:1736 ../../po4a:1803 ../../po4a:1909
+#, perl-format
+msgid "Cannot create directory '%s': %s"
+msgstr "Не може да се креира директоријум '%s': %s"
+
+#: ../../po4a:1744
+#, perl-format
+msgid ""
+"msggrep did not create '%s'. Used command:\n"
+"  %s\n"
+"Please report that bug, along the information allowing to reproduce it.\n"
+msgstr ""
+"msggrep није креирао '%s'. Употребљена команда:\n"
+"  %s\n"
+"Молимо да пријавите тај баг, заједно са информацијама како да се "
+"репродукује.\n"
+
+#: ../../po4a:1775
+#, perl-format
+msgid ""
+"The translation of master file '%s' in language '%s' is missing (file: %s) "
+"-- skipping."
+msgstr ""
+"Недостаје превод мастер фајла '%s' на језик '%s' (фајл: %s) -- прескаче се."
+
+#: ../../po4a:1828
+#, perl-format
+msgid "Updating the translation in language %s:"
+msgstr "Освежавање превода на језик %s:"
+
+#: ../../po4a:1841
+#, perl-format
+msgid "Creating an empty PO file for the language %s.\n"
+msgstr "Креира се празан PO фајл за језик %s.\n"
+
+#: ../../po4a:1843
+#, perl-format
+msgid "Creating an empty PO file in %s.\n"
+msgstr "Креира се празан PO фајл у %s.\n"
+
+#: ../../po4a:1947
+#, perl-format
+msgid "PO file for language %s is missing -- skipping."
+msgstr "За језик %s недостаје PO фајл -- прескаче се."
+
+#: ../../po4a:1949
+#, perl-format
+msgid "PO file %s for language %s is missing -- skipping."
+msgstr "За језик %s недостаје PO фајл %s -- прескаче се."
+
+#: ../../po4a:1973
+#, perl-format
+msgid "Skip master file %s in language %s because of --translate-only."
+msgstr "Прескаче се мастер фајл %s на језику %s због опције --translate-only."
+
+#: ../../po4a:1993
+#, perl-format
+msgid "%s doesn't need to be updated."
+msgstr "нема потребе да се %s ажурира."
+
+#: ../../po4a:2045
+#, perl-format
+msgid "Discard %s (%s of %s strings; only %s%% translated; need %s%%)."
+msgstr ""
+"Одбацује се %s (%s од %s стрингова; преведено је само %s%%; а потребно је "
+"%s%%)."
+
+#: ../../po4a:2055
+#, perl-format
+msgid "Timestamp %s created."
+msgstr "Временска ознака %s је креирана."
+
+#: ../../po4a:2066
+#, perl-format
+msgid "Timestamp %s removed."
+msgstr "Временска ознака %s је уклоњена."
+
+#: ../../po4a:2080
+#, perl-format
+msgid "Addendum %s does NOT apply to %s (translation discarded)."
+msgstr "Addendum %s се НЕ ПРИМЕЊУЈЕ на %s (превод се одбацује)."
+
+#: ../../po4a:2089
+#, perl-format
+msgid "%s is 100%% translated (%s strings)."
+msgstr "%s је преведен 100%% (%s стрингова)."
+
+#: ../../po4a:2093 ../../po4a-translate:274
+#, perl-format
+msgid "%s is %s%% translated (%s of %s strings)."
+msgstr "%s је преведено %s%% (%s од %s стрингова)."
+
+#: ../../po4a-gettextize:366
+msgid ""
+"\n"
+"The gettextization failed (once again). Don't give up, gettextizing is a "
+"subtle art, but this is only needed once to convert a project to the "
+"gorgeous luxus offered by po4a to translators.\n"
+"Please refer to the po4a(7) documentation, the section \"HOWTO convert a pre-"
+"existing translation to po4a?\" contains several hints to help you in your "
+"task"
+msgstr ""
+"\n"
+"gettextизација (поново) није успела. Немојте да одустанете, gettextизација "
+"је суптилна уметност, али ово је потребно да се само једном како би се "
+"пројекат конвертовао у величанствени луксуз који po4a обезбеђује "
+"преводиоцима.\n"
+"Погледајте po4a(7) документацију, oдељак \"HOWTO convert a pre-existing "
+"translation to po4a?\" садржи неколико савета који могу бити од помоћи у "
+"вашем задатку"
+
+#: ../../po4a-gettextize:382
+#, perl-format
+msgid ""
+"Original has more strings than the translation (%d>%d). Please fix it by "
+"editing the translated version to add some dummy entry."
+msgstr ""
+"Оригинал има више стрингова од превода (%d>%d). Молимо исправите грешку "
+"додавањем лажних ставки у превод."
+
+#: ../../po4a-gettextize:395
+#, perl-format
+msgid ""
+"Original has less strings than the translation (%d<%d). Please fix it by "
+"removing the extra entry from the translated file. You may need an addendum "
+"(cf po4a(7)) to reput the chunk in place after gettextization. A possible "
+"cause is that a text duplicated in the original is not translated the same "
+"way each time. Remove one of the translations, and you're fine."
+msgstr ""
+"Оригинал има мање стрингова од превода (%d<%d). Молимо поправите га тако што "
+"ћете из преведеног фајла да уклоните ставку вишка. Можда ће вам бити "
+"потребан addendum (в. po4a(7)) да врати комад текста на место након "
+"gettextизације. Могућ узрок овога је да дуплирани текст у оригиналу није "
+"сваки пут преведен на исти начин. Уклоните један од превода, и неће бити "
+"проблема."
+
+#: ../../po4a-gettextize:448
+#, perl-format
+msgid ""
+"po4a gettextization: Structure disparity between original and translated "
+"files:\n"
+"msgid (at %s) is of type '%s' while\n"
+"msgstr (at %s) is of type '%s'.\n"
+"Original text: %s\n"
+"Translated text: %s\n"
+"(result so far dumped to gettextization.failed.po)"
+msgstr ""
+"po4a gettextизација: Разликује се структура оригиналног и преведеног фајла:\n"
+"msgid (на %s) је типа '%s' док је\n"
+"msgstr (на %s) типа '%s'.\n"
+"Оригинални текст: %s\n"
+"Преведени текст: %s\n"
+"(досадашњи резултат је смештен у gettextization.failed.po)"
+
+#: ../../po4a-gettextize:555
+msgid ""
+"You must provide the same amount of master files and localized files to "
+"synchronize them, as po4a-gettextize is intended to synchronize master files "
+"and previously existing translations. If just want to extract POT files of "
+"your master files, please use po4a-updatepo. Please note that the most "
+"convenient way of using po4a is to write a po4a.conf file and use the "
+"integrated po4a(1) program."
+msgstr ""
+"Да бисте их синхронизовали, морате да наведете исти број мастер фајлова и "
+"локализованих фајлова, пошто је po4a-gettextize намењен за синхронизацију "
+"мастер фајлова са већ постојећим преводма. Ако желите само да издвојите POT "
+"фајлове ваших мастер фајлова, молимо вас да употребите po4a-updatepo. Имајте "
+"на уму да је најзгоднији начин за коришћење програма po4a да напишете po4a."
+"conf фајл и да употребљавате интегрисани po4a(1) програм."
+
+#: ../../po4a-gettextize:570
+msgid ""
+"po4a-gettextize is only useful to convert previously existing translations "
+"to a PO based workflow. Once you successfully converted your project to "
+"po4a, you should use the po4a(1) program to maintain it and update your "
+"translations."
+msgstr ""
+"po4a-gettextize је користан само за конверзију постојећих превода у процес "
+"рада заснован на PO. Када свој пројекат успешно конвертујете у po4a, за "
+"одржавање и ажурирање својих превода би онда требало да користите po4a(1) "
+"програм."
+
+#: ../../po4a-gettextize:601
+msgid ""
+"Temporary master and localized POT files dumped to po4atemp.master.po and "
+"po4atemp.localized.po"
+msgstr ""
+"Привремени мастер и локализовани POT фајлови су уписани у po4atemp.master.po "
+"и po4atemp.localized.po"
+
+#: ../../po4a-normalize:184
+msgid ""
+"Both B<--blank> and B<--capitalize> can't be specified at the same time."
+msgstr "B<--blank> и B<--capitalize> не могу да се наведу истовремено."
+
+#: ../../po4a-normalize:197
+msgid ""
+"po4a-normalize is mostly useful to debug po4a itself. Users are advised to "
+"use the po4a(1) program instead."
+msgstr ""
+"po4a-normalize је углавном користан за дибаговање самог програма po4a. "
+"Корисницима се саветује да уместо њега користе po4a(1) програм."
+
+#: ../../po4a-normalize:206
+#, perl-format
+msgid "Options %s and %s cannot be provided together"
+msgstr "Опције %s и %s не могу да се наведу заједно"
+
+#: ../../po4a-normalize:232
+#, perl-format
+msgid "Write the normalized document to %s."
+msgstr "Записивање нормализованог документа у %s."
+
+#: ../../po4a-normalize:235
+#, perl-format
+msgid "Write the normalized PO file to %s."
+msgstr "Записивање нормализованог PO фајла у %s."
+
+#: ../../po4a-translate:253
+msgid ""
+"po4a-translate is deprecated. The unified po4a(1) program is more convenient "
+"and less error prone. Once configured, `po4a --no-update` can be used as a "
+"drop-in replacement to `po4a-translate`."
+msgstr ""
+"po4a-translate је застарео. Обједињени po4a(1) програм је много згоднији за "
+"рад и обезбеђује мању могућност грешака. Једном када се подеси, као директна "
+"замена за `po4a-translate` може да се користи`po4a --no-update`."
+
+#: ../../po4a-translate:279
+#, perl-format
+msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
+msgstr "Одбацује се превод %s (преведено је само %s%%; а потребно %s%%)."
+
+#: ../../po4a-translate:317
+#, perl-format
+msgid "Discard the translation of %s (addendum %s does not apply)."
+msgstr "Одбацује се превод %s (addendum %s се не примењује)."
+
+#: ../../po4a-updatepo:276
+msgid ""
+"po4a-updatepo is deprecated. The unified po4a(1) program is more convenient "
+"and less error prone. Once configured, `po4a --no-translations` can be used "
+"as a drop-in replacement to `po4a-updatepo`."
+msgstr ""
+"po4a-updatepo је застарео. Обједињени po4a(1) програм је много згоднији за "
+"рад и обезбеђује мању могућност грешака. Једном када се подеси, као директна "
+"замена за `po4a-updatepo` може да се користи`po4a --no-translations`."
+
+#: ../../po4a-updatepo:286
+msgid "po4a-updatepo can't take the input PO from stdin."
+msgstr "po4a-updatepo не може да чита улазни PO са stdin."
+
+#: ../../po4a-updatepo:297
+msgid "Parse input files... "
+msgstr "Парсирање улазних фајлова... "
+
+#: ../../po4a-updatepo:305
+msgid "done."
+msgstr "готово."
+
+#: ../../po4a-updatepo:333
+#, perl-format
+msgid "Could not copy the PO file (%s -> %s): %s"
+msgstr "PO фајл није могао да се копира (%s -> %s): %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr "Неисправно кодирање током читања фајла %s скупом карактера %s: %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Неисправно кодирање током уписа карактера ’%s’ у фајл %s скупом карактера "
+#~ "%s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr "Неисправно кодирање током уписа у фајл %s скупом карактера %s: %s"
diff --git a/po/bin/sr_Cyrl.po b/po/bin/sr_Cyrl.po
index 1e3a18e..27d22e8 100644
--- a/po/bin/sr_Cyrl.po
+++ b/po/bin/sr_Cyrl.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the po4a package.
-# eevan78 <ivan.pesic@gmail.com>, 2020, 2021, 2022, 2023.
+# eevan78 <ivan.pesic@gmail.com>, 2020, 2021, 2022, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.57\n"
-"Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
-"PO-Revision-Date: 2023-08-28 09:54+0000\n"
+"Report-Msgid-Bugs-To: martin.quinson@debian.org\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
+"PO-Revision-Date: 2024-06-13 21:24+0000\n"
 "Last-Translator: eevan78 <ivan.pesic@gmail.com>\n"
 "Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/po4a/"
 "po4a/sr_Cyrl/>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.0.1-dev\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Дефиниција макроа не може да се парсира: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -312,31 +312,30 @@ msgstr ""
 "парсер. Молимо да једноставно ставите аргументе макроа у исту линију."
 
 #: ../../lib/Locale/Po4a/Man.pm:1034
-#, fuzzy, perl-format
-#| msgid "Escape sequence \\c encountered. This is not completely handled yet."
+#, perl-format
 msgid ""
 "Escape sequence \\c encountered. This is not completely handled yet. Faulty "
 "input: %s"
 msgstr ""
 "Наишло се на секвенцу означавања \\c. Ово се још увек не обрађује у "
-"потпуности."
+"потпуности. Неисправан унос: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Неупарено '<' и '>' у модификатору фонта. Неисправна порука: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Непозната '<' или '>' секвенца. Неисправна порука: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Линија не може да се парсира: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -345,17 +344,17 @@ msgstr ""
 "Непознат макро '%s'. Уклоните га из документа, или погледајте Locale::Po4a::"
 "Man man страницу да сазнате како po4a може да обради нове макрое."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Аргументи команде не могу да се парсирају: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Фонт није подржан у: '%s'."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -369,7 +368,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 "Ова страница дефинише нови макро ’%s’ са ’%s’ (коментар унутар линије: %s), "
-"али нисте навели очекивано понашање po4a програма када се уппотреби ’%s’. "
+"али нисте навели очекивано понашање po4a програма када се употреби ’%s’. "
 "Јавиће се грешка ако у страници заиста и употребите овај макро.\n"
 "Да спречите проблеме, додајте макро у један од параметара ’%s’, ’%s’, ’%s’, "
 "’%s’, ’%s’ или ’%s’.\n"
@@ -378,7 +377,7 @@ msgstr ""
 "За више информација о овим параметрима, молимо вас да погледате man страницу "
 "Locale::Po4a::Man.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -401,7 +400,7 @@ msgstr ""
 "За више информација о овим параметрима, молимо вас да погледате man страницу "
 "Locale::Po4a::Man.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -415,11 +414,11 @@ msgstr ""
 "копира дословно, али то није баш толико робусни. ’%s’ приказује преводиоцима "
 "ове макрое, али groff макрои баш и нису пригодни преводиоцима."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Након .ie макроа мора да следи .el макро."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -433,7 +432,7 @@ msgstr ""
 "копирају у преведени фајл, али то није баш робусно. ’%s’ приказује ове "
 "макрое преводиоцу, али groff макрои баш и нису пригодни преводиоцима."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -442,7 +441,7 @@ msgstr ""
 "Ова страна укључује неки други фајл са '%s'. Не заборавите да преведете и "
 "тај фајл ('%s')."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -451,7 +450,7 @@ msgstr ""
 "Ова страна користи '%s' захтев са бројем линија у аргументу. То још увек "
 "није подржано."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -491,22 +490,24 @@ msgstr ""
 "Неважећи po фајл %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Није могуће читање из %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
+"Фајл %s почиње BOM карактером који означава да је кодирање фајла UTF-8, али "
+"сте уместо тога навели %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "%s не може да се затвори након читања: %s"
@@ -520,49 +521,50 @@ msgstr "Нису подржане поруке са више од два обл�
 msgid "Parse error at: -->%s<--"
 msgstr "Грешка парсирања код: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Није могуће уписивање у фајл који нема име"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Не може да се упише у %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
+"msgmerge има неке багове када кодирање PO фајлова није UTF-8; Мења се "
+"кодирање %s у UTF-8 (било је %s) да би се заобишао проблем.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Не могу да се запишу PO фајлови са више од два облика множине."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
-#, fuzzy, perl-format
-#| msgid "Cannot close %s after writing: %s"
+#: ../../lib/Locale/Po4a/Po.pm:625
+#, perl-format
 msgid "Cannot close %s after writing: %s\n"
-msgstr "%s не може да се затвори након уписивања: %s"
+msgstr "%s не може да се затвори након уписивања: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Не може да се раскине веза %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "%s не може да се премести у %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Није успело одређивање задатог филтера: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -570,7 +572,7 @@ msgid ""
 msgstr ""
 "'%s' је облик једнине поруке, po4a ће да употреби msgstr[0] превод (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -578,12 +580,12 @@ msgid ""
 msgstr ""
 "'%s' је облик множине поруке, po4a ће да употреби msgstr[1] превод (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid је дефинисан двапут: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -602,12 +604,14 @@ msgstr ""
 "%s\n"
 " Стари превод је одбачен."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
 "Please change either setting."
 msgstr ""
+"Фајл %s декларише %s као своје кодирање, али сте као главни скуп карактера "
+"навели %s. Молимо вас да промените једно од ова два подешавања."
 
 #: ../../lib/Locale/Po4a/Sgml.pm:228
 msgid ""
@@ -745,44 +749,47 @@ msgstr ""
 "аргументом:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "неупарено %s у '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Грешка приликом провере броја аргумената команде '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Непозната команда: '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Немогуће је читање из фајла када се на зада име фајла"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
 "o exclude_include=%s' to the options, either on the command line or in your "
 "po4a.conf file."
 msgstr ""
+"kpsewhich не може да пронађе ’%s’. Да бисте спречили узимање овог фајла у "
+"обзир, додајте ’-o exclude_include=%s’ у опције или у командној линији, или "
+"у po4a.conf фајл."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich не може да пронађе %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Не може да се користи алијас на непознату команду '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -791,39 +798,39 @@ msgstr ""
 "Користите стари формат дефиниција (%s). Молимо да ажурирате ову линију "
 "дефиниције."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "непознато окружење: '%s'"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "неупарени крај окружења '%s'"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Погрешан број аргумената за команду '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Наведен је опционални аргумент, али се очекује обавезан."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Команда '%s': %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: неподржани формат: '%s'."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Први аргумент за \\begin је обавезан."
 
@@ -845,6 +852,10 @@ msgid ""
 "use multi-lines definitions instead. Offending line:\n"
 " %s"
 msgstr ""
+"Парсер који користимо (YAML::Tiny) не обрађује исправно уграђене листе и "
+"речнике у једној линији: они се интерпретирају као обични стрингови. Молимо "
+"вас да уместо њих употребите вишелинијске дефиниције. Проблематична линија:\n"
+" %s"
 
 #: ../../lib/Locale/Po4a/Text.pm:652
 #, perl-format
@@ -881,55 +892,75 @@ msgstr ""
 "Неисправан огрђени div блок: блок који почиње на %s није затворен пре краја "
 "фајла."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
+"Неисправно кодирање током читања из фајла %s користећи скуп карактера %s: %"
+"s\n"
+"Ако се скуп карактера %s не очекује, потребно је да заставицом --master-"
+"charset или сличном подесите одговарајући."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
+"Неисправно кодирање током уписа карактера ’%s’ у фајл %s користећи скуп "
+"карактера %s: %s\n"
+"Ако се скуп карактера %s не очекује, потребно је да заставицом --localized-"
+"charset или сличном подесите одговарајући."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
+"Неисправно кодирање током уписа карактера у фајл %s користећи скуп карактера "
+"%s: %s\n"
+"Ако се скуп карактера %s не очекује, потребно је да заставицом --localized-"
+"charset или сличном подесите одговарајући."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "%s не може да се затвори након уписивања: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Не може да се прочита po4a заглавље из %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Прва линија у %s не личи на po4a заглавље."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Синтаксна грешка у po4a заглављу фајла %s, у близини \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Неважећи аргумент у po4a заглављу фајла %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "po4a заглавље фајла %s не дефинише режим."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -938,54 +969,54 @@ msgstr ""
 "Неважећи режим у po4a заглављу фајла %s: требало би да је 'before', 'after' "
 "или 'eof', а не '%s'."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "po4a заглавље фајла %s не дефинише позицију."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "У po4a заглављу није наведена завршавајућа граница, већ mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Позиција није потребна када је mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Завршавајућа граница није потребна када је mode=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "addendum не може да се примени када није наведено име фајла"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Addendum %s не постоји."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "За addendum %s нема могуће позиције."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "За addendum %s је пронађено више од једне могуће позиције."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Addendum '%s' је примењен пре ове линије: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Addendum '%s' је примењен иза линије: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Addendum '%s' је примењен на крају фајла."
@@ -1009,6 +1040,8 @@ msgstr "%s: %s не може да се затвори након читања: %
 #, perl-format
 msgid "Cannot have more than one input charset in XML files (%s and %s)"
 msgstr ""
+"Не може да се прихвати више од једног улазног скупа карактера у XML "
+"фајловима (%s и %s)"
 
 #: ../../lib/Locale/Po4a/Xml.pm:235
 #, perl-format
@@ -1029,7 +1062,19 @@ msgstr ">>> име фајла = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Интерна грешка: непознат идентификатор типа '%s'."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"Фајл %s декларише %s као своје кодирање, али сте као главни скуп карактера "
+"навели %s. Молимо вас да промените једно од ова два подешавања јер су у "
+"језику Perl то уствари два различита кодирања. Погледајте https://perldoc."
+"perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1038,7 +1083,7 @@ msgstr ""
 "Лош тип документа. Очекује се '%s'. Ово упозорење можете да исправите са -o "
 "doctype опцијом, или можете да игноришете ову проверу са -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1047,14 +1092,14 @@ msgstr ""
 "Пронађена је неочекивана затварајућа ознака </%s>. Можда је погрешан главни "
 "документ. Наставља се даље…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Пронађена је неочекивана затварајућа ознака </%s>. Можда је погрешан главни "
 "документ."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1063,17 +1108,17 @@ msgstr ""
 "%s: атрибут '%s' није дефинисан у 'attributes' опцији модула и\n"
 "....  није преведено за путању атрибута '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Лоша синтакса атрибута. Наставља се даље…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Лоша синтакса атрибута"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1084,13 +1129,13 @@ msgstr ""
 " *** оригинална опција превода је овде преиначена јер родитељска путања='%s' "
 "није преведена,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: foldattributes подешавање је игнорисано јер '%s' није inline ознака"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1105,7 +1150,7 @@ msgstr ""
 "\n"
 "Молимо поправите свој превод."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1114,10 +1159,10 @@ msgstr ""
 "Опција '%s' је превазиђена. Молимо да користите категорије translated/"
 "untranslated и/или break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Ознака '%s' и у %s и у %s категоријама."
@@ -1161,17 +1206,18 @@ msgid "Handling %s"
 msgstr "Обрађује се %s"
 
 #: ../../msguntypot:213 ../../po4a-updatepo:324
-#, fuzzy, perl-format
-#| msgid "Could not run msgmerge: %s"
+#, perl-format
 msgid ""
 "Could not run msgmerge: %s\n"
 "The command was: %s"
-msgstr "Није могао да се покрене msgmerge: %s"
+msgstr ""
+"Није могао да се покрене msgmerge: %s\n"
+"Команда је била: %s"
 
 #: ../../msguntypot:227
 #, perl-format
 msgid "msguntypot changed msgid \"%s\" to \"%s\" in %s\n"
-msgstr ""
+msgstr "msguntypot је променио msgid „%s” на „%s” у %s\n"
 
 #: ../../msguntypot:234
 #, perl-format
@@ -1369,15 +1415,11 @@ msgid "The master file '%s' does not exist."
 msgstr "Мастер фајл '%s' не постоји."
 
 #: ../../po4a:1378
-#, fuzzy
-#| msgid ""
-#| "Option 'master:file' is deprecated. Please use 'pot' instead for the same "
-#| "effect."
 msgid ""
 "Option 'master:file=' is deprecated. Please use 'pot=' instead for the same "
 "effect."
 msgstr ""
-"Опција 'master:фајл' је застарела. Уместо ње употребите 'pot', ефекат је "
+"Опција ’master:фајл=’ је застарела. Уместо ње употребите ’pot=’, ефекат је "
 "исти."
 
 #: ../../po4a:1401
@@ -1425,18 +1467,18 @@ msgstr "Искључује се --translate-only опција, она није �
 #: ../../po4a:1546
 #, perl-format
 msgid "Document %s kept for update (--translate-only)."
-msgstr ""
+msgstr "Документ %s је задржан за ажурирање (--translate-only)."
 
 #: ../../po4a:1549
-#, fuzzy, perl-format
-#| msgid "NOT updating %s as requested (--no-update)."
+#, perl-format
 msgid "Skip the update of %s as requested (--translate-only)."
-msgstr "%s се НЕ освежава, као што је и захтевано (--no-update)."
+msgstr "Прескаче се ажурирање %s, као што је и захтевано (--translate-only)."
 
 #: ../../po4a:1569
 #, perl-format
 msgid "Languages skipped because of --translate-only: %s; kept languages: %s."
 msgstr ""
+"Прескочени су језици због --translate-only: %s; задржани су језици: %s."
 
 #: ../../po4a:1606
 #, perl-format
@@ -1469,15 +1511,14 @@ msgid " (%d entries)"
 msgstr " (%d ставки)"
 
 #: ../../po4a:1689
-#, fuzzy, perl-format
-#| msgid "NOT updating %s as requested (--no-update)."
+#, perl-format
 msgid "NOT updating the POT file %s as requested (--no-update)."
-msgstr "%s се НЕ освежава, као што је и захтевано (--no-update)."
+msgstr "POT фајл %s се НЕ освежава, као што је и захтевано (--no-update)."
 
 #: ../../po4a:1692
 #, perl-format
 msgid "NOT updating the POT file %s because of --translate-only."
-msgstr ""
+msgstr "POT фајл %s се НЕ освежава због опције --translate-only."
 
 #: ../../po4a:1695
 #, perl-format
@@ -1517,13 +1558,12 @@ msgstr "Освежавање превода на језик %s:"
 #: ../../po4a:1841
 #, perl-format
 msgid "Creating an empty PO file for the language %s.\n"
-msgstr ""
+msgstr "Креира се празан PO фајл за језик %s.\n"
 
 #: ../../po4a:1843
-#, fuzzy, perl-format
-#| msgid "Cannot create a temporary PO file: %s"
+#, perl-format
 msgid "Creating an empty PO file in %s.\n"
-msgstr "Не може да се креира привремени PO фајл: %s"
+msgstr "Креира се празан PO фајл у %s.\n"
 
 #: ../../po4a:1947
 #, perl-format
@@ -1538,7 +1578,7 @@ msgstr "За језик %s недостаје PO фајл %s -- прескаче
 #: ../../po4a:1973
 #, perl-format
 msgid "Skip master file %s in language %s because of --translate-only."
-msgstr ""
+msgstr "Прескаче се мастер фајл %s на језику %s због опције --translate-only."
 
 #: ../../po4a:1993
 #, perl-format
@@ -1678,7 +1718,7 @@ msgstr ""
 #: ../../po4a-normalize:184
 msgid ""
 "Both B<--blank> and B<--capitalize> can't be specified at the same time."
-msgstr ""
+msgstr "B<--blank> и B<--capitalize> не могу да се наведу истовремено."
 
 #: ../../po4a-normalize:197
 msgid ""
@@ -1704,17 +1744,14 @@ msgid "Write the normalized PO file to %s."
 msgstr "Записивање нормализованог PO фајла у %s."
 
 #: ../../po4a-translate:253
-#, fuzzy
-#| msgid ""
-#| "po4a-translate is deprecated. The unified po4a(1) program is more "
-#| "convenient and less error prone."
 msgid ""
 "po4a-translate is deprecated. The unified po4a(1) program is more convenient "
 "and less error prone. Once configured, `po4a --no-update` can be used as a "
 "drop-in replacement to `po4a-translate`."
 msgstr ""
 "po4a-translate је застарео. Обједињени po4a(1) програм је много згоднији за "
-"рад и обезбеђује мању могућност грешака."
+"рад и обезбеђује мању могућност грешака. Једном када се подеси, као директна "
+"замена за `po4a-translate` може да се користи`po4a --no-update`."
 
 #: ../../po4a-translate:279
 #, perl-format
@@ -1727,17 +1764,14 @@ msgid "Discard the translation of %s (addendum %s does not apply)."
 msgstr "Одбацује се превод %s (addendum %s се не примењује)."
 
 #: ../../po4a-updatepo:276
-#, fuzzy
-#| msgid ""
-#| "po4a-updatepo is deprecated. The unified po4a(1) program is more "
-#| "convenient and less error prone."
 msgid ""
 "po4a-updatepo is deprecated. The unified po4a(1) program is more convenient "
 "and less error prone. Once configured, `po4a --no-translations` can be used "
 "as a drop-in replacement to `po4a-updatepo`."
 msgstr ""
 "po4a-updatepo је застарео. Обједињени po4a(1) програм је много згоднији за "
-"рад и обезбеђује мању могућност грешака."
+"рад и обезбеђује мању могућност грешака. Једном када се подеси, као директна "
+"замена за `po4a-updatepo` може да се користи`po4a --no-translations`."
 
 #: ../../po4a-updatepo:286
 msgid "po4a-updatepo can't take the input PO from stdin."
@@ -1757,6 +1791,21 @@ msgid "Could not copy the PO file (%s -> %s): %s"
 msgstr "PO фајл није могао да се копира (%s -> %s): %s"
 
 #, perl-format
+#~ msgid "Malformed encoding while reading from file %s with charset %s: %s"
+#~ msgstr "Неисправно кодирање током читања фајла %s скупом карактера %s: %s"
+
+#, perl-format
+#~ msgid ""
+#~ "Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+#~ msgstr ""
+#~ "Неисправно кодирање током уписа карактера ’%s’ у фајл %s скупом карактера "
+#~ "%s: %s"
+
+#, perl-format
+#~ msgid "Malformed encoding while writing to file %s with charset %s: %s"
+#~ msgstr "Неисправно кодирање током уписа у фајл %s скупом карактера %s: %s"
+
+#, perl-format
 #~ msgid "Cannot find %s with kpsewhich"
 #~ msgstr "%s не може да се пронађе помоћу kpsewhich"
 
diff --git a/po/bin/sv.po b/po/bin/sv.po
index 10603de..47d4eb0 100644
--- a/po/bin/sv.po
+++ b/po/bin/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2021-08-01 10:33+0000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/po4a/po4a/sv/>\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -43,7 +43,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Kan inte tolka makrodefinition: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -330,22 +330,22 @@ msgid ""
 msgstr ""
 "Avbrottssekvensen \\c hittades. Komplett stöd för detta finns inte ännu."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "Obalanserat \"<\" och \">\" i typsnittsmodifierare. Felmeddelande: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Okänd \"<\" och \">\" i typsnittsmodifierare. Felaktigt meddelande: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Ej tolkningsbar rad: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -354,17 +354,17 @@ msgstr ""
 "Okänt makro \"%s\". Ta bort det från dokumentet, eller läs i manualsidan "
 "Locale::Po4a::Man om hur po4a kan hantera nya makron."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Kan inte tolka kommandoradsargument: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Typsnitt som ej stöds i: \"%s\"."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -378,7 +378,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -392,7 +392,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -402,11 +402,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Makrot .ie måste följas av ett .el-makro."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -416,7 +416,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -425,7 +425,7 @@ msgstr ""
 "Denna sida inkluderar en annan fil med \"%s\". Glöm inte att översätta denna "
 "fil (\"%s\")."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -434,7 +434,7 @@ msgstr ""
 "Denna sida använder \"%s\"-begäran med antalet rader i argumentet. Detta "
 "stöds inte ännu."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -474,22 +474,22 @@ msgstr ""
 "Ogiltig po-fil %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Kan inte läsa från %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Kan inte stänga %s efter läsning: %s"
@@ -504,49 +504,49 @@ msgstr "Meddelanden med mer än två pluralformer stöds ej."
 msgid "Parse error at: -->%s<--"
 msgstr "Konstig rad: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Kan inte skriva en fil utan filnamn"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Kan inte skriva till %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Kan inte skriva PO-filer med mer än två pluralformer."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Cannot close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Kan inte stänga %s efter skrivning: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Kan inte ta bort %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Kan inte flytta %s till %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -555,7 +555,7 @@ msgstr ""
 "\"%s\" är singularformen av meddelandet, po4a kommer att använda msgstr[0]-"
 "översättningen (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -564,12 +564,12 @@ msgstr ""
 "\"%s\" är pluralformen av meddelandet, po4a kommer att använda msgstr[1]-"
 "översättningen (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid definierad två gånger: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -588,7 +588,7 @@ msgstr ""
 "%s\n"
 " Äldre översättning förkastad."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -730,26 +730,26 @@ msgstr ""
 "För att se felmeddelande, kör om po4a med detta extra argument:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "obalanserat %s i \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Fel vid kontroll av antalet argument för kommandot \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Okänt kommando: \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Kan inte läsa från en fil utan att ha ett filnamn"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -757,17 +757,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhick kan inte hitta %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Kan inte använda ett alias till det okända kommandot \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -776,41 +776,41 @@ msgstr ""
 "Du använder det gamla definitionsformatet (%s).  Uppdatera denna "
 "definitionsrad."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "okänd miljö: \"%s\""
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "omatchat slut på miljö \"%s\""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Fel antal argument för kommandot \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Ett valfritt argument tillhandahölls, men ett obligatoriskt argument "
 "förväntades."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Kommando \"%s\": %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: formatet stöds inte: \"%s\"."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Första argumentet av \\begin är obligatoriskt."
 
@@ -858,55 +858,63 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Kan inte stänga %s efter skrivning: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Kan inte läsa po4a-huvud från %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Första raden i %s ser inte ut som ett po4a-huvud."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Syntaxfel i po4a-huvudet av %s, nära \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Ogiltigt argument i po4a-huvudet för %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Po4a-huvudet för %s definierar inte läget."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -918,56 +926,56 @@ msgstr ""
 "Läget är ogiltigt i po4a-huvudet för %s: bör vara \"before\" eller \"after\" "
 "inte %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Po4a-huvudet för %s definierar inte positionen."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Inget avslutande gräns angavs i po4a-huvudet, men mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
 msgstr "Inget avslutande gräns angavs i po4a-huvudet, men mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Kan inte infoga tillägg när inte filnamnet angivits"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Tillägget %s finns inte."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Ingen tänkbar position för tillägget %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Mer än en tänkbar position hittades för tillägget %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Tillägget \"%s\" lades till före denna rad: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Tillägget \"%s\" lades till efter raden: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Tillägget \"%s\" lades till på slutet av filen."
@@ -1011,7 +1019,15 @@ msgstr ""
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Internt fel: okänd typidentifierare \"%s\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1021,7 +1037,7 @@ msgstr ""
 "alternativet -o dokumenttyp, eller helt bortse från denna kontroll med -o "
 "doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1030,29 +1046,29 @@ msgstr ""
 "Oväntad stängningstagg </%s> hittades. Huvuddokumentet kan ha fel. "
 "Fortsätter…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "Oväntad stängningstagg </%s> hittades. Huvuddokumentet kan ha fel."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
 "....  is not translated for the attribute path '%s'"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: Felaktig attributsyntax. Fortsätter…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Felaktig attributsyntax"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1060,12 +1076,12 @@ msgid ""
 "path='%s' is untranslated,"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1076,7 +1092,7 @@ msgid ""
 msgstr ""
 
 # Här valde jag att inte översätta det som låter som om de är nyckelord!
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1085,10 +1101,10 @@ msgstr ""
 "Alternativet \"%s\" fasas ut. Vänligen använd translated/untranslated och/"
 "eller kategorierna break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Taggen \"%s\" finns både i kategorierna %s och %s."
diff --git a/po/bin/uk.po b/po/bin/uk.po
index 33e839e..9bc35f6 100644
--- a/po/bin/uk.po
+++ b/po/bin/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-02-03 18:10+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/po4a/po4a/uk/"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -43,7 +43,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "Не вдалося обробити визначення макроса: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -330,25 +330,25 @@ msgstr ""
 "Виявлено керівну послідовність \\c. Обробки цієї послідовності ще не "
 "передбачено."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Неврівноважена послідовність «<» і «>» у модифікаторі шрифту. Помилкове "
 "повідомлення: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr ""
 "Невідома програмі послідовність «<» або «>». Повідомлення з помилкою: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Непридатний до обробки рядок: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -358,17 +358,17 @@ msgstr ""
 "сторінки довідки (man) Locale::po4a::Man, щоб ознайомитися зі способом "
 "додавання до po4a можливостей обробки нових макроси."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Не вдалося обробити параметри команди: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Непідтримуваний шрифт: «%s»."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -391,7 +391,7 @@ msgstr ""
 "Будь ласка, зверніться до сторінки підручника щодо Locale::Po4a::Man, щоб "
 "дізнатися більше про ці параметри.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -414,7 +414,7 @@ msgstr ""
 "Будь ласка, зверніться до сторінки підручника щодо Locale::Po4a::Man, щоб "
 "дізнатися більше про ці параметри.\n"
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -429,11 +429,11 @@ msgstr ""
 "копіювання не завжди є належними. «%s» покаже ці макроси перекладачам, але "
 "макроси groff не дуже зручні для перекладачів."
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Після макроса .ie слід вказати макрос .el."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -448,7 +448,7 @@ msgstr ""
 "копіювання не завжди є належними. «%s» покаже ці макроси перекладачам, але "
 "макроси groff не дуже зручні для перекладачів."
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -457,7 +457,7 @@ msgstr ""
 "До цієї сторінки включено інший файл з «%s». Не забудьте перекласти цей файл "
 "(«%s»)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -466,7 +466,7 @@ msgstr ""
 "На цій сторінці використано запит «%s» зі значенням кількості рядків у "
 "параметрі. Підтримки таких запитів ще не передбачено."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -506,14 +506,14 @@ msgstr ""
 "Некоректний файл po %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "Не вдалося прочитати дані з %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
@@ -522,8 +522,8 @@ msgstr ""
 "Файл %s починається з символу порядку байтів, що вказує на те, що кодуванням "
 "файла UTF-8, але вами вказано кодування %s ."
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "Не вдалося закрити %s після читання: %s"
@@ -539,16 +539,16 @@ msgstr ""
 msgid "Parse error at: -->%s<--"
 msgstr "Помилка обробки тут: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "Запис до файла без визначеної назви неможливий"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "Не вдалося записати дані до %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
@@ -557,33 +557,33 @@ msgstr ""
 "msgmerge має певні проблеми з файлами PO, дані у яких не записано у "
 "кодуванні UTF-8; записуємо %s до UTF-8 (було %s), щоб уникнути помилок.\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr ""
 "Запис файлів PO, у яких передбачено більше двох форм множини, неможливий."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, perl-format
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Не вдалося закрити %s після завершення запису: %s\n"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "Не вдалося від’єднати %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "Не вдалося пересунути %s до %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "Спроба обробки наданого фільтра завершилася помилкою: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 "«%s» є формою однини повідомлення, po4a використає переклад з msgstr[0] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -600,12 +600,12 @@ msgstr ""
 "«%s» є формою множини повідомлення, po4a використає переклад з msgstr[1] "
 "(%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid визначено двічі: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -624,7 +624,7 @@ msgstr ""
 "%s\n"
 " Застарілий переклад відкинуто."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -772,26 +772,26 @@ msgstr ""
 "додатковим аргументом:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "неврівноважений %s у «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Помилка під час спроби перевірки кількості параметрів команди «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Невідома команда: «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "Читання файла без вказаної назви файла неможливе"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -802,17 +802,17 @@ msgstr ""
 "файла, додайте до параметрів «-o exclude_include=%s» у командному рядку або "
 "у вашому файлі po4a.conf."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich не вдалося знайти %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Не вдалося використати іншу назву невідомої команди «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -821,39 +821,39 @@ msgstr ""
 "Ви використовуєте застарілий формат визначення (%s). Будь ласка, оновіть цей "
 "рядок визначення."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "невідоме середовище: «%s»"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "невідповідне завершення середовища «%s»"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Помилкова кількість аргументів команди «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "Вказано необов’язковий параметр, обов’язковий параметр пропущено."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Команда «%s»: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: непідтримуваний формат: «%s»."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Перший параметр \\begin є обов’язковим."
 
@@ -917,55 +917,63 @@ msgstr ""
 "Помилкове форматування блоку div: блок, що починається у %s, не завершено до "
 "кінця файла."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "Не вдалося закрити %s після завершення запису: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "Не вдалося прочитати заголовок po4a з %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Перший рядок %s не відповідає формату заголовка po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Синтаксична помилка у заголовку po4a %s, поряд з \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Некоректний параметр у заголовку po4a %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Заголовок po4a %s не визначає режиму."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -974,54 +982,54 @@ msgstr ""
 "Некоректний режим у заголовку po4a %s: має бути «before», «after» або «eof». "
 "Втім, маємо «%s»."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Заголовок po4a %s не визначає позиції."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Не вказано завершальної межі у заголовку po4a, але вказано mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "Позиція є непотрібною, якщо режим=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "Завершальна межа непотрібна, якщо режим=eof."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "Не можна застосувати додавання, якщо не вказано назви файла"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Доповнення %s не існує."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Відповідної позиції для доповнення %s не виявлено."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "У доповненні %s знайдено декілька відповідних позицій."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Доповнення «%s» додано до рядка: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Доповнення «%s» додано після рядка: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Доповнення «%s» вставлено у кінець файла."
@@ -1067,7 +1075,20 @@ msgstr ">>> назва файла = «%s»"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Внутрішня помилка: невідомий тип ідентифікатора «%s»."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, fuzzy, perl-format
+#| msgid ""
+#| "The file %s declares %s as encoding, but you provided %s as master "
+#| "charset. Please change either setting."
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+"У файлі %s оголошено кодування %s , але вами задано як основний набір "
+"символів %s. Будь ласка, внесіть зміни, щоб синхронізувати ці значення."
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1077,7 +1098,7 @@ msgstr ""
 "попередження можна використання параметра -o doctype або вимиканням "
 "перевірки за допомогою параметра -o doctype=\"\"."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1086,14 +1107,14 @@ msgstr ""
 "Виявлено неочікуваний завершальний теґ </%s>. Можливо, помилка у основному "
 "документі. Продовжуємо обробку…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr ""
 "Виявлено неочікуваний завершальний теґ </%s>. Можливо, помилка у основному "
 "документі."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1102,17 +1123,17 @@ msgstr ""
 "%s: атрибут «%s» не визначено у параметрі модуля «attributes» і\n"
 "....  не перекладено для шляху до атрибутів «%s»"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s: помилковий синтаксис параметра. Продовжуємо обробку…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: помилковий синтаксис параметра"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1123,14 +1144,14 @@ msgstr ""
 " *** початковий параметр перекладу перевизначено, оскільки батьківський "
 "шлях=«%s» не перекладено,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: параметр foldattributes проігноновано, оскільки «%s» не є вбудованим "
 "теґом"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1145,7 +1166,7 @@ msgstr ""
 "\n"
 "Будь ласка, виправте переклад."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1154,10 +1175,10 @@ msgstr ""
 "Параметр «%s» вважається застарілим. Будь ласка, скористайтеся категоріями "
 "translated/untranslated і/або break/inline/placeholder."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Теґ «%s» належить обом категоріям: %s і %s."
diff --git a/po/bin/vi.po b/po/bin/vi.po
index 717153c..3a8c3a6 100644
--- a/po/bin/vi.po
+++ b/po/bin/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.45\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2022-02-15 07:54+0000\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/po4a/po4a/vi/"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -40,7 +40,7 @@ msgstr ""
 msgid "Unable to parse macro definition: %s"
 msgstr "không thể phân tích phần định nghĩa vĩ lệnh: %s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, fuzzy, perl-format
 #| msgid "Can't open %s: %s"
@@ -322,24 +322,24 @@ msgid ""
 "input: %s"
 msgstr "Gặp dãy thoát “\\c”. Chưa xử lý hoàn toàn trường hợp này."
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr ""
 "Gặp <ngoặc nhọn> không tương ứng trong cờ sửa đổi phông chữ. Thông điệp sai: "
 "%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "Không nhận ra dãy chứa <ngoặc nhọn>. Thông điệp sai: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "Không thể phân tích cú pháp của dòng: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -349,17 +349,17 @@ msgstr ""
 "trang hướng dẫn Locale::Po4a::Man để thấy po4a quản lý vĩ lệnh mới như thế "
 "nào."
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "Không thể phân tích cú pháp của đối số dòng lệnh: %s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "Gặp phông chữ không được hỗ trợ trong: “%s”."
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -373,7 +373,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -387,7 +387,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -397,11 +397,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr "Vĩ lệnh “-ie” phải có một vĩ lệnh “.el” theo sau."
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -411,7 +411,7 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
@@ -420,7 +420,7 @@ msgstr ""
 "Trang này bao gồm một tập tin khác dùng “%s”. Đừng quên dịch tập tin này "
 "( “%s”)."
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
@@ -429,7 +429,7 @@ msgstr ""
 "Trang này sử dụng yêu cầu “%s” với số các dòng trong đối số. Tổ hợp này chưa "
 "được hỗ trợ."
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -475,23 +475,23 @@ msgstr ""
 "Tập tin po không hợp lệ %s:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, fuzzy, perl-format
 #| msgid "Can't read from %s: %s"
 msgid "Cannot read from %s: %s"
 msgstr "Không thể đọc từ %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, fuzzy, perl-format
 #| msgid "Can't close %s after reading: %s"
 msgid "Cannot close %s after reading: %s"
@@ -507,56 +507,56 @@ msgstr "Không hỗ trợ thông điệp chứa nhiều hơn 2 cách ở số nh
 msgid "Parse error at: -->%s<--"
 msgstr "Dòng lạ: -->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 #, fuzzy
 #| msgid "Can't write to a file without filename"
 msgid "Cannot write to a file without filename"
 msgstr "Không thể ghi vào tập tin mà không có tên tập tin"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, fuzzy, perl-format
 #| msgid "Can't write to %s: %s"
 msgid "Cannot write to %s: %s"
 msgstr "Không thể ghi vào %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 #, fuzzy
 #| msgid "Can't write PO files with more than two plural forms."
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "Không thể ghi tập tin PO chứa nhiều hơn hai dạng thức số nhiều."
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "Không thể đóng %s sau khi ghi: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, fuzzy, perl-format
 #| msgid "Can't unlink %s: %s."
 msgid "Cannot unlink %s: %s."
 msgstr "Không thể bỏ liên kết %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, fuzzy, perl-format
 #| msgid "Can't move %s to %s: %s."
 msgid "Cannot move %s to %s: %s."
 msgstr "Không thể di chuyển %s sang %s: %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
@@ -565,7 +565,7 @@ msgstr ""
 "“%s” là dạng số ít của một thông điệp: po4a sẽ sử dụng chuỗi dịch msgstr[0] "
 "(%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
@@ -574,12 +574,12 @@ msgstr ""
 "“%s” là cách ở số nhiều của một thông điệp: po4a sẽ sử dụng chuỗi dịch "
 "msgstr[1] (%s)."
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid định nghĩa hai lần: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -598,7 +598,7 @@ msgstr ""
 "%s\n"
 " Chuỗi dịch cũ bị hủy."
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -742,28 +742,28 @@ msgstr ""
 "Để xem thông báo lỗi, quay trở về chạy po4a với tham số bổ sung này:\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "%s thừa hay thiếu trong “%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "Gặp lỗi trong khi kiểm tra số các đối số trong câu lệnh “%s”: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "Không rõ câu lệnh: “%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 #, fuzzy
 #| msgid "Can't read from file without having a filename"
 msgid "Cannot read from file without having a filename"
 msgstr "Không thể đọc từ tập tin mà không có tên tập tin"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -771,17 +771,17 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "kpsewhich không tìm thấy %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "Không thể sử dụng một bí danh tới câu lệnh không rõ “%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
@@ -790,41 +790,41 @@ msgstr ""
 "Bạn đang sử dụng định dạng định nghĩa cũ (%s). Hãy cập nhật dòng định nghĩa "
 "này."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "không nhận ra môi trường: “%s”"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "kết thúc môi trường không tương ứng “%s”"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "Sai đặt số các đối số cho câu lệnh “%s”."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr ""
 "Đã đưa ra một tham số tùy chọn, nhưng lại cần một đối số bắt buộc phải sử "
 "dụng."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "Lệnh “%s”: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command: không hỗ trợ định dạng: “%s”."
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "Bắt buộc phải cung cấp đối số đầu tiên của “\\begin”."
 
@@ -872,57 +872,65 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, fuzzy, perl-format
 #| msgid "Can't close %s after writing: %s"
 msgid "Cannot close %s after writing: %s"
 msgstr "Không thể đóng %s sau khi ghi: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, fuzzy, perl-format
 #| msgid "Can't read po4a header from %s."
 msgid "Cannot read po4a header from %s."
 msgstr "Không thể đọc phần đầu po4a từ %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "Dòng đầu tiên của %s không có vẻ dạng phần đầu po4a."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "Gặp lỗi cú pháp trong phần đầu po4a của %s, ở gần “%s”"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Đối số không hợp lệ trong phần đầu po4a của %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "Phần đầu po4a của %s không định nghĩa chế độ."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, fuzzy, perl-format
 #| msgid ""
 #| "Mode invalid in the po4a header of %s: should be 'before' or 'after' not "
@@ -934,22 +942,22 @@ msgstr ""
 "Gặp chế độ không hợp lệ trong phần đầu po4a của %s: nên là “before” (đằng "
 "trước) hay “after” (đằng sau), không phải %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "Phần đầu po4a của %s không định nghĩa vị trí."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr ""
 "Phần đầu po4a không đựa ra biên giới kết thúc, còn “mode=after” (chế độ = "
 "đằng sau)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 #, fuzzy
 #| msgid "No ending boundary given in the po4a header, but mode=after."
 msgid "No ending boundary needed when mode=eof."
@@ -957,40 +965,40 @@ msgstr ""
 "Phần đầu po4a không đựa ra biên giới kết thúc, còn “mode=after” (chế độ = "
 "đằng sau)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 #, fuzzy
 #| msgid "Can't apply addendum when not given the filename"
 msgid "Cannot apply addendum when not given the filename"
 msgstr ""
 "Không thể áp dụng phần thêm vào (addendum) khi không đưa ra tên tập tin"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "Phần thêm vào (addendum) %s không tồn tại."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "Không có vị trí ứng cử cho phần thêm vào (addendum) %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "Tìm thấy nhiều vị trí ứng cử cho phần thêm vào (addendum) %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "Phần thêm vào (addendum) “%s” được áp dụng đằng trước dòng này: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "Phần thêm vào (addendum) “%s” được áp dụng sau dòng: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "Phần thêm vào (addendum) “%s” được áp dụng ở kết thúc tập tin."
@@ -1037,7 +1045,15 @@ msgstr ">>> tên tập tin = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "Lỗi nội bộ: không nhận ra kiểu nhận diện “%s”."
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -1047,7 +1063,7 @@ msgstr ""
 "dùng một tùy chọn “-o doctype”, hoặc bỏ qua sự kiểm tra này dùng “-o "
 "doctype=\"\"”."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
@@ -1055,12 +1071,12 @@ msgid ""
 msgstr ""
 "Gặp thẻ đóng bất thường </%s>. Tài liệu chủ có thể không đúng. Đang tiếp tục…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "Gặp thẻ đóng bất thường </%s>. Tài liệu chủ có thể không đúng."
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -1070,17 +1086,17 @@ msgstr ""
 "và\n"
 ".... không được dịch cho đường dẫn thuộc tính '%s'"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s1: Gặp cú pháp thuộc tính sai. Đang tiếp tục…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s: Gặp cú pháp thuộc tính sai"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -1091,13 +1107,13 @@ msgstr ""
 " *** tùy chọn dịch gốc bị đè ở đây vì đường dẫn cha mẹ path='%s' là chưa "
 "được dịch,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr ""
 "%s: cài đặt foldattributes bị bỏ qua vì '%s' không phải là thể chung dòng"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1107,7 +1123,7 @@ msgid ""
 "Please fix your translation."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
@@ -1116,10 +1132,10 @@ msgstr ""
 "Tùy chọn “%s” đã lạc hậu. Hãy sử dụng phân loại dịch/chưa dịch (translated/"
 "untranslated) và/hay ngắt/trực tiếp/giữ chỗ (break/inline/placeholder)."
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "Thẻ “%s” nằm trong cả hai phân loại %s và %s."
diff --git a/po/bin/zh_Hans.po b/po/bin/zh_Hans.po
index 25325e3..05c5502 100644
--- a/po/bin/zh_Hans.po
+++ b/po/bin/zh_Hans.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2024-01-31 14:01+0000\n"
 "Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -23,7 +23,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -40,7 +40,7 @@ msgstr "兼容性设置无效：'%s'。它必须是 '%s' 或 '%s'。"
 msgid "Unable to parse macro definition: %s"
 msgstr "无法解析宏定义：%s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -298,22 +298,22 @@ msgid ""
 "input: %s"
 msgstr "遇到转义序列 \\c。这还没有完全解决。"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "字体修饰符中的 '<' 和 '>' 不平衡。错误消息：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "未知的 '<' 或 '>' 序列。错误消息：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "无法解析的行：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -322,17 +322,17 @@ msgstr ""
 "未知宏 '%s'。将其从文档中删除，或参考 Locale::Po4a::Man 手册页了解 po4a 如何"
 "处理新宏。"
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "无法解析命令参数：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "不支持的字体：'%s'。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -346,7 +346,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -360,7 +360,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -370,11 +370,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ".ie宏必须后跟.el宏。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -384,21 +384,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr "此页面包含另一个带有'%s'的文件。 不要忘记翻译此文件（'%s'）。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr "此页面使用'%s'请求和参数中的行数。 目前尚不支持此功能。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -435,22 +435,22 @@ msgstr ""
 "无效的 po 文件 %s：\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "无法读取 %s：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "读取后无法关闭 %s：%s"
@@ -464,68 +464,68 @@ msgstr "不支持 2 个以上复数形式的消息。"
 msgid "Parse error at: -->%s<--"
 msgstr "分析错误位于：-->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "无法写入没有文件名的文件"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "无法写入 %s：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "无法写入具有两个以上复数形式的 PO 文件。"
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Cannot close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "写入后无法关闭 %s：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "无法取消链接 %s：%s。"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "无法将 %s 移动到 %s：%s。"
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "评估提供的筛选器失败：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr "'%s' 是消息的单数形式，po4a 将使用 msgstr[0] 转换 (%s)。"
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr "'%s' 是消息的复数形式，po4a 将使用 msgstr[1] 转换 (%s)。"
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid 定义了两次：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -544,7 +544,7 @@ msgstr ""
 "%s\n"
 "旧翻译已丢弃。"
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -676,26 +676,26 @@ msgstr ""
 "要查看错误消息，请使用此附加参数重新运行 po4a：\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "不平衡的 %s 在 '%s' 中"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "检查 '%s' 命令的参数数目时出错：%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "未知命令: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "没有文件名就无法从文件读取"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -703,56 +703,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "找不到 %s 的 kpsewhich"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "无法对未知命令 '%s' 使用别名"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr "您正在使用旧的定义格式（%s）。请更新此定义行。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "未知环境: %s"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "环境 '%s' 的结尾不匹配"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "%s 命令的参数数目错误。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "提供了可选参数，但应为强制参数。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "命令 '%s'：%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command：不支持的格式：'%s'。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "\\begin 的第一个参数是必需的。"
 
@@ -800,55 +800,63 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "写入后无法关闭 %s：%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "无法从 %s 读取 po4a 头。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "%s 的第一行看起来不像 po4a 头。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "%s 的 po4a 头中的语法错误，靠近 \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Po4a 头中的参数无效 %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "%s 的 po4a 头未定义模式。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -856,54 +864,54 @@ msgid ""
 msgstr ""
 "%s 的 po4a 头中的模式无效：应为 'before'、'after' 或 'eof'。相反，它是 %s。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "%s 的 po4a 头未定义位置。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Po4a 头中没有给出结束边界，但 mode=after。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "当 mode=eof 时不需要位置。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "当 mode=eof 时，不需要结束边界。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "如果未指定文件名，则无法应用附录"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "附录 %s 不存在。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "附录 %s 没有候选人职位。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "为附录 %s 找到多个候选人职位。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "在此行之前的应用附录 '%s'：%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "在此行之后的应用附录 '%s'：%s。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "在文件末尾的应用附录 '%s'。"
@@ -946,7 +954,15 @@ msgstr ">>> 文件名 = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "内部错误：未知的类型标识符 '%s'。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -955,19 +971,19 @@ msgstr ""
 "文档类型错误。需要 '%s'。您可以使用 -o doctype 选项修复此警告，或使用 -o "
 "doctype=\"\" 忽略此检查。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr "找到意外的结束标记 </%s>。主文档可能有误。继续…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "找到意外的结束标记 </%s>。主文档可能有误。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -976,17 +992,17 @@ msgstr ""
 "%s：模块选项 'Attributes' 中没有定义属性 '%s'，并且。\n"
 "...  没有为属性路径 '%s' 转换"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s： 属性语法错误。继续…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s： 错误的属性语法"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -996,12 +1012,12 @@ msgstr ""
 "%s： 转换选项='%s'。\n"
 "*** 原始转换选项在此处被重写，因为父路径='%s' 是未转换的,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr "%s：忽略文件夹属性设置，因为 '%s' 不是行内标记"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1015,17 +1031,17 @@ msgstr ""
 "\n"
 "请修改您的翻译。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr "不推荐使用 '%s' 选项。请使用已翻译/未翻译和/或中断/内联/占位符类别。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "标记 '%s'（在 %s 和 %s 类别中）。"
diff --git a/po/bin/zh_Hant.po b/po/bin/zh_Hant.po
index 77f94f4..19f4f10 100644
--- a/po/bin/zh_Hant.po
+++ b/po/bin/zh_Hant.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po4a 0.63\n"
 "Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2024-05-12 17:23+0200\n"
+"POT-Creation-Date: 2024-06-13 00:50+0200\n"
 "PO-Revision-Date: 2022-03-25 13:09+0000\n"
 "Last-Translator: taotieren <admin@taotieren.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../../lib/Locale/Po4a/AsciiDoc.pm:232 ../../lib/Locale/Po4a/Man.pm:496
 #: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/RubyDoc.pm:76
-#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1653
+#: ../../lib/Locale/Po4a/Sgml.pm:266 ../../lib/Locale/Po4a/TeX.pm:1659
 #: ../../lib/Locale/Po4a/Text.pm:242 ../../lib/Locale/Po4a/Xml.pm:606
 #: ../../lib/Locale/Po4a/Yaml.pm:107
 #, perl-format
@@ -38,7 +38,7 @@ msgstr "相容性設定無效：'%s'。它必須是 '%s' 或 '%s'。"
 msgid "Unable to parse macro definition: %s"
 msgstr "無法解析宏定義：%s"
 
-#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1054
+#: ../../lib/Locale/Po4a/AsciiDoc.pm:355 ../../lib/Locale/Po4a/TeX.pm:1060
 #: ../../po4a:1062 ../../po4a:1155 ../../po4a:1419 ../../po4a-translate:297
 #, perl-format
 msgid "Cannot open %s: %s"
@@ -296,22 +296,22 @@ msgid ""
 "input: %s"
 msgstr "遇到轉義序列 \\c。這還沒有完全解決。"
 
-#: ../../lib/Locale/Po4a/Man.pm:1215
+#: ../../lib/Locale/Po4a/Man.pm:1216
 #, perl-format
 msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
 msgstr "字型修飾符中的 '<' 和 '>' 不平衡。錯誤訊息：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1256
+#: ../../lib/Locale/Po4a/Man.pm:1257
 #, perl-format
 msgid "Unknown '<' or '>' sequence. Faulty message: %s"
 msgstr "未知的 '<' 或 '>' 序列。錯誤訊息：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1410
+#: ../../lib/Locale/Po4a/Man.pm:1411
 #, perl-format
 msgid "Unparsable line: %s"
 msgstr "無法解析的行：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1493
+#: ../../lib/Locale/Po4a/Man.pm:1494
 #, perl-format
 msgid ""
 "Unknown macro '%s'. Remove it from the document, or refer to the Locale::"
@@ -320,17 +320,17 @@ msgstr ""
 "未知宏 '%s'。將其從文件中刪除，或參考 Locale::Po4a::Man 手冊頁瞭解 po4a 如何"
 "處理新宏。"
 
-#: ../../lib/Locale/Po4a/Man.pm:1701
+#: ../../lib/Locale/Po4a/Man.pm:1702
 #, perl-format
 msgid "Cannot parse command arguments: %s"
 msgstr "無法解析命令引數：%s"
 
-#: ../../lib/Locale/Po4a/Man.pm:1831
+#: ../../lib/Locale/Po4a/Man.pm:1832
 #, perl-format
 msgid "Unsupported font in: '%s'."
 msgstr "不支援的字型：'%s'。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2253
+#: ../../lib/Locale/Po4a/Man.pm:2254
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s' (inline comment: %s), but you "
@@ -344,7 +344,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2276
+#: ../../lib/Locale/Po4a/Man.pm:2277
 #, perl-format
 msgid ""
 "This page defines a new macro '%s' with '%s', but you did not specify the "
@@ -358,7 +358,7 @@ msgid ""
 "parameters.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2321
+#: ../../lib/Locale/Po4a/Man.pm:2322
 #, perl-format
 msgid ""
 "This page defines a new macro with '%s'. Since po4a is not a real groff "
@@ -368,11 +368,11 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2389
+#: ../../lib/Locale/Po4a/Man.pm:2390
 msgid "The .ie macro must be followed by a .el macro."
 msgstr ".ie宏必須後跟.el宏。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2417
+#: ../../lib/Locale/Po4a/Man.pm:2418
 #, perl-format
 msgid ""
 "This page uses conditionals with '%s'. Since po4a is not a real groff "
@@ -382,21 +382,21 @@ msgid ""
 "translators."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Man.pm:2477
+#: ../../lib/Locale/Po4a/Man.pm:2478
 #, perl-format
 msgid ""
 "This page includes another file with '%s'. Do not forget to translate this "
 "file ('%s')."
 msgstr "此頁面包含另一個帶有'%s'的檔案。 不要忘記翻譯此檔案（'%s'）。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2645
+#: ../../lib/Locale/Po4a/Man.pm:2646
 #, perl-format
 msgid ""
 "This page uses the '%s' request with the number of lines in argument. This "
 "is not supported yet."
 msgstr "此頁面使用'%s'請求和引數中的行數。 目前尚不支援此功能。"
 
-#: ../../lib/Locale/Po4a/Man.pm:2665
+#: ../../lib/Locale/Po4a/Man.pm:2666
 #, perl-format
 msgid ""
 "This page uses the '%s' request. This request is only supported when no "
@@ -433,22 +433,22 @@ msgstr ""
 "無效的 po 檔案 %s：\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:957
-#: ../../lib/Locale/Po4a/TransTractor.pm:455
-#: ../../lib/Locale/Po4a/TransTractor.pm:638 ../../lib/Locale/Po4a/Xhtml.pm:139
+#: ../../lib/Locale/Po4a/Po.pm:348 ../../lib/Locale/Po4a/TeX.pm:963
+#: ../../lib/Locale/Po4a/TransTractor.pm:458
+#: ../../lib/Locale/Po4a/TransTractor.pm:659 ../../lib/Locale/Po4a/Xhtml.pm:139
 #, perl-format
 msgid "Cannot read from %s: %s"
 msgstr "無法讀取 %s：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:486
+#: ../../lib/Locale/Po4a/Po.pm:376 ../../lib/Locale/Po4a/TransTractor.pm:495
 #, perl-format
 msgid ""
 "The file %s starts with a BOM char indicating that its encoding is UTF-8, "
 "but you specified %s instead."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1020
-#: ../../lib/Locale/Po4a/TransTractor.pm:494 ../../lib/Locale/Po4a/Xhtml.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:386 ../../lib/Locale/Po4a/TeX.pm:1026
+#: ../../lib/Locale/Po4a/TransTractor.pm:503 ../../lib/Locale/Po4a/Xhtml.pm:146
 #, perl-format
 msgid "Cannot close %s after reading: %s"
 msgstr "讀取後無法關閉 %s：%s"
@@ -462,68 +462,68 @@ msgstr "不支援 2 個以上覆數形式的訊息。"
 msgid "Parse error at: -->%s<--"
 msgstr "分析錯誤位於：-->%s<--"
 
-#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:661
+#: ../../lib/Locale/Po4a/Po.pm:524 ../../lib/Locale/Po4a/Po.pm:664
 msgid "Cannot write to a file without filename"
 msgstr "無法寫入沒有檔名的檔案"
 
-#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:528
+#: ../../lib/Locale/Po4a/Po.pm:541 ../../lib/Locale/Po4a/TransTractor.pm:537
 #, perl-format
 msgid "Cannot write to %s: %s"
 msgstr "無法寫入 %s：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:558
 #, perl-format
 msgid ""
 "msgmerge suffers some bugs when PO files are not encoded in UTF-8; Recoding "
 "%s to UTF-8 (was %s) to circumvent the issue.\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/Po.pm:609
+#: ../../lib/Locale/Po4a/Po.pm:612
 msgid "Cannot write PO files with more than two plural forms."
 msgstr "無法寫入具有兩個以上覆數形式的 PO 檔案。"
 
-#: ../../lib/Locale/Po4a/Po.pm:622
+#: ../../lib/Locale/Po4a/Po.pm:625
 #, fuzzy, perl-format
 #| msgid "Cannot close %s after writing: %s"
 msgid "Cannot close %s after writing: %s\n"
 msgstr "寫入後無法關閉 %s：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:643
+#: ../../lib/Locale/Po4a/Po.pm:646
 #, perl-format
 msgid "Cannot unlink %s: %s."
 msgstr "無法取消連結 %s：%s。"
 
-#: ../../lib/Locale/Po4a/Po.pm:650 ../../lib/Locale/Po4a/Po.pm:654
+#: ../../lib/Locale/Po4a/Po.pm:653 ../../lib/Locale/Po4a/Po.pm:657
 #: ../../po4a:1917
 #, perl-format
 msgid "Cannot move %s to %s: %s."
 msgstr "無法將 %s 移動到 %s：%s。"
 
-#: ../../lib/Locale/Po4a/Po.pm:876
+#: ../../lib/Locale/Po4a/Po.pm:879
 #, perl-format
 msgid "Evaluating the provided filter failed: %s"
 msgstr "評估提供的篩選器失敗：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:983
+#: ../../lib/Locale/Po4a/Po.pm:986
 #, perl-format
 msgid ""
 "'%s' is the singular form of a message, po4a will use the msgstr[0] "
 "translation (%s)."
 msgstr "'%s' 是訊息的單數形式，po4a 將使用 msgstr[0] 轉換 (%s)。"
 
-#: ../../lib/Locale/Po4a/Po.pm:993
+#: ../../lib/Locale/Po4a/Po.pm:996
 #, perl-format
 msgid ""
 "'%s' is the plural form of a message, po4a will use the msgstr[1] "
 "translation (%s)."
 msgstr "'%s' 是訊息的複數形式，po4a 將使用 msgstr[1] 轉換 (%s)。"
 
-#: ../../lib/Locale/Po4a/Po.pm:1207
+#: ../../lib/Locale/Po4a/Po.pm:1210
 #, perl-format
 msgid "msgid defined twice: %s"
 msgstr "msgid 定義了兩次：%s"
 
-#: ../../lib/Locale/Po4a/Po.pm:1244
+#: ../../lib/Locale/Po4a/Po.pm:1247
 #, perl-format
 msgid ""
 "Translations don't match for:\n"
@@ -542,7 +542,7 @@ msgstr ""
 "%s\n"
 "舊翻譯已丟棄。"
 
-#: ../../lib/Locale/Po4a/Pod.pm:91 ../../lib/Locale/Po4a/Xml.pm:906
+#: ../../lib/Locale/Po4a/Pod.pm:100 ../../lib/Locale/Po4a/Xml.pm:921
 #, perl-format
 msgid ""
 "The file %s declares %s as encoding, but you provided %s as master charset. "
@@ -674,26 +674,26 @@ msgstr ""
 "要檢視錯誤訊息，請使用此附加引數重新執行 po4a：\n"
 "   -o debug=onsgmls"
 
-#: ../../lib/Locale/Po4a/TeX.pm:513 ../../lib/Locale/Po4a/TeX.pm:597
+#: ../../lib/Locale/Po4a/TeX.pm:519 ../../lib/Locale/Po4a/TeX.pm:603
 #, perl-format
 msgid "un-balanced %s in '%s'"
 msgstr "不平衡的 %s 在 '%s' 中"
 
-#: ../../lib/Locale/Po4a/TeX.pm:528 ../../lib/Locale/Po4a/TeX.pm:616
+#: ../../lib/Locale/Po4a/TeX.pm:534 ../../lib/Locale/Po4a/TeX.pm:622
 #, perl-format
 msgid "Error while checking the number of arguments of the '%s' command: %s"
 msgstr "檢查 '%s' 命令的引數數目時出錯：%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:802 ../../lib/Locale/Po4a/TeX.pm:904
+#: ../../lib/Locale/Po4a/TeX.pm:808 ../../lib/Locale/Po4a/TeX.pm:910
 #, perl-format
 msgid "Unknown command: '%s'"
 msgstr "未知命令: %s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:950
+#: ../../lib/Locale/Po4a/TeX.pm:956
 msgid "Cannot read from file without having a filename"
 msgstr "沒有檔名就無法從檔案讀取"
 
-#: ../../lib/Locale/Po4a/TeX.pm:999
+#: ../../lib/Locale/Po4a/TeX.pm:1005
 #, perl-format
 msgid ""
 "Cannot find '%s' with kpsewhich. To prevent this file to be included, add '-"
@@ -701,56 +701,56 @@ msgid ""
 "po4a.conf file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TeX.pm:1045
+#: ../../lib/Locale/Po4a/TeX.pm:1051
 #, perl-format
 msgid "kpsewhich cannot find %s"
 msgstr "找不到 %s 的 kpsewhich"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1091
+#: ../../lib/Locale/Po4a/TeX.pm:1097
 #, perl-format
 msgid "Cannot use an alias to the unknown command '%s'"
 msgstr "無法對未知命令 '%s' 使用別名"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1098
+#: ../../lib/Locale/Po4a/TeX.pm:1104
 #, perl-format
 msgid ""
 "You are using the old definitions format (%s).  Please update this "
 "definition line."
 msgstr "您正在使用舊的定義格式（%s）。請更新此定義行。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1307 ../../lib/Locale/Po4a/TeX.pm:1560
+#: ../../lib/Locale/Po4a/TeX.pm:1313 ../../lib/Locale/Po4a/TeX.pm:1566
 #, perl-format
 msgid "unknown environment: '%s'"
 msgstr "未知環境: %s"
 
 #. a begin may have been hidden in the middle of a translated
 #. buffer. FIXME: Just warn for now.
-#: ../../lib/Locale/Po4a/TeX.pm:1330
+#: ../../lib/Locale/Po4a/TeX.pm:1336
 #, perl-format
 msgid "unmatched end of environment '%s'"
 msgstr "環境 '%s' 的結尾不匹配"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1380 ../../lib/Locale/Po4a/TeX.pm:1489
+#: ../../lib/Locale/Po4a/TeX.pm:1386 ../../lib/Locale/Po4a/TeX.pm:1495
 #, perl-format
 msgid "Wrong number of arguments for the '%s' command."
 msgstr "%s 命令的引數數目錯誤。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1392 ../../lib/Locale/Po4a/TeX.pm:1501
-#: ../../lib/Locale/Po4a/TeX.pm:1587
+#: ../../lib/Locale/Po4a/TeX.pm:1398 ../../lib/Locale/Po4a/TeX.pm:1507
+#: ../../lib/Locale/Po4a/TeX.pm:1593
 msgid "An optional argument was provided, but a mandatory one is expected."
 msgstr "提供了可選引數，但應為強制引數。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1393 ../../lib/Locale/Po4a/TeX.pm:1502
+#: ../../lib/Locale/Po4a/TeX.pm:1399 ../../lib/Locale/Po4a/TeX.pm:1508
 #, perl-format
 msgid "Command '%s': %s"
 msgstr "命令 '%s'：%s"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1449
+#: ../../lib/Locale/Po4a/TeX.pm:1455
 #, perl-format
 msgid "register_generic_command: unsupported format: '%s'."
 msgstr "register_generic_command：不支援的格式：'%s'。"
 
-#: ../../lib/Locale/Po4a/TeX.pm:1555
+#: ../../lib/Locale/Po4a/TeX.pm:1561
 msgid "The first argument of \\begin is mandatory."
 msgstr "\\begin 的第一個引數是必需的。"
 
@@ -798,55 +798,63 @@ msgid ""
 "of the file."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:477
-#: ../../lib/Locale/Po4a/TransTractor.pm:651
-#: ../../lib/Locale/Po4a/TransTractor.pm:723
+#: ../../lib/Locale/Po4a/TransTractor.pm:483
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 #, perl-format
-msgid "Malformed encoding while reading from file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while reading from file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --master-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:548
+#: ../../lib/Locale/Po4a/TransTractor.pm:559
 #, perl-format
 msgid ""
-"Malformed encoding while writing char '%s' to file %s with charset %s: %s"
+"Malformed encoding while writing char '%s' to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:569
 #, perl-format
-msgid "Malformed encoding while writing to file %s with charset %s: %s"
+msgid ""
+"Malformed encoding while writing to file %s with charset %s: %s\n"
+"If %s is not the expected charset, you need to configure the right one with "
+"with --localized-charset or other similar flags."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
+#: ../../lib/Locale/Po4a/TransTractor.pm:578
 #, perl-format
 msgid "Cannot close %s after writing: %s"
 msgstr "寫入後無法關閉 %s：%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
+#: ../../lib/Locale/Po4a/TransTractor.pm:666
 #, perl-format
 msgid "Cannot read po4a header from %s."
 msgstr "無法從 %s 讀取 po4a 頭。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:683
 #, perl-format
 msgid "First line of %s does not look like a po4a header."
 msgstr "%s 的第一行看起來不像 po4a 頭。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:661
+#: ../../lib/Locale/Po4a/TransTractor.pm:688
 #, perl-format
 msgid "Syntax error in po4a header of %s, near \"%s\""
 msgstr "%s 的 po4a 頭中的語法錯誤，靠近 \"%s\""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:677
+#: ../../lib/Locale/Po4a/TransTractor.pm:704
 #, perl-format
 msgid "Invalid argument in the po4a header of %s: %s"
 msgstr "Po4a 頭中的引數無效 %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:683
+#: ../../lib/Locale/Po4a/TransTractor.pm:710
 #, perl-format
 msgid "The po4a header of %s does not define the mode."
 msgstr "%s 的 po4a 頭未定義模式。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:690
+#: ../../lib/Locale/Po4a/TransTractor.pm:717
 #, perl-format
 msgid ""
 "Mode invalid in the po4a header of %s: should be 'before', 'after' or 'eof'. "
@@ -854,54 +862,54 @@ msgid ""
 msgstr ""
 "%s 的 po4a 頭中的模式無效：應為 'before'、'after' 或 'eof'。相反，它是 %s。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:699
+#: ../../lib/Locale/Po4a/TransTractor.pm:726
 #, perl-format
 msgid "The po4a header of %s does not define the position."
 msgstr "%s 的 po4a 頭未定義位置。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:703
+#: ../../lib/Locale/Po4a/TransTractor.pm:730
 msgid "No ending boundary given in the po4a header, but mode=after."
 msgstr "Po4a 頭中沒有給出結束邊界，但 mode=after。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:707
+#: ../../lib/Locale/Po4a/TransTractor.pm:734
 msgid "No position needed when mode=eof."
 msgstr "當 mode=eof 時不需要位置。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:711
+#: ../../lib/Locale/Po4a/TransTractor.pm:738
 msgid "No ending boundary needed when mode=eof."
 msgstr "當 mode=eof 時，不需要結束邊界。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:745
+#: ../../lib/Locale/Po4a/TransTractor.pm:778
 msgid "Cannot apply addendum when not given the filename"
 msgstr "如果未指定檔名，則無法應用附錄"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 #, perl-format
 msgid "Addendum %s does not exist."
 msgstr "附錄 %s 不存在。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:817
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "附錄 %s 沒有候選人職位。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
+#: ../../lib/Locale/Po4a/TransTractor.pm:821
 #, perl-format
 msgid "More than one candidate position found for the addendum %s."
 msgstr "為附錄 %s 找到多個候選人職位。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:799
-#: ../../lib/Locale/Po4a/TransTractor.pm:821
+#: ../../lib/Locale/Po4a/TransTractor.pm:832
+#: ../../lib/Locale/Po4a/TransTractor.pm:854
 #, perl-format
 msgid "Addendum '%s' applied before this line: %s"
 msgstr "在此行之前的應用附錄 '%s'：%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:827
+#: ../../lib/Locale/Po4a/TransTractor.pm:860
 #, perl-format
 msgid "Addendum '%s' applied after the line: %s."
 msgstr "在此行之後的應用附錄 '%s'：%s。"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:834
+#: ../../lib/Locale/Po4a/TransTractor.pm:867
 #, perl-format
 msgid "Addendum '%s' applied at the end of the file."
 msgstr "在檔案末尾的應用附錄 '%s'。"
@@ -944,7 +952,15 @@ msgstr ">>> 檔名 = '%s'"
 msgid "Internal error: unknown type identifier '%s'."
 msgstr "內部錯誤：未知的型別識別符號 '%s'。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:965
+#: ../../lib/Locale/Po4a/Xml.pm:910
+#, perl-format
+msgid ""
+"The file %s declares %s as encoding, but you provided %s as master charset. "
+"Please change either setting because they really are different encoding in "
+"Perl. See https://perldoc.perl.org/Encode#UTF-8-vs.-utf8-vs.-UTF8"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:982
 #, perl-format
 msgid ""
 "Bad document type. '%s' expected. You can fix this warning with a -o doctype "
@@ -953,19 +969,19 @@ msgstr ""
 "文件型別錯誤。需要 '%s'。您可以使用 -o doctype 選項修復此警告，或使用 -o "
 "doctype=\"\" 忽略此檢查。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1061 ../../lib/Locale/Po4a/Xml.pm:1911
+#: ../../lib/Locale/Po4a/Xml.pm:1078 ../../lib/Locale/Po4a/Xml.pm:1928
 #, perl-format
 msgid ""
 "Unexpected closing tag </%s> found. The main document may be wrong.  "
 "Continuing…"
 msgstr "找到意外的結束標記 </%s>。主文件可能有誤。繼續…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1066 ../../lib/Locale/Po4a/Xml.pm:1916
+#: ../../lib/Locale/Po4a/Xml.pm:1083 ../../lib/Locale/Po4a/Xml.pm:1933
 #, perl-format
 msgid "Unexpected closing tag </%s> found. The main document may be wrong."
 msgstr "找到意外的結束標記 </%s>。主文件可能有誤。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1447
+#: ../../lib/Locale/Po4a/Xml.pm:1464
 #, perl-format
 msgid ""
 "%s: attribute '%s' is not defined in module option 'attributes' and\n"
@@ -974,17 +990,17 @@ msgstr ""
 "%s：模組選項 'Attributes' 中沒有定義屬性 '%s'，並且。\n"
 "...  沒有為屬性路徑 '%s' 轉換"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1466
+#: ../../lib/Locale/Po4a/Xml.pm:1483
 #, perl-format
 msgid "%s: Bad attribute syntax.  Continuing…"
 msgstr "%s： 屬性語法錯誤。繼續…"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1468
+#: ../../lib/Locale/Po4a/Xml.pm:1485
 #, perl-format
 msgid "%s: Bad attribute syntax"
 msgstr "%s： 錯誤的屬性語法"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1591
+#: ../../lib/Locale/Po4a/Xml.pm:1608
 #, perl-format
 msgid ""
 "%s: translation option='%s'.\n"
@@ -994,12 +1010,12 @@ msgstr ""
 "%s： 轉換選項='%s'。\n"
 "*** 原始轉換選項在此處被重寫，因為父路徑='%s' 是未轉換的,"
 
-#: ../../lib/Locale/Po4a/Xml.pm:1605
+#: ../../lib/Locale/Po4a/Xml.pm:1622
 #, perl-format
 msgid "%s: foldattributes setting ignored since '%s' is not inline tag"
 msgstr "%s：忽略資料夾屬性設定，因為 '%s' 不是行內標記"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2063
+#: ../../lib/Locale/Po4a/Xml.pm:2080
 #, perl-format
 msgid ""
 "Invalid placeholder in the translation (the 'type' and 'id' must be present, "
@@ -1013,17 +1029,17 @@ msgstr ""
 "\n"
 "請修改您的翻譯。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2150 ../../lib/Locale/Po4a/Xml.pm:2165
+#: ../../lib/Locale/Po4a/Xml.pm:2167 ../../lib/Locale/Po4a/Xml.pm:2182
 #, perl-format
 msgid ""
 "The '%s' option is deprecated. Please use the translated/untranslated and/or "
 "break/inline/placeholder categories."
 msgstr "不推薦使用 '%s' 選項。請使用已翻譯/未翻譯和/或中斷/內聯/佔位符類別。"
 
-#: ../../lib/Locale/Po4a/Xml.pm:2328 ../../lib/Locale/Po4a/Xml.pm:2335
-#: ../../lib/Locale/Po4a/Xml.pm:2338 ../../lib/Locale/Po4a/Xml.pm:2341
-#: ../../lib/Locale/Po4a/Xml.pm:2346 ../../lib/Locale/Po4a/Xml.pm:2349
-#: ../../lib/Locale/Po4a/Xml.pm:2354
+#: ../../lib/Locale/Po4a/Xml.pm:2345 ../../lib/Locale/Po4a/Xml.pm:2352
+#: ../../lib/Locale/Po4a/Xml.pm:2355 ../../lib/Locale/Po4a/Xml.pm:2358
+#: ../../lib/Locale/Po4a/Xml.pm:2363 ../../lib/Locale/Po4a/Xml.pm:2366
+#: ../../lib/Locale/Po4a/Xml.pm:2371
 #, perl-format
 msgid "Tag '%s' both in the %s and %s categories."
 msgstr "標記 '%s'（在 %s 和 %s 類別中）。"