Regenerate PO files.
diff --git a/po/af.po b/po/af.po
index 7343e92..ee4d04b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2004-03-08 13:42+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -133,31 +133,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geskryf deur %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -165,7 +170,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -174,14 +179,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -189,14 +194,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -206,7 +211,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -217,42 +222,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 #| msgid "iconv: %s: cannot convert\n"
 msgid "%s:%u:%u: cannot convert"
@@ -262,7 +267,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 #| msgid "iconv: %s: incomplete character or shift sequence\n"
 msgid "%s:%u:%u: incomplete character or shift sequence"
@@ -271,14 +276,14 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 #| msgid "iconv: %s: I/O error\n"
 msgid "%s: I/O error"
@@ -286,7 +291,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s unsupported\n"
 msgid "conversion from %s unsupported"
@@ -294,7 +299,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 #| msgid "iconv: conversion to %s unsupported\n"
 msgid "conversion to %s unsupported"
@@ -302,7 +307,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s to %s unsupported\n"
 msgid "conversion from %s to %s unsupported"
@@ -310,26 +315,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 #| msgid "iconv: I/O error\n"
 msgid "I/O error"
diff --git a/po/bg.po b/po/bg.po
index 8c79b29..0e246ff 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-12 23:42+0200\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -148,24 +148,27 @@
 "  --version                   извеждане на сведение за версията и изход от\n"
 "                              програмата\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Подавайте доклади за грешки в програмата на <bug-gnu-libiconv@gnu.org>.\n"
-"Подавайте доклади за грешки в превода на <dict@ludost.net>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -174,14 +177,14 @@
 "вате.  Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автори: %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -190,7 +193,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -200,14 +203,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s аргумент: не е позволена директива за форматиране с размер."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s аргумент: низът завършва по средата на директивата."
@@ -215,14 +218,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s аргумент: знакът '%c' не е правилен определител за преобразуване."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -234,7 +237,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -248,14 +251,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "заместителят за байт към Уникод не може да се преобразува: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -264,7 +267,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
@@ -272,7 +275,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -281,7 +284,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -289,7 +292,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: не може да се преобразува"
@@ -298,7 +301,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: непълен знак или изместваща последователност"
@@ -306,61 +309,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: входно/изходна грешка"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "не се поддържа преобразуване от %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "не се поддържа преобразуване към %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "не се поддържа преобразуване от %s към %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "опитайте с '%s -l', за да получите списък с поддържаните кодирания"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(стандартен вход)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "входно/изходна грешка"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Подавайте доклади за грешки в програмата на <bug-gnu-libiconv@gnu.org>.\n"
+#~ "Подавайте доклади за грешки в превода на <dict@ludost.net>.\n"
diff --git a/po/ca.po b/po/ca.po
index a2b5927..7bdf40f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2004-03-20 16:18+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -133,31 +133,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -165,7 +170,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -174,14 +179,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -189,14 +194,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -206,7 +211,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -217,42 +222,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 #| msgid "iconv: %s: cannot convert\n"
 msgid "%s:%u:%u: cannot convert"
@@ -262,7 +267,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 #| msgid "iconv: %s: incomplete character or shift sequence\n"
 msgid "%s:%u:%u: incomplete character or shift sequence"
@@ -271,14 +276,14 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 #| msgid "iconv: %s: I/O error\n"
 msgid "%s: I/O error"
@@ -286,7 +291,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s unsupported\n"
 msgid "conversion from %s unsupported"
@@ -294,7 +299,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 #| msgid "iconv: conversion to %s unsupported\n"
 msgid "conversion to %s unsupported"
@@ -302,7 +307,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s to %s unsupported\n"
 msgid "conversion from %s to %s unsupported"
@@ -310,26 +315,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(entrada estàndard)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 #| msgid "iconv: I/O error\n"
 msgid "I/O error"
diff --git a/po/cs.po b/po/cs.po
index 308548b..360deda 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2018-11-01 21:16+01:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -146,25 +146,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   zobrazí informace o verzi a skončí\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Chyby hlaste na <bug-gnu-libiconv@gnu.org> (anglicky).\n"
-"Chyby v překladu hlaste na <translation-team-cs@lists.sourceforge.net> "
-"(česky).\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -173,14 +175,14 @@
 "Není poskytována ŽÁDNÁ ZÁRUKA, jak jen zákon dovoluje.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -188,7 +190,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -198,14 +200,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "Argument %s: Direktiva formátu s velikostí zde není povolena."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Argument %s: Řetězec končí uprostřed direktivy."
@@ -213,14 +215,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "Argument %s: Znak „%c“ není platným vyhrazeným konverzním znakem."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -232,7 +234,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -250,42 +252,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "nahrazení bajtu nelze převést do Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "nahrazení unicodu nelze převést do cílového kódování: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "nahrazení bajtu nelze převést do řetězce širokých znaků: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "nahrazení širokého znaku nelze převést do cílového kódování: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "nahrazení bajtu nelze převést do cílového kódování: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: nelze převést"
@@ -294,7 +296,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: neúplný znak nebo posunovací posloupnost"
@@ -302,66 +304,72 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: chyba I/0"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "převod z %s není podporován"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "převod do %s není podporován"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "převod z %s do %s není podporován"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "seznam podporovaných kódování získáte příkazem „%s -l“"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(standardní vstup)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 # Vzdálená V/V chyba
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Chyba vstupu/výstupu"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Chyby hlaste na <bug-gnu-libiconv@gnu.org> (anglicky).\n"
+#~ "Chyby v překladu hlaste na <translation-team-cs@lists.sourceforge.net> "
+#~ "(česky).\n"
+
 #~ msgid ""
 #~ "  --unicode-subst=formatstring\n"
 #~ "                              substitution for unconvertible Unicode "
diff --git a/po/da.po b/po/da.po
index 58f3ef7..103271d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libiconv-1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-12-17 16:31+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -145,24 +145,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   udskriv versionsinformation og afslut\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Meddel fejl til <bug-gnu-libiconv@gnu.org>.\n"
-"Send synspunkter på oversættelsen til <dansk@dansk-gruppen.dk>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -171,14 +174,14 @@
 "Der gives INGEN GARANTI, så vidt lov tillader.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -187,7 +190,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -197,14 +200,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "Argument %s: Et formatdirektiv med en størrelse tillades ikke her."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Argument %s: Strengen stopper midt i et direktiv."
@@ -212,7 +215,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -220,7 +223,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -232,7 +235,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -245,42 +248,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "kan ikke konvertere byte-erstatning til UCS: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "kan ikke konvertere UCS-erstatning til målkodning: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "kan ikke konvertere byte-erstatning til bred streng: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "kan ikke konvertere bredtegns-erstatning til målkodning: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "kan ikke konvertere byte-erstatning til målkodning: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: kan ikke konvertere"
@@ -289,7 +292,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: ufuldstændigt tegn eller skiftesekvens"
@@ -297,61 +300,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Ind/ud-fejl"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konvertering fra %s understøttes ikke"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konvertering til %s understøttes ikke"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konvertering fra %s til %s understøttes ikke"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "prøv \"%s -l\" for at få vist listen af understøttede kodninger"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(standard ind)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Ind/ud-fejl"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Meddel fejl til <bug-gnu-libiconv@gnu.org>.\n"
+#~ "Send synspunkter på oversættelsen til <dansk@dansk-gruppen.dk>.\n"
diff --git a/po/de.po b/po/de.po
index b8e54e4..4f0c618 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-12 16:23+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -155,26 +155,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   Versionsinformation anzeigen und beenden\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Fehler bitte (auf Englisch, mit LC_ALL=C) an <bug-gnu-libiconv@gnu.org>\n"
-"melden.\n"
-"Für die deutsche Übersetzung ist die Mailingliste\n"
-"<translation-team-de@lists.sourceforge.net> zuständig.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -183,14 +184,14 @@
 "Es gibt KEINERLEI GARANTIE, so weit das Gesetz es erlaubt.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -200,7 +201,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -211,7 +212,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -220,7 +221,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "»%s«-Argument: Die Zeichenkette endet mitten in einer Anweisung."
@@ -228,14 +229,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "»%s«-Argument: Das Zeichen »%c« bezeichnet keine gültige Umwandlung."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -247,7 +248,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -262,14 +263,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "Byte-Ersatz kann nicht in Unicode umgewandelt werden: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -277,7 +278,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
@@ -285,7 +286,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -293,14 +294,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "Byte-Ersatz kann nicht in die Zielkodierung umgewandelt werden: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: Umwandeln nicht möglich."
@@ -309,7 +310,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: unvollständiges Zeichen oder unvollständige Umschaltfolge"
@@ -317,42 +318,42 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Ein-/Ausgabefehler"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "Umwandlung ausgehend von %s ist nicht unterstützt."
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "Umwandlung nach %s ist nicht unterstützt."
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "Umwandlung von %s nach %s ist nicht unterstützt."
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
@@ -360,20 +361,27 @@
 "erhalten."
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(Standard-Eingabe)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Ein-/Ausgabefehler"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Fehler bitte (auf Englisch, mit LC_ALL=C) an <bug-gnu-libiconv@gnu.org>\n"
+#~ "melden.\n"
+#~ "Für die deutsche Übersetzung ist die Mailingliste\n"
+#~ "<translation-team-de@lists.sourceforge.net> zuständig.\n"
diff --git a/po/el.po b/po/el.po
index ad39f12..d3e8f9b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2004-12-25 22:15+0200\n"
 "Last-Translator: Balaskas Euaggelos <ebalaskas@ebalaskas.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -132,31 +132,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Γράφτηκε από τον %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +169,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +178,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +193,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +210,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -216,42 +221,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 #| msgid "iconv: %s: cannot convert\n"
 msgid "%s:%u:%u: cannot convert"
@@ -261,7 +266,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 #| msgid "iconv: %s: incomplete character or shift sequence\n"
 msgid "%s:%u:%u: incomplete character or shift sequence"
@@ -270,14 +275,14 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 #| msgid "iconv: %s: I/O error\n"
 msgid "%s: I/O error"
@@ -285,7 +290,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s unsupported\n"
 msgid "conversion from %s unsupported"
@@ -293,7 +298,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 #| msgid "iconv: conversion to %s unsupported\n"
 msgid "conversion to %s unsupported"
@@ -301,7 +306,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s to %s unsupported\n"
 msgid "conversion from %s to %s unsupported"
@@ -309,26 +314,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 #| msgid "iconv: I/O error\n"
 msgid "I/O error"
diff --git a/po/eo.po b/po/eo.po
index 168ecaa..eecabd5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-01-27 23:17-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -143,22 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  -version                    eligi informon pri la versio kaj eliri\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Raportu cimojn al <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -167,14 +172,14 @@
 "Estas NENIA GARANTIO, laŭ la grado leĝe permesata.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Verkita de %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -183,7 +188,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,14 +198,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s argumento: formodirektivo kun grando ne estas permesata ĉi tie."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argumento: la signoĉeno finiĝas meze de direktivo."
@@ -208,14 +213,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s argumento: la signo '%c' ne estas valida konvertospecifo."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -227,7 +232,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -240,42 +245,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ne povas konverti bitoksubstituon al Unikodo: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "ne povas konverti unikodan substituon al celkodo: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "ne povas konverti bitoksubstituon al larĝa signoĉeno: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "ne povas konverti larĝasignan substituon al celkodo: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "ne povas konverti bitoksubstituon al celkodo: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ne povas konverti"
@@ -284,7 +289,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: malkompleta signo aŭ reĝimŝanĝa kodo"
@@ -292,61 +297,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: leg/skrib-eraro"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konvertado de %s ne estas subtenata"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konvertado al %s ne estas subtenata"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konvertado de %s al %s ne estas subtenata"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "provu '%s -l' por ricevi liston de konataj kodoj"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(normala enigo)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "leg/skrib-eraro"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Raportu cimojn al <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/es.po b/po/es.po
index adb1c2c..59ae469 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2014-07-13 11:14+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -142,23 +142,28 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   muestra la versión y sale\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Comunicar errores a <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
 # Esta cadena es para libiconv 1.14
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -167,14 +172,14 @@
 "No hay NINGUNA GARANTÍA, hasta donde permite la ley.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -183,7 +188,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -194,14 +199,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "argumento %s: No se permite un especificador de formato con tamaño."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argumento %s: La cadena termina en mitad de un especificador."
@@ -209,7 +214,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -217,7 +222,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -229,7 +234,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -243,14 +248,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "no se puede convertir la sustitución de bytes a Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -258,14 +263,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "no se puede convertir la sustitución de bytes a cadena ancha: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -274,7 +279,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -283,7 +288,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: no se puede convertir"
@@ -292,7 +297,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: carácter o secuencia de desplazamiento incompleta"
@@ -300,65 +305,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: error de E/S"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "no se admite la conversión de %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "no se admite la conversión a %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "no se admite la conversión de %s a %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "pruebe '%s -l' para obtener la lista de codificaciones admitidas"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(entrada estándar)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "error de E/S"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Comunicar errores a <bug-gnu-libiconv@gnu.org>.\n"
+
 #, no-wrap
 #~ msgid ""
 #~ "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
diff --git a/po/et.po b/po/et.po
index ac92405..b35d7d1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-12 13:23+0200\n"
 "Last-Translator: Toomas Soome <tsoome@me.com>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -141,22 +141,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   väljasta versiooni info ja lõpeta töö\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Vigadest teatage palun aadressil <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -165,14 +170,14 @@
 "GARANTII PUDUB, vastavalt seadusega lubatud piiridele.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjutanud %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -180,7 +185,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -189,14 +194,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s argument: Suuruse määranguga vorming ei ole siin lubatud."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argument: Sõne lõppeb keset direktiivi."
@@ -204,14 +209,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s argument: Sümbol '%c' ei ole lubatud teisenduses."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -222,7 +227,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -235,42 +240,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "baidiasendust ei saa Unikoodi teisendada: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "unikoodi asendust ei saa sihttabelisse teisendada: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "baidiasendust ei saa mitmebaidiliste sümbolitega sõneks teisendada: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "widechar sümboleid ei saa sihttabelisse teisendada: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "baitide asendust ei saa sihttabelisse teisendada: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ei saa teisendada"
@@ -279,7 +284,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: mittetäielik sümbol või nihkejärjend"
@@ -287,61 +292,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: S/V viga"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "teisendust tabelist %s ei toetata"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "teisendust tabelisse %s ei toetata"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "teisendust tabelist %s tabelisse %s ei toetata"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "Toetatud kooditabelite niekirja saate käsuga '%s -l'"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(standardsisend)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "S/V viga"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Vigadest teatage palun aadressil <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/fi.po b/po/fi.po
index d379250..9f7431a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2008-01-02 07:55+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -146,22 +146,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   tulosta versiotiedot ja poistu\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Ilmoita ohjelmistovioista osoitteeseen <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -170,14 +175,14 @@
 "Ohjelmalla EI OLE TAKUUta siinä laajuudessa kuin laki sallii.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjoittanut %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -187,7 +192,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -198,14 +203,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s-argumentti: Muotodirektivii koolla ei ole sallittu tässä."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s-argumentti: Merkkijono loppuu direktiivin keskellä."
@@ -213,14 +218,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s-argumentti: Merkki ”%c” ei ole voimassa oleva muunnosmäärite."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -232,7 +237,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -247,42 +252,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ei voida muuntaa tavukorvausta Unicode-merkiksi: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "ei voida muuntaa Unicode-korvausta kohdekoodaukseksi: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "ei voida muuntaa tavukorvausta wide-merkkijonoksi: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "ei voida muuntaa wide-merkkikorvausta kohdekoodaukseksi: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "ei voida muuntaa tavukorvausta kohdekoodaukseksi: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ei voida muuntaa"
@@ -292,7 +297,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: epätäydellinen merkki tai shift-sekvenssi"
@@ -300,61 +305,65 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Siirräntävirhe"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "muunnos %s-koodauksesta ei ole tuettu"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "muunnos %s-koodaukseen ei tuettu"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "muunnos %s-koodauksesta %s-koodaukseen ei ole tuettu"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "katso luettelo tuetuista koodauksista valitsimella ”%s -l”"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(vakiosyöte)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Siirräntävirhe"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Ilmoita ohjelmistovioista osoitteeseen <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/fr.po b/po/fr.po
index 08d0e83..f0517e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-23 20:58+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -143,22 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   affiche les informations de version et terminer\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Soumettre les rapports d'anomalies à <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -167,14 +172,14 @@
 "Il n'y a PAS DE GARANTIE, selon les limites permises par la loi..\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit pas %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +189,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -195,7 +200,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -204,7 +209,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argument %s: La chaîne se termine au milieu d'une directive."
@@ -212,7 +217,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -221,7 +226,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -233,7 +238,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -246,28 +251,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ne peut convertir les octets de substitution vers Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "ne peut convertir la substitution Unicode dans le codage de sortie: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "ne peut convertir les octets de substitution en chaîne large: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -276,7 +281,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -284,7 +289,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ne peut convertir"
@@ -293,7 +298,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: caractère incomplet ou séquence de décalage"
@@ -301,61 +306,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: erreur E/S"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "conversion à partir de %s non supportée"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "conversion vers %s non supportée"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "conversion à partir de %s vers %s non supportée"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "essayez « %s -l » pour obtenir la liste des codages supportés"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "erreur E/S"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Soumettre les rapports d'anomalies à <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/ga.po b/po/ga.po
index 43af048..ca354cf 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-01-08 14:58-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -142,22 +142,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   taispeáin eolas faoin leagan agus scoir\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Seol tuairiscí fabhtanna chuig <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -166,14 +171,14 @@
 "Níl baránta AR BITH ann, an oiread atá ceadaithe de réir dlí.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Le %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -183,7 +188,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -194,14 +199,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "argóint %s: Ní cheadaítear treoir fhormáidithe le méid anseo."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argóint %s: Deireadh an teaghráin i lár treorach."
@@ -209,14 +214,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "argóint %s: Níl carachtar '%c' bailí mar shonraitheoir tiontaithe."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -228,7 +233,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -252,42 +257,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ní féidir ionadaíocht bhirt a thiontú go Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "ní féidir ionadaíocht unicode a thiontú go dtí an sprioc-ionchódú: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "ní féidir ionadaíocht bhirt a thiontú go teaghrán leathan: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "ní féidir ionadaíocht widechar a thiontú go dtí an sprioc-ionchódú: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "ní féidir ionadaíocht bhirt a thiontú go dtí an sprioc-ionchódú: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ní féidir tiontú"
@@ -296,7 +301,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: carachtar nó seicheamh neamhiomlán"
@@ -304,42 +309,42 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Earráid I/A"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "ní thacaítear le tiontú ó %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "ní thacaítear le tiontú go %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "ní thacaítear le tiontú ó %s go %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
@@ -347,24 +352,27 @@
 "thaispeáint"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Earráid I/A"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Seol tuairiscí fabhtanna chuig <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "This is free software; see the source for copying conditions.  There is "
 #~ "NO\n"
diff --git a/po/gl.po b/po/gl.po
index 866051c..9a91700 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2013-01-05 17:00+0200\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -150,22 +150,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   Mostra a información da versión e sae\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Envíe informes de fallo a <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -174,14 +179,14 @@
 "Non hai NINGUNHA GARANTÍA, ata onde o permita a lei.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -190,7 +195,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -201,7 +206,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -209,7 +214,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Argumento %s: a cadea remata no medio dunha directiva."
@@ -217,7 +222,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -225,7 +230,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -237,7 +242,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -250,14 +255,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "non é posíbel converter a substitución de bytes a Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -265,14 +270,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "non é posíbel converter a substitución de bytes a cadea ampla: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -281,7 +286,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -289,7 +294,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: non foi posíbel converter"
@@ -298,7 +303,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: secuencia de caracteres ou desprazamentos incompleta"
@@ -306,61 +311,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: erro de E/S"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "non se admite a conversión desde %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "non se admite a conversión a %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "non se admite a conversión de %s a %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "execute «%s -l» para obter a lista das codificacións admitidas"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(entrada estándar)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Erro de E/S"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Envíe informes de fallo a <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/hr.po b/po/hr.po
index 74de914..5d5d278 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2012-04-16 16:14+0200\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\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"
+"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: TransDict server\n"
 
 #. TRANSLATORS: The first line of the short usage message.
@@ -145,24 +145,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   ispiši informacije o inačici i izađi\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Prijavite greške na <bug-gnu-libiconv@gnu.org>.\n"
-"Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -171,14 +174,14 @@
 "NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisao %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -187,7 +190,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -197,14 +200,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s argument: Propis oblika s veličinom ovdje nije dozvoljen."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argument: Znakovni niz završava u sredini propisa."
@@ -212,14 +215,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s argument: Znak „%c” nije ispravna oznaka pretvaranja."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -231,7 +234,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -249,42 +252,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ne mogu pretvoriti bajtovnu zamjenu u Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "ne mogu pretvoriti unicode zamjenu u odredišno kodiranje: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "ne mogu pretvoriti bajtovnu zamjenu u široki niz: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "ne mogu pretvoriti širokoznačnu zamjenu u odredišno kodiranje: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "ne mogu pretvoriti bajtovnu zamjenu u odredišno kodiranje: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ne mogu pretvoriti"
@@ -293,7 +296,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: nepotpun znakovni ili pomačni niz"
@@ -301,65 +304,70 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: U/I greška"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "pretvaranje iz %s nije podržano"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "pretvaranje u %s nije podržano"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "pretvaranje iz %s u %s nije podržano"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "pokušajte „%s -l” za prikaz popisa podržanih kodiranja"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "U/I greška"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Prijavite greške na <bug-gnu-libiconv@gnu.org>.\n"
+#~ "Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n"
+
 #~ msgid ""
 #~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 #~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index cb6c67d..ada6d1f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-03-19 00:57+0100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -143,22 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   verzióinformációk kiírása és kilépés\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "A hibákat ezen a címen jelentse: <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -167,14 +172,14 @@
 "Nincs SEMMIFÉLE GARANCIA, a törvény által megengedett mértékben.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Írta %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +189,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -195,7 +200,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -203,7 +208,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argumentum: A szöveg befejeződik egy utasítás közepén."
@@ -211,7 +216,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -219,7 +224,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -231,7 +236,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -246,28 +251,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "nem sikerült átalakítani a byte helyettesítést Unicode kódolásra: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "nem sikerült átalakítani a Unicode helyettesítést a cél kódolásra: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "nem sikerült átalakítani a byte helyettesítést széles szövegre: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -275,14 +280,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "nem sikerült átalakítani a byte helyettesítést a cél kódolásra: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: nem sikerült átalakítani"
@@ -291,7 +296,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: nem teljes karakter vagy eltolási szekvencia"
@@ -299,61 +304,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: I/O hiba"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "az átalakítás %s kódolásról nem támogatott"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "az átalakítás %s kódolásra nem támogatott"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "az átalakítás %s kódolásról %s kódolásra nem támogatott"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "próbálja a(z) „%s -l” parancsot a támogatott kódolások listájához"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "I/O hiba"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "A hibákat ezen a címen jelentse: <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/id.po b/po/id.po
index 13733ef..431847f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2008-12-31 14:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -143,22 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   keluarkan informasi versi dan keluar\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Laporkan bugs ke <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -167,14 +172,14 @@
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +189,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -195,7 +200,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -204,7 +209,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argumen: String berakhir ditengah dari sebuah direktif."
@@ -212,7 +217,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -220,7 +225,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -232,7 +237,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -245,42 +250,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "tidak dapat mengubah substitusi byte ke Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "tidak dapat mengubah substitusi unicode ke target pengkodean: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "tidak dapat mengubah pengganti byte ke string lebar: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "tidak dapat mengubah pengganti widechar ke target pengkodean: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "tidak dapat mengubah pengganti byte ke target pengkodean: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: tidak dapat mengkonversi"
@@ -289,7 +294,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: karakter atau urutan shift tidak lengkap"
@@ -297,65 +302,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: I/O error"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konversi dari %s tidak didukung"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konversi ke %s tidak didukung"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konversi dari %s to %s tidak didukung"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "coba '%s -l' untuk mendapatkan daftar dari pengkodean yang didukung"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "I/O error"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Laporkan bugs ke <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 #~ msgstr ""
diff --git a/po/it.po b/po/it.po
index 6aab5de..42e5d4e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-13 12:17+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -145,24 +145,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   Stampa la versione ed esce\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Segnalare i bug a <bug-gnu-libiconv@gnu.org>.\n"
-"Segnalare gli errori di traduzione a <tp@lists.linux.it>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -171,14 +174,14 @@
 "Non c'è ALCUNA GARANZIA, per quanto consentito dalle vigenti normative.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -188,7 +191,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -199,7 +202,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -207,7 +210,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argomento %s: la stringa termina a metà di una direttiva."
@@ -215,7 +218,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -224,7 +227,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -236,7 +239,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -251,14 +254,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "impossibile convertire la sostituzione byte in Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -266,14 +269,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "impossibile convertire la sostituzione byte con una stringa wide: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -282,14 +285,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "impossibile convertire la sostituzione byte alla codifica finale: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: impossibile convertire"
@@ -298,7 +301,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: carattere o sequenza di shift incompleto"
@@ -306,61 +309,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: errore di I/O"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "conversione da %s non supportata"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "conversione a %s non supportata"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "conversione da %s a %s non supportata"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "usare \"%s -l\" per un elenco delle codifiche supportate"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Errore di I/O"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Segnalare i bug a <bug-gnu-libiconv@gnu.org>.\n"
+#~ "Segnalare gli errori di traduzione a <tp@lists.linux.it>.\n"
diff --git a/po/ja.po b/po/ja.po
index b9d9eec..a113e68 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-30 08:27+0900\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -143,24 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   バージョン情報を表示して終了する\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"バグレポート先 <bug-gnu-libiconv@gnu.org>\n"
-"翻訳問題レポート先 <translation-team-ja@lists.sourceforge.net>\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -169,14 +172,14 @@
 "%s法律の許す限り、 無保証 です.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作成者 %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +187,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,14 +196,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "引数 %s : ここではサイズ指定を行う書式指定を使用できません。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "引数 %s : 書式指定の中間で文字列が終了しました。"
@@ -208,14 +211,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "引数 %s : 文字 '%c' は無効な変換指定です。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -225,7 +228,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -235,42 +238,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "バイトから Unicode へ置換をおこなう変換ができません: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "Unicodeから変換先文字コードへの置換を行う変換ができません: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "バイトからワイド文字への置換を行う変換ができません: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "ワイド文字から変換先文字コードへの置換を行う変換ができません: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "バイトから変換先文字コードへ置換を行う変換ができません: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u行:%u列: 変換できません"
@@ -279,7 +282,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u行:%u列: 不完全な文字またはシフトシーケンスです"
@@ -287,61 +290,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u行:%u列"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: I/O エラー"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "%s からの変換はサポートされていません"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "%s への変換はサポートされていません"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "%s から %s への変換はサポートされていません"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "サポートする文字コード一覧は '%s -l' と入力してください。"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(標準入力)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "I/O エラー"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "バグレポート先 <bug-gnu-libiconv@gnu.org>\n"
+#~ "翻訳問題レポート先 <translation-team-ja@lists.sourceforge.net>\n"
diff --git a/po/libiconv.pot b/po/libiconv.pot
index 2900b59..b3578a5 100644
--- a/po/libiconv.pot
+++ b/po/libiconv.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libiconv 1.16\n"
+"Project-Id-Version: GNU libiconv 1.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -133,31 +133,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -165,7 +170,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -174,14 +179,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -189,14 +194,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -206,7 +211,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -217,42 +222,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr ""
@@ -261,7 +266,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr ""
@@ -269,61 +274,61 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr ""
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr ""
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 6e025a7..92bd2b9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2013-06-28 18:23+0300\n"
 "Last-Translator: Rimas Kudelis <rq@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
 #. TRANSLATORS: The first line of the short usage message.
@@ -141,22 +141,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   parodyti informaciją apie programos versiją ir baigti darbą\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Apie klaidas praneškite adresu <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -165,14 +170,14 @@
 "Šiai programinei įrangai NETAIKOMA JOKIA GARANTIJA, kiek tai leidžia įstatymai.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Programą parašė %s\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -180,7 +185,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -189,14 +194,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -204,14 +209,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -221,7 +226,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -233,42 +238,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: perkodavimas negalimas"
@@ -277,7 +282,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr ""
@@ -285,61 +290,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Įvesties/išvesties klaida"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "perkodavimas iš „%s“ nepalaikomas"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "perkodavimas į „%s“ nepalaikomas"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "perkodavimas iš „%s“ į „%s“ nepalaikomas"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "pasinaudokite komanda „%s -l“ palaikomų koduočių sąrašui gauti"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Įvesties/išvesties klaida"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Apie klaidas praneškite adresu <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/nl.po b/po/nl.po
index f1c3e20..d65eab3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-01-07 15:41+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -147,24 +147,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   programmaversie tonen en stoppen\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Rapporteer gebreken in het programma aan <bug-gnu-libiconv@gnu.org>;\n"
-"meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -174,14 +177,14 @@
 "Deze software kent GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -191,7 +194,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -202,7 +205,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -211,7 +214,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argument: De tekst stopt midden in een commando."
@@ -219,14 +222,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s argument: Het teken '%c' is geen geldige omzettingsspecificatie."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -241,7 +244,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -253,14 +256,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "kan byte-vervanging niet omzetten naar Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "kan Unicode-vervanging niet omzetten naar de doelcodering: %s"
@@ -268,7 +271,7 @@
 # "brede tekenreeks" klinkt mij nogal vreemd...
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "kan byte-vervanging niet omzetten naar een brede tekenreeks: %s"
@@ -276,21 +279,21 @@
 # "brede tekenvervanging" klinkt slecht...
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "kan breedteken-vervanging niet omzetten naar de doelcodering: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "kan byte-vervanging niet omzetten naar de doelcodering: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: omzetting is onmogelijk"
@@ -300,7 +303,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: onvolledig teken of onvolledige shift-sequentie"
@@ -308,61 +311,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Invoer-/uitvoerfout"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "omzetting vanuit %s wordt niet ondersteund"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "omzetting naar %s wordt niet ondersteund"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "omzetting van %s naar %s wordt niet ondersteund"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "Typ '%s -l' voor een lijst van ondersteunde coderingen."
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(standaardinvoer)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Invoer-/uitvoerfout"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Rapporteer gebreken in het programma aan <bug-gnu-libiconv@gnu.org>;\n"
+#~ "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
diff --git a/po/pl.po b/po/pl.po
index 6038b45..89b1737 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-12 16:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -143,22 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   wyświetlenie informacji o wersji i zakończenie\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Błędy proszę zgłaszać na adres <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -167,14 +172,14 @@
 "Nie ma ŻADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisane przez %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +189,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -195,7 +200,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -203,7 +208,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Argument %s: łańcuch kończy się w środku dyrektywy."
@@ -211,14 +216,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "Argument %s: znak '%c' nie jest poprawnym określeniem konwersji."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -230,7 +235,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -248,28 +253,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "nie można przekonwertować zamiennika bajtu na Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "nie można przekonwertować zamiennika unicode na kodowanie docelowe: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "nie można przekonwertować zamiennika bajtu na łańcuch szeroki: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -278,14 +283,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "nie można przekonwertować zamiennika bajtu na kodowanie docelowe: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: nie można skonwertować"
@@ -294,7 +299,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u niedokończony znak lub sekwencja shift"
@@ -302,61 +307,64 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: błąd wej./wyj."
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konwersja z kodu %s jest nieobsługiwana"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konwersja do kodu %s jest nieobsługiwana"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konwersja z kodu %s do kodu %s jest nieobsługiwana"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "'%s -l' poda listę obsługiwanych kodowań"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "błąd wej./wyj."
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Błędy proszę zgłaszać na adres <bug-gnu-libiconv@gnu.org>.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9499028..594be1f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-12 10:58-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -145,22 +145,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   exibe informação da versão e sai\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Relate problemas para <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -169,14 +174,14 @@
 "NÃO HÁ GARANTIA, não extensão permitida pela lei.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -186,7 +191,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -197,7 +202,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -205,7 +210,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argumento de %s: A string termina no meio de uma diretiva."
@@ -213,7 +218,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -222,7 +227,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -234,7 +239,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -249,35 +254,35 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "não foi possível converter substituição de bytes para Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "não foi possível converter unicode para codificação desejada: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "não foi possível converter substituição de bytes para texto amplo: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "não foi possível converter widechar para codificação desejada: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -286,7 +291,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: impossível converter"
@@ -295,7 +300,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: sequência de caracteres ou deslocamentos incompleta"
@@ -303,65 +308,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: erro de E/S"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "não há suporte à conversão de %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "não há suporte à conversão para %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "não há suporte à conversão de %s para %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "tente \"%s -l\" para obter a lista de codificações sem suporte"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "erro de E/S"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Relate problemas para <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 #~ msgstr ""
diff --git a/po/rm.po b/po/rm.po
index b355c66..4e34375 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2005-02-06 15:27+0100\n"
 "Last-Translator: Florian Verdet _goto <fvgoto@linuxbourg.ch>\n"
 "Language-Team: Rhaeto-Romance <gnu-rumantsch@guglielmtux.ch>\n"
@@ -134,31 +134,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scrit da %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -166,7 +171,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -175,14 +180,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -190,14 +195,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -207,7 +212,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -218,42 +223,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nu poss convertir\n"
@@ -262,7 +267,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: segn incumplet o sequenza da translocaziun\n"
@@ -270,61 +275,61 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: sbagl d'I/O\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversiun davent da %s na sustgnida\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversiun vers %s na sustgnida\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversiun da %s vers %s na sustgnida\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: sbagl I/O\n"
diff --git a/po/ro.po b/po/ro.po
index 9503812..2c29f21 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv-1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2003-05-17 15:15+0300\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -133,31 +133,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -165,7 +170,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -174,14 +179,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -189,14 +194,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -206,7 +211,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -217,42 +222,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 #| msgid "iconv: %s: cannot convert\n"
 msgid "%s:%u:%u: cannot convert"
@@ -262,7 +267,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 #| msgid "iconv: %s: incomplete character or shift sequence\n"
 msgid "%s:%u:%u: incomplete character or shift sequence"
@@ -271,14 +276,14 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 #| msgid "iconv: %s: I/O error\n"
 msgid "%s: I/O error"
@@ -286,7 +291,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s unsupported\n"
 msgid "conversion from %s unsupported"
@@ -294,7 +299,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 #| msgid "iconv: conversion to %s unsupported\n"
 msgid "conversion to %s unsupported"
@@ -302,7 +307,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s to %s unsupported\n"
 msgid "conversion from %s to %s unsupported"
@@ -310,26 +315,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 #| msgid "iconv: I/O error\n"
 msgid "I/O error"
diff --git a/po/ru.po b/po/ru.po
index 1d13d22..0d20461 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2019-01-06 07:48+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@d07.ru>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\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"
+"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: Lokalize 2.0\n"
 
 #. TRANSLATORS: The first line of the short usage message.
@@ -147,22 +147,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   показать информацию о версии и выйти\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Об ошибках сообщайте по адресу <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -171,14 +176,14 @@
 "Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Авторы: %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -187,7 +192,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -198,14 +203,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "аргумент %s: Здесь не допускается директива размера."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "аргумент %s: Строка заканчивается на середине директивы."
@@ -213,7 +218,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -221,7 +226,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -233,7 +238,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -249,28 +254,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "невозможно преобразовать байтовую подстановку в Юникод: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "невозможно преобразовать юникодную подстановку в целевую кодировку: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "невозможно преобразовать байтовую подстановку в широкую строку: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -278,14 +283,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "невозможно преобразовать байтовую подстановку в целевую кодировку: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: невозможно преобразовать"
@@ -294,7 +299,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: неполный символ или последовательность сдвига"
@@ -302,65 +307,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: ошибка ввода-вывода"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "преобразование из %s не поддерживается"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "преобразование в %s не поддерживается"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "преобразование из %s в %s не поддерживается"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "список поддерживаемых кодировок доступен по команде «%s -l»"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "ошибка ввода-вывода"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Об ошибках сообщайте по адресу <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 #~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index ba1a7f1..de9600b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-13 00:02+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -141,25 +141,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   vypísať informáciu o verzii a skončiť\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Chyby môžete oznamovať na adresu <bug-gnu-libiconv@gnu.org> (iba anglicky).\n"
-"Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux."
-"sk>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -168,14 +170,14 @@
 "Neposkytuje sa ŽIADNA ZÁRUKA, v rozsahu povolenom zákonmi.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -185,7 +187,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -196,7 +198,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -204,7 +206,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Parameter %s: Reťazec končí v strede direktívy."
@@ -212,14 +214,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "Parameter %s: Znak '%c' nie je platným konverzným špecifikátorom."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -231,7 +233,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -249,28 +251,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "nie je možné konvertovať náhradu bajtov do Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "nie je možné konvertovať náhradu Unicode do cieľového kódovania: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "nie je možné konvertovať náhradu bajtov na široký reťazec: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -278,14 +280,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "nie je možné konvertovať náhradu bajtov do cieľového kódovania: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: nie je možné konvertovať"
@@ -294,7 +296,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: nekompletný znak alebo preraďovacia sekvencia"
@@ -302,61 +304,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: V/V chyba"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konverzia z %s nie je podporovaná"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konverzia do %s nie je podporovaná"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konverzia z %s do %s nie je podporovaná"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "skúste '%s -l' aby ste získali zoznam podporovaných kódovaní"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(štandardný vstup)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "V/V chyba"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Chyby môžete oznamovať na adresu <bug-gnu-libiconv@gnu.org> (iba "
+#~ "anglicky).\n"
+#~ "Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists."
+#~ "linux.sk>.\n"
diff --git a/po/sl.po b/po/sl.po
index d882b52..3ff9597 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2008-04-26 09:48+0200\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
 #: src/iconv.c:104
@@ -144,22 +144,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   izpiši informacijo o različici in končaj\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Napake javite na <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -168,14 +173,14 @@
 "Za izdelek ni NOBENEGA JAMSTVA, do z zakonom dovoljene meje.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -183,7 +188,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,14 +198,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "argument %s: oblikovna direktiva z velikostjo tu ni dovoljena."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argument %s: niz se konča sredi direktive."
@@ -208,14 +213,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "argument %s: znak %c ni veljavno določilo pretvorbe."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -227,7 +232,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -243,42 +248,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "nadomestnega bajta ni mogoče pretvoriti v unikod: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "nadomestnega unikoda ni mogoče pretvoriti v ciljni nabor: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "nadomestnega bajta ni mogoče pretvoriti v široki niz: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "pretvorba nadomestnega širokega znaka v ciljni nabor ni mogoča: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "pretvorba nadomestnega bajta v ciljni nabor ni mogoča: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u pretvorba ni mogoča"
@@ -287,7 +292,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u nepopolni znak ali pomično zaporedje"
@@ -295,65 +300,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: V/I napaka"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "pretvorba iz nabora %s ni podprta"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "pretvorba v nabor %s ni podprta"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "pretvorba iz nabora %s v nabor %s ni podprta"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "poskusite »%s -l« za seznam podprtih naborov znakov"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "V/I napaka"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Napake javite na <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "This is free software; see the source for copying conditions.  There is "
 #~ "NO\n"
diff --git a/po/sq.po b/po/sq.po
index 2b59202..097978a 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2004-08-08 00:36+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -132,31 +132,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Shkruar nga %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +169,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +178,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +193,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +210,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -216,42 +221,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 #| msgid "iconv: %s: cannot convert\n"
 msgid "%s:%u:%u: cannot convert"
@@ -261,7 +266,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 #| msgid "iconv: %s: incomplete character or shift sequence\n"
 msgid "%s:%u:%u: incomplete character or shift sequence"
@@ -270,14 +275,14 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 #| msgid "iconv: %s: I/O error\n"
 msgid "%s: I/O error"
@@ -285,7 +290,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s unsupported\n"
 msgid "conversion from %s unsupported"
@@ -293,7 +298,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 #| msgid "iconv: conversion to %s unsupported\n"
 msgid "conversion to %s unsupported"
@@ -301,7 +306,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s to %s unsupported\n"
 msgid "conversion from %s to %s unsupported"
@@ -309,26 +314,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(stdin)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 #| msgid "iconv: I/O error\n"
 msgid "I/O error"
diff --git a/po/sr.po b/po/sr.po
index de7e3f5..3fbac87 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv-1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-01-27 06:37+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,8 +15,8 @@
 "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"
+"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-Bugs: Report translation errors to the Language-Team address.\n"
 
 #. TRANSLATORS: The first line of the short usage message.
@@ -142,22 +142,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   исписује издање и излази\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Пријавите грешке на <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -166,14 +171,14 @@
 "Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написао је %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -182,7 +187,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -192,14 +197,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s аргумент: Наредба формата са величином овде није дозвољена."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s аргумент: Ниска је завршила у сред наредбе."
@@ -207,14 +212,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s аргумент: Знак „%c“ није исправан одредник претварања."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -225,7 +230,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -240,42 +245,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "не могу да претворим замену бајта у Уникод: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "не могу да претворим замену уникода у циљно кодирање: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "не могу да претворим замену бајта у широку ниску: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "не могу да претворим замену широког знака у циљно кодирање: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "не могу да претворим замену бајта у циљно кодирање: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: не могу да претворим"
@@ -284,7 +289,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: непотпуни низ знака или поераја"
@@ -292,65 +297,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: У/И грешка"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "претварање из %s није подржано"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "претварање у %s није подржано"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "претварање из %s у %s није подржано"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "покушајте „%s -l“ да добијете списак подржаних кодирања"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(стдул)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "У/И грешка"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Пријавите грешке на <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "This is free software; see the source for copying conditions.  There is "
 #~ "NO\n"
diff --git a/po/sv.po b/po/sv.po
index a3dc287..8ea8344 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2017-06-04 15:02+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -145,24 +145,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   skriv ut versionsinformation och avsluta\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Rapportera fel till <bug-gnu-libiconv@gnu.org>.\n"
-"Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -171,14 +174,14 @@
 "Det finns INGEN GARANTI, så långt lagen tillåter.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -187,7 +190,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -197,14 +200,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "Argument %s: Ett formatdirektiv med en storlek tillåts inte här."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Argument %s: Strängen slutar mitt i ett direktiv."
@@ -212,14 +215,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "Argument %s: Tecknet \"%c\" är inte en giltig konverteringsangivare."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -231,7 +234,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -244,42 +247,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "kan inte konvertera byte-ersättning till Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "kan inte konvertera unicode-ersättning till målkodning: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "kan inte konvertera byte-ersättning till bred sträng: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "kan inte konvertera bredteckenersättning till målkodning: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "kan inte konvertera byte-ersättning till målkodning: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: kan inte konvertera"
@@ -288,7 +291,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: ofullständigt tecken eller skiftsekvens"
@@ -296,65 +299,70 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: In-/Ut-fel"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konvertering från %s stöds inte"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konvertering till %s stöds inte"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konvertering från %s till %s stöds inte"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "prova ”%s -l” för att få listan på kodningar som stöds"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(standard in)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "In-/Ut-fel"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Rapportera fel till <bug-gnu-libiconv@gnu.org>.\n"
+#~ "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
+
 #~ msgid ""
 #~ "This is free software; see the source for copying conditions.  There is "
 #~ "NO\n"
diff --git a/po/tr.po b/po/tr.po
index e827d26..d40f801 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2002-06-28 11:00+0200\n"
 "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -134,31 +134,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
 
-#: src/iconv.c:196
-#, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Yazan: %s\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -166,7 +171,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -175,14 +180,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -190,14 +195,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -207,7 +212,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -218,42 +223,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, fuzzy, c-format
 #| msgid "iconv: %s: cannot convert\n"
 msgid "%s:%u:%u: cannot convert"
@@ -263,7 +268,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, fuzzy, c-format
 #| msgid "iconv: %s: incomplete character or shift sequence\n"
 msgid "%s:%u:%u: incomplete character or shift sequence"
@@ -272,14 +277,14 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, fuzzy, c-format
 #| msgid "iconv: %s: I/O error\n"
 msgid "%s: I/O error"
@@ -287,7 +292,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s unsupported\n"
 msgid "conversion from %s unsupported"
@@ -295,7 +300,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, fuzzy, c-format
 #| msgid "iconv: conversion to %s unsupported\n"
 msgid "conversion to %s unsupported"
@@ -303,7 +308,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, fuzzy, c-format
 #| msgid "iconv: conversion from %s to %s unsupported\n"
 msgid "conversion from %s to %s unsupported"
@@ -311,26 +316,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(standart girdi)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, fuzzy, c-format
 #| msgid "iconv: I/O error\n"
 msgid "I/O error"
diff --git a/po/uk.po b/po/uk.po
index 0f1d71c..afee5d8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-12 14:39+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.5\n"
 
 #. TRANSLATORS: The first line of the short usage message.
@@ -145,22 +145,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   показати дані щодо версії і завершити роботу\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Про вади слід повідомляти на адресу <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -169,14 +174,14 @@
 "Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автор — %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -186,7 +191,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -197,7 +202,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -206,7 +211,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Аргумент %s: завершення рядка посередині команди."
@@ -214,7 +219,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -222,7 +227,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -234,7 +239,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -251,28 +256,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "не вдалося перетворити замінник байтів у символ Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "не вдалося перетворити замінник unicode у кодування призначення: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "не вдалося перетворити замінник байтів у «широкий» рядок: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -281,14 +286,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "не вдалося перетворити замінник байтів у кодування призначення: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: не вдалося перетворити"
@@ -297,7 +302,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: незавершений символ чи послідовність зміни регістру"
@@ -305,66 +310,69 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: помилка вводу-виводу"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "підтримки перетворення з %s не передбачено"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "підтримки перетворення у %s не передбачено"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "підтримки перетворення з %s у %s не передбачено"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 "список кодувань, які підтримуються програмою, можна отримати командою «%s -l»"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(стд. ввід)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "помилка вводу-виводу"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Про вади слід повідомляти на адресу <bug-gnu-libiconv@gnu.org>.\n"
+
 #~ msgid ""
 #~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 #~ msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 7e20bff..fda6ca7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2016-12-13 07:27+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -144,24 +144,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   hiển thị thông tin về phiên bản rồi thoát\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"Thông báo lỗi cho <bug-gnu-libiconv@gnu.org>.\n"
-"Thông báo lỗi dịch cho: <http://translationproject.org/team/vi.html>.\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -170,14 +173,14 @@
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều khiển được pháp luật cho phép.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Viết bởi %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -185,7 +188,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -195,14 +198,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "Đối số %s: ở đây không cho phép chỉ thị định dạng có kích cỡ."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Đối số %s: chuỗi kết thúc ở giữa chỉ thị."
@@ -210,14 +213,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "Đối số %s: ký tự “%c” không phải là bộ xác định chuyển đổi hợp lệ."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -229,7 +232,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -239,42 +242,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "không thể chuyển đổi sự thay thế byte sang Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "không thể chuyển đổi sự thay thế Unicode sang bảng mã đích: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "không thể chuyển đổi sự thay thế byte sang chuỗi rộng: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "không thể chuyển đổi sự thay thế ký tự rộng sang bảng mã đích: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "không thể chuyển đổi sự thay thế byte sang bảng mã đích: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: không thể chuyển đổi"
@@ -283,7 +286,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: dây kiểu ký tự hay dịch chưa hoàn thành"
@@ -292,48 +295,48 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: lỗi V/R"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "không hỗ trợ khả năng chuyển đổi từ %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "không hỗ trợ khả năng chuyển đổi sang %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "không hỗ trợ khả năng chuyển đổi từ %s sang %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "hãy thử lệnh “%s -l” để xem danh sách các bảng mã được hỗ trợ"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(đầu vào tiêu chuẩn)"
 
@@ -341,17 +344,22 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Lỗi V/R"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "Thông báo lỗi cho <bug-gnu-libiconv@gnu.org>.\n"
+#~ "Thông báo lỗi dịch cho: <http://translationproject.org/team/vi.html>.\n"
+
 #~ msgid ""
 #~ "This is free software; see the source for copying conditions.  There is "
 #~ "NO\n"
diff --git a/po/wa.po b/po/wa.po
index 0a034e8..862936c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.11\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2007-08-28 15:50+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -142,31 +142,36 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   mostere des informåcions sol modêye do programe\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
-msgstr "Evoyîz les rapoirts di bugs a <bug-gnu-libiconv@gnu.org>.\n"
-
-#: src/iconv.c:196
-#, no-wrap
+#: src/iconv.c:186
+#, c-format
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
+msgstr ""
+
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, c-format, no-wrap
+msgid ""
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Sicrît pa %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -176,7 +181,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -187,7 +192,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -196,7 +201,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "årgumint «%s»: Li tchinne finixh e plin mitan d' ene directive."
@@ -204,7 +209,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -213,7 +218,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -225,7 +230,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -238,14 +243,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "dji n' sai cvierser des replaeçaedjes d' octets viè unicôde: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -253,7 +258,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
@@ -261,14 +266,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "dji n' sai cvierser des replaeçaedjes wchar viè l' ecôdaedje såme: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -276,7 +281,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: dji n' sai fé l' kiviersaedje"
@@ -285,7 +290,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s: %u:%u: caractere ou secwince di candjmint nén complete"
@@ -293,65 +298,68 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: aroke d' intrêye/rexhowe"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "li cviersaedje a pårti d' l' ecôdaedje %s n' est nén sopoirté"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "li cviersaedje viè l' ecôdaedje %s n' est nén sopoirté"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "li cviersaedje di l' ecôdaedje %s viè %s n' est nén sopoirté"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "sayîz «%s -l» po-z aveur li djivêye des ecôdaedjes sopoirtés"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(intrêye sitandård)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "Aroke d' I/R"
 
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr "Evoyîz les rapoirts di bugs a <bug-gnu-libiconv@gnu.org>.\n"
+
 #, c-format
 #~ msgid ""
 #~ "This is free software; see the source for copying conditions.  There is "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c4c6beb..c76123c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2018-09-24 17:23-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -143,24 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   显示版本信息并退出\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"请向 <%s> 报告软件错误。\n"
-"请向 <i18n-zh@googlegroups.com> 报告翻译错误。\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -169,14 +172,14 @@
 "在法律所允许的范围内,没有任何担保。\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +187,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,14 +196,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s 参数: 此处不允许用含大小的命令格式。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s 参数: 字符串在命令中部终止。"
@@ -208,14 +211,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s 参数: 字符‘%c’不是有效的转义符。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -225,7 +228,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -235,42 +238,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "无法将欲替换字节转换成 Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "无法将欲替换 unicode 字元转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "无法将欲替换字节转换成宽字符串: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "无法将欲替换的宽字符转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "无法将欲替换字节转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: 无法转换"
@@ -279,7 +282,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: 不完整的字符或者替换序列"
@@ -287,61 +290,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: 输入/输出错误"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "不支持从 %s 进行转换"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "不支持转换到 %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "不支持从 %s 转换到 %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "尝试用‘%s -l’获取所支持的编码列表"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(标准输入)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "输入/输出错误"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "请向 <%s> 报告软件错误。\n"
+#~ "请向 <i18n-zh@googlegroups.com> 报告翻译错误。\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8676e72..7f64759 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.15-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2019-04-26 21:02+0200\n"
+"POT-Creation-Date: 2022-02-12 13:29+0100\n"
 "PO-Revision-Date: 2018-06-16 17:18+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -143,24 +143,27 @@
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   輸出版本資訊然後離開\n"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
+#. TRANSLATORS: The first placeholder is the web address of the Savannah
+#. project of this package.  The second placeholder is the bug-reporting
+#. email address for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:185
-msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#: src/iconv.c:186
+#, c-format
+msgid ""
+"Report bugs in the bug tracker at <%s>\n"
+"or by email to <%s>.\n"
 msgstr ""
-"將錯誤通報給 <bug-gnu-libiconv@gnu.org>,\n"
-"翻譯錯誤通報給 <zh-l10n@linux.org.tw>,\n"
 
-#: src/iconv.c:196
-#, fuzzy, no-wrap
+#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
+#: src/iconv.c:202
+#, fuzzy, c-format, no-wrap
 #| msgid ""
 #| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 #| "This is free software: you are free to change and redistribute it.\n"
 #| "There is NO WARRANTY, to the extent permitted by law.\n"
 msgid ""
-"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <%s>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
@@ -169,14 +172,14 @@
 "在法律所允許的範圍內不做任何擔保。\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:202
+#: src/iconv.c:208
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:296
+#: src/iconv.c:302
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +187,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:311
+#: src/iconv.c:317
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,14 +196,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:327
+#: src/iconv.c:333
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s 引數:這裡不允許具備大小的格式指令。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:369
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s 引數:字串結束於指令中間。"
@@ -208,14 +211,14 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:376
+#: src/iconv.c:382
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s 引數:字元 %c 並非有效的轉換符號。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:382
+#: src/iconv.c:388
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -225,7 +228,7 @@
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:398
+#: src/iconv.c:404
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -235,42 +238,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:456
+#: src/iconv.c:462
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "無法轉換替代位元組到萬國碼:%s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:496
+#: src/iconv.c:502
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "無法轉換替代萬國碼到目標編碼:%s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:537
+#: src/iconv.c:543
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "無法轉換替代位元組到寬字串:%s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:578
+#: src/iconv.c:584
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "無法轉換替代寬字元到目標編碼:%s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:619
+#: src/iconv.c:625
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "無法轉換替代位元組到目標編碼:%s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:638
+#: src/iconv.c:644
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u:無法轉換"
@@ -279,7 +282,7 @@
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
-#: src/iconv.c:652
+#: src/iconv.c:658
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u:不完整的字元或是換碼序列"
@@ -287,61 +290,66 @@
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:665
+#: src/iconv.c:671
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:826
+#: src/iconv.c:832
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s:輸入輸出錯誤"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1024
+#: src/iconv.c:1030
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "不支援從 %s 進行轉換"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1030
+#: src/iconv.c:1036
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "不支援轉換到 %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1036
+#: src/iconv.c:1042
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "不支援從 %s 轉換到 %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1041
+#: src/iconv.c:1047
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "嘗試 %s -l 以獲得支援的編碼清單"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1098
+#: src/iconv.c:1104
 msgid "(stdin)"
 msgstr "(標準輸入)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1110
+#: src/iconv.c:1116
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1124
+#: src/iconv.c:1130
 #, c-format
 msgid "I/O error"
 msgstr "輸入輸出錯誤"
+
+#~ msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
+#~ msgstr ""
+#~ "將錯誤通報給 <bug-gnu-libiconv@gnu.org>,\n"
+#~ "翻譯錯誤通報給 <zh-l10n@linux.org.tw>,\n"