Merging upstream version 0.73.

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

1 files changed, 109 insertions, 93 deletions

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."