Regenerated.
diff --git a/po/af.po b/po/af.po
index 8cf5086..5cf054e 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -17,24 +17,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Gebruik so: iconv [-c] [-s] [-f vanaf-kode] [-t na-kode] [lêer ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -42,91 +42,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "of:    iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -135,27 +135,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -163,7 +163,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -172,14 +172,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -187,14 +187,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -204,7 +204,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: kan nie omskakeling doen nie\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: onvolledige karakter of skuifreeks\n"
@@ -267,61 +267,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: T/A-fout\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: omskakeling van %s word nie ondersteun nie\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: omskakeling na %s word nie ondersteun nie\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: omskakeling van %s na %s word nie ondersteun nie\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: T/A-fout\n"
diff --git a/po/bg.po b/po/bg.po
index ee221bb..b525888 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-01-03 14:20+0200\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -18,24 +18,24 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Употреба: iconv [-c] [-s] [-f fromcode] [-t tocode] [файл ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "или:      iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "За повече информация опитайте \"%s --help\".\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Употреба: %s [АРГУМЕНТИ...] [-f КОДИРАНЕ] [-t КОДИРАНЕ] [ВХОДЕН_ФАЙЛ...]\n"
@@ -43,23 +43,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "или:      %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Преобразува текст от едно кодиране към друго.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Аргументи задаващи входния и изходния формати:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -68,7 +68,7 @@
 "  -f КОДИРАНЕ, --from-code=КОДИРАНЕ\n"
 "                              кодиране на входните данни\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -77,17 +77,17 @@
 "  -t КОДИРАНЕ, --to-code=КОДИРАНЕ\n"
 "                              кодиране на изходните данни\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Аргументи контролиращи проблеми при преобразуване:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          игнориране на непреобразуваеми знаци\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -96,14 +96,14 @@
 "  --unicode-subst=ФОРМАТИРАЩ_НИЗ\n"
 "                              заместител на непреобразуваеми знаци от Уникод\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 "  --byte-subst=ФОРМАТИРАЩ_НИЗ\n"
 "                              заместител на непреобразуваеми байтове\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -112,34 +112,34 @@
 "  --widechar-subst=ФОРМАТИРАЩ_НИЗ\n"
 "                              заместител на непреобразуваеми широки знаци\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Аргументи задаващи извеждането на грешки:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 "  -s, --silent                подтискане на съобщенията за грешки при\n"
 "                              преобразуване\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Извеждане на информация:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  изброяване на поддържаните кодирания\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      показване на тази помощ и изход от програмата\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -150,16 +150,16 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки в програмата на <bug-gnu-libiconv@gnu.org>.\n"
 "Подавайте доклади за грешки в превода на <dict@fsa-bg.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -168,14 +168,14 @@
 "вате.  Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -184,7 +184,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -194,14 +194,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s аргумент: низът завършва по средата на директивата."
@@ -209,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -228,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -242,14 +242,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -258,7 +258,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:538
+#: src/iconv.c:536
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
@@ -266,7 +266,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -275,7 +275,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -283,7 +283,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: не може да се преобразува"
@@ -292,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: непълен знак или изместваща последователност"
@@ -300,61 +300,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "входно/изходна грешка"
diff --git a/po/ca.po b/po/ca.po
index e8468f4..e879207 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -16,25 +16,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Forma d'ús: iconv [-c] [-s] [-f CODIF_ORIG] [-t CODIF_DEST] [FITXER ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "o:          iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -42,91 +42,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "o:          iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -135,27 +135,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -163,7 +163,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -172,14 +172,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -187,14 +187,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -204,7 +204,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: no s'ha pogut convertir\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: hi ha un caràcter o seqüència de desplaçament incompleta\n"
@@ -267,61 +267,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: error d'E/S\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: la conversió des de «%s» no és suportada\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: la conversió fins a «%s» no és suportada\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: la conversió des de «%s» fins a «%s» no és suportada\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: error d'E/S\n"
diff --git a/po/da.po b/po/da.po
index 19ce330..31e321d 100644
--- a/po/da.po
+++ b/po/da.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2002-11-09 19:23+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -18,24 +18,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Brug: iconv [-c] [-s] [-f frakode] [-t tilkode] [fil ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -43,91 +43,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "eller: iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -136,27 +136,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +164,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +173,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +188,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +205,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -216,42 +216,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: kan ikke konvertere\n"
@@ -260,7 +260,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ufuldstændigt tegn eller skiftesekvens\n"
@@ -268,61 +268,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ind-/udskriftsfejl\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konvertering fra %s understøttes ikke\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konvertering til %s understøttes ikke\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konvertering fra %s til %s understøttes ikke\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O-fejl\n"
diff --git a/po/de.po b/po/de.po
index 72c3e10..b36631f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-01-08 11:18+0200\n"
 "Last-Translator: Bruno Haible <bruno@clisp.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -20,7 +20,7 @@
 "X-Generator: KBabel 1.0.2\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Aufruf: iconv [-c] [-s] [-f AUSGANGS-KODIERUNG] [-t ZIEL-KODIERUNG] "
@@ -28,18 +28,18 @@
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "oder:   iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Aufruf: %s [OPTION...] [-f KODIERUNG] [-t KODIERUNG] [EINBABEDATEI...]\n"
@@ -47,23 +47,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "oder:   %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Wandelt Text von einer Kodierung in eine andere Kodierung um.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Optionen für das Ein- und Ausgabeformat:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -72,7 +72,7 @@
 "  -f KODIERUNG, --from-code=KODIERUNG\n"
 "                              die Kodierung der Eingabe\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -81,19 +81,19 @@
 "  -t KODIERUNG, --to-code=KODIERUNG\n"
 "                              die Kodierung der Ausgabe\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Optionen für die Behandlung von Umwandlungsproblemen:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 "  -c                          Zeichen, die nicht umgewandelt werden können,\n"
 "                                wegwerfen\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -103,7 +103,7 @@
 "                              Ersatz für Unicode-Zeichen, die nicht umgewandelt\n"
 "                                werden können\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
@@ -111,7 +111,7 @@
 "                              Ersatz für Bytes, die nicht umgewandelt werden\n"
 "                                können\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -121,34 +121,34 @@
 "                              Ersatz für »wide«-Zeichen, die nicht umgewandelt\n"
 "                                werden können\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Optionen für die Ausgabe von Fehlern:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 "  -s, --silent                Fehlermeldungen über Probleme bei der Umwandlung\n"
 "                                unterdrücken\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  die unterstützten Kodierungen anzeigen\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      diese Hilfe anzeigen und beenden\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   Versionsinformation anzeigen und beenden\n"
@@ -157,7 +157,7 @@
 #. 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:186
+#: src/iconv.c:184
 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"
@@ -165,10 +165,10 @@
 "Für die deutsche Übersetzung ist die Mailingliste\n"
 "<translation-team-de@lists.sourceforge.net> zuständig.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -177,14 +177,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -194,7 +194,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -205,7 +205,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -214,7 +214,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "»%s«-Argument: Die Zeichenkette endet mitten in einer Anweisung."
@@ -222,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -241,7 +241,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -256,28 +256,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "Kann Byte-Ersatz nicht nach Unicode umwandeln: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:497
+#: src/iconv.c:495
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "Kann Unicode-Zeichen-Ersatz nicht in die Zielkodierung umwandeln: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:538
+#: src/iconv.c:536
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "Kann Byte-Ersatz nicht in eine »wide«-Zeichenkette umwandeln: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -285,14 +285,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "Kann den Byte-Ersatz nicht in die Zielkodierung umwandeln: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: Kann nicht umwandeln."
@@ -301,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: unvollständiges Zeichen oder unvollständige Umschaltfolge"
@@ -309,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
@@ -352,20 +352,20 @@
 "erhalten."
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "Ein-/Ausgabefehler"
diff --git a/po/el.po b/po/el.po
index de2cfd2..fe6f338 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -16,24 +16,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Χρήση: iconv [-c] [-s] [-f από_κώδικα] [-t tocode] [αρχείο...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "είτε: iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -41,91 +41,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "είτε: iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -134,27 +134,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -162,7 +162,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -171,14 +171,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -186,14 +186,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -203,7 +203,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -214,42 +214,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: δεν μπορεί να γίνει η μετατροπή\n"
@@ -258,7 +258,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: μη ολοκληρωμένος χαρακτήρας ή shift συνέχεια\n"
@@ -266,61 +266,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O σφάλμα\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: μετατροπή από %s μη υποστηριζόμενη\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: μετατροπή σε %s μη υποστηριζόμενη\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: μετατροπή από %s σε %s μη υποστηριζόμενη\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O σφάλμα\n"
diff --git a/po/eo.po b/po/eo.po
index cbcddb1..adc46d3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2007-12-27 21:22+0000\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -17,24 +17,24 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uzado: iconv [-c] [-s] [-f fontkodo] [-t celkodo] [dosiero ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "aŭ:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Provu '%s --help' por pli da informoj.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Uzado: %s [OPCIO...] [-f KODO] [-t KODO] [ENIGDOSIERO...]\n"
@@ -42,23 +42,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "aŭ:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Konvertas tekston de unu kodo al alia kodo.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Opcioj, kiuj regas la formon de enigo kaj eligo:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -67,7 +67,7 @@
 "  -f KODO, --from-code=KODO\n"
 "                              la kodo de la enigo\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -76,17 +76,17 @@
 "  -t KODO, --to-code=KODO\n"
 "                              la kodo de la eligo\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Opcioj, kiuj regas konvertoproblemojn:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          forĵeti nekonverteblajn signojn\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -95,12 +95,12 @@
 "  --unicode-subst=FORMATĈENO\n"
 "                              substituado de nekonverteblaj unikodaj signoj\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMATĈENO     substituado de nekonverteblaj bitokoj\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -109,32 +109,32 @@
 "  --widechar-subst=FORMATĈENO\n"
 "                              substituado de nekonverteblaj larĝaj signoj\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Opcioj, kiuj regas eligon de eraroj:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                subpremi eraromesaĝojn pri konvertoproblemoj\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informa eligo:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  listigi la konatajn kodojn\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      montri ĉi tiun helpon kaj eliri\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  -version                    eligi informon pri la versio kaj eliri\n"
@@ -143,14 +143,14 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Raportu cimojn al <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -159,14 +159,14 @@
 "Estas NENIA GARANTIO, laŭ la grado leĝe permesata.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -174,7 +174,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -183,14 +183,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s argumento: Formatdirektivo kun grando ne eblas ĉi tie."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, 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."
@@ -198,14 +198,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -217,7 +217,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -230,42 +230,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ne povas konverti"
@@ -274,7 +274,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: malkompleta signo aŭ reĝimŝanĝa kodo"
@@ -282,61 +282,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konvertado de %s ne disponata"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konvertado al %s ne disponata"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konvertado de %s al %s ne disponata"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "leg/skrib-eraro"
diff --git a/po/es.po b/po/es.po
index b5268b4..73b7534 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2002-06-20 17:00+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,24 +17,24 @@
 "Content-Transfer-Encoding: 8-bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Modo de empleo: iconv [-c] [-s] [-f desde] [-t hasta] [fichero ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "o bien: iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -42,91 +42,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "o bien: iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -135,27 +135,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -163,7 +163,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -172,14 +172,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -187,14 +187,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -204,7 +204,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: no se puede convertir\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: carácter o secuencia de desplazamiento incompleta\n"
@@ -267,61 +267,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: error de E/S\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: no se admite la conversión de `%s'\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "no se admite la conversión a `%s'\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: no se admite la conversión de `%s' a `%s'\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: error de E/S\n"
diff --git a/po/et.po b/po/et.po
index 122a4cc..6211829 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.11-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2006-07-28 10:58+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,24 +17,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Kasutamine: iconv [-c] [-s] [-f koodist] [-t koodi] [fail ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "või:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks kasutage `%s --help'.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Kasutamine: %s [VÕTI...] [-f KODEERING] [-t KODEERING] [SISENDFAIL...]\n"
@@ -42,23 +42,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "või:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Teisendab teksti ühest kooditabelist teise.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Sisendi ja väljundi vormingut kontrollivad võtmed:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -67,7 +67,7 @@
 "  -f KODEERING, --from-code=KODEERING\n"
 "                              sisendi kooditabel\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -76,17 +76,17 @@
 "  -t KODEERING, --to-code=KODEERING\n"
 "                              väljundi kooditabel\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Teisendamisel tekkivate probleemide kontrolli võtmed:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          eemalda mitteteisendatavad sümbolid\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -95,12 +95,12 @@
 "  --unicode-subst=VORMING\n"
 "                              mitteteisendavate Unikoodi sümbolite asendus\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=VORMING        mitteteisendatavate baitide asendus\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -109,32 +109,32 @@
 "  --widechar-subst=VORMING\n"
 "                              mitteteisendatavate mitmebaidi sümbolite asendus\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Vigade väljundi kontrollimise võtmed:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                keela probleemidest teatamine\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Infoväljund:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  väljasta toetatud kooditabelite nimekiri\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      väljasta see abiinfo ja lõpeta töö\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   väljasta versiooni info ja lõpeta töö\n"
@@ -143,27 +143,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Vigadest teatage palun aadressil <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -171,7 +171,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -180,14 +180,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argument: Sõne lõppeb keset direktiivi."
@@ -195,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -213,7 +213,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:399
+#: src/iconv.c:397
 #, fuzzy, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -226,42 +226,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, fuzzy, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "iconv: mitmebaidilisi 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:620
+#: src/iconv.c:618
 #, fuzzy, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "iconv: 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ei saa teisendada"
@@ -270,7 +270,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: mittetäielik sümbol või nihkejärjend"
@@ -278,61 +278,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "S/V viga"
diff --git a/po/fi.po b/po/fi.po
index c140f17..99dfc65 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -21,25 +21,25 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Käyttö: iconv [-c] [-s] [-f syötekoodaus] [-t tulostekoodaus] [tiedosto ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "tai:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Katso lisäohjeet valitsimella ”%s --help”.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Käyttö: %s [VALITSIN...] [-f KOODAUS] [-t KOODAUS] [SYÖTETIEDOSTO...]\n"
@@ -47,23 +47,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "tai:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Muuntaa tekstin yhdestä koodauksesta toiseksi koodaukseksi.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Valitsimet, jotka ohjaavat syötteen ja tulosteen muotoa:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -72,7 +72,7 @@
 "  -f KOODAUS, --from-code=KOODAUS\n"
 "                              syötteen koodaus\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -81,17 +81,17 @@
 "  -t KOODAUS --to-code=KOODAUS\n"
 "                              tulosteen koodaus\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Valitsimet, jotka ohjaavat muunnospulmia:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          hylkää ei-muunnettavat merkit\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -100,12 +100,12 @@
 "  --unicode-subst=MUOTOMERKKIJONO\n"
 "                              korvaus ei-muunnettaville Unicode-merkeille\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=MUOTOMERKKIJONO   korvaus ei-muunnettaville tavuille\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -114,32 +114,32 @@
 "  --widechar-subst=MUOTOMERKKIJONO\n"
 "                              korvaus ei-muunnettaville wide-merkeille\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Valitsimet, jotka ohjaavat virhetulostetta:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                vaimenna virheilmoitukset muunnospulmista\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Tiedotetuloste:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  luettele tuetut koodaukset\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      näytä tämä opaste ja poistu\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   tulosta versiotiedot ja poistu\n"
@@ -148,14 +148,14 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Ilmoita ohjelmistovioista osoitteeseen <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -164,14 +164,14 @@
 "Ohjelmalla EI OLE TAKUUta siinä laajuudessa kuin laki sallii.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -181,7 +181,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -192,14 +192,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s-argumentti: Merkkijono loppuu direktiivin keskellä."
@@ -207,14 +207,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -226,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -241,42 +241,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ei voida muuntaa"
@@ -286,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: epätäydellinen merkki tai shift-sekvenssi"
@@ -294,61 +294,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "Siirräntävirhe"
diff --git a/po/fr.po b/po/fr.po
index e960068..e35645e 100644
--- a/po/fr.po
+++ b/po/fr.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-03-30 11:21+0000\n"
 "Last-Translator: François-Xavier Coudert <fxcoudert@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,24 +18,24 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Usage: iconv [-c] [-s] [-f code_source] [-t code_cible] [fichier ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ou:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
@@ -43,23 +43,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ou:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Convertit du texte d'un codage à un autre codage.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Options contrôlant les formats d'entrée et de sortie :\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -68,7 +68,7 @@
 "  -f CODAGE, --from-code=CODAGE\n"
 "                              codage en entrée\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -77,17 +77,17 @@
 "  -t CODAGE, --to-code=CODAGE\n"
 "                              codage en sortie\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Options contrôlant les problèmes de conversion :\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          écarte les caractères non convertissables\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -96,12 +96,12 @@
 "  --unicode-subst=FORMAT\n"
 "                              substitution pour les caractères Unicode non convertissables\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMAT         substitution pour les octets non convertissables\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -110,32 +110,32 @@
 "  --widechar-subst=FORMAT\n"
 "                              substitution pour les caractères larges non convertissables\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Options contrôlant l'affichage des erreurs :\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                supprime les messages d'erreur concernant les problèmes de conversion\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Options d'aide:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  afficher les codages supportés\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      affiche ce message d'aide et terminer\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   affiche les informations de version et terminer\n"
@@ -144,14 +144,14 @@
 #. 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:186
+#: src/iconv.c:184
 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:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -160,14 +160,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -177,7 +177,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -188,7 +188,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -197,7 +197,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, 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."
@@ -205,7 +205,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:377
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -214,7 +214,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -226,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -239,28 +239,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -269,7 +269,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -277,7 +277,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ne peut convertir"
@@ -286,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: caractère incomplet ou séquence de décalage"
@@ -294,61 +294,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "erreur E/S"
diff --git a/po/ga.po b/po/ga.po
index a6dc056..3f5c717 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-01-02 14:58-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -19,24 +19,24 @@
 "(n>6 && n <11) ? 3 : 4;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Úsáid: iconv [-c] [-s] [-f cód] [-t cód] [comhad ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "nó:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Úsáid: %s [ROGHA...] [-f IONCHÓDÚ] [-t IONCHÓDÚ] [INCHOMHAD...]\n"
@@ -44,23 +44,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "nó:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Tiontaigh ó ionchódú go ceann eile.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Roghanna a rialaíonn formáid ionchurtha/aschurtha:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -69,7 +69,7 @@
 "  -f IONCHÓDÚ, --from-code=IONCHÓDÚ\n"
 "                              ionchódú an ionchuir\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -78,17 +78,17 @@
 "  -t IONCHÓDÚ, --to-code=IONCHÓDÚ\n"
 "                              ionchódú an aschuir\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Roghanna a rialaíonn fadhbanna tiontaithe:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                        ná coinnigh carachtair dhothiontaithe\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -97,12 +97,12 @@
 "  --unicode-subst=TEAGHRÁN\n"
 "                              ionadaíocht do charachtair dhothiontaithe Unicode\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=TEAGHRÁN       ionadaíocht do bhearta dothiontaithe\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -111,32 +111,32 @@
 "  --widechar-subst=TEAGHRÁN\n"
 "                             ionadaíocht do charachtair leathana dhothiontaithe\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Roghanna a rialaíonn aschur d'earráidí:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                ná taispeáin teachtaireachtaí faoi fhadhbanna tiontaithe\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Aschur faisnéiseach:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  taispeáin na hionchóduithe a dtacaítear leo\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      taispeáin an chabhair seo agus scoir\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   taispeáin eolas faoin leagan agus scoir\n"
@@ -145,14 +145,14 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Seol tuairiscí fabhtanna chuig <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -161,14 +161,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -178,7 +178,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -189,14 +189,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, 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."
@@ -204,14 +204,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -223,7 +223,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -247,42 +247,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ní féidir tiontú"
@@ -291,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: carachtar nó seicheamh neamhiomlán"
@@ -299,42 +299,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
@@ -342,20 +342,20 @@
 "thaispeáint"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "Earráid I/A"
diff --git a/po/gl.po b/po/gl.po
index a0ab246..caa73b3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2002-05-30 12:06+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -16,24 +16,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Emprego: iconv [-c] [-s] [-f decodigo] [-t acodigo] [ficheiro ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ou:      iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -41,91 +41,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ou:      iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -134,27 +134,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -162,7 +162,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -171,14 +171,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -186,14 +186,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -203,7 +203,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -214,42 +214,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: non se pode converter\n"
@@ -258,7 +258,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: secuencia de caracteres ou desprazamentos incompleta\n"
@@ -266,61 +266,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: erro de E/S\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversión de %s non soportada\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversión a %s non soportada\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversión de %s a %s non soportada\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: erro de E/S\n"
diff --git a/po/hr.po b/po/hr.po
index 64e591a..97540f0 100644
--- a/po/hr.po
+++ b/po/hr.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2002-06-14 14:48-01\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -20,24 +20,24 @@
 "X-Generator: TransDict server\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f izkoda] [-t ukod] [datoteka ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ili:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -45,91 +45,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ili:    iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -138,27 +138,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -166,7 +166,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -175,14 +175,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -190,14 +190,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -207,7 +207,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -218,42 +218,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ne mogu konvertirati\n"
@@ -262,7 +262,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: nezavršena znakovna ili shift sekvenca\n"
@@ -270,61 +270,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: U/I greška\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konverzija iz %s nije podržana\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konverzija u %s nije podržana\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konverzija iz %s u %s nije podržana\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: U/I greška\n"
diff --git a/po/hu.po b/po/hu.po
index 45a2bfb..99f7a6e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2002-05-30 14:26+0200\n"
 "Last-Translator: Emese Kovacs <emese@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -17,24 +17,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Használat: iconv [-c] [-s] [-f kódolásról] [-t kódolásra] [fájl ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "vagy:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -42,91 +42,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "vagy:    iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -135,27 +135,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -163,7 +163,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -172,14 +172,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -187,14 +187,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -204,7 +204,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: konvertálás sikertelen\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: nem egész karakter vagy eltolási szekvencia\n"
@@ -267,35 +267,35 @@
 #. 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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O hiba\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: a konvertálás errõl a kódolásról (%s) nem támogatott\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: a konvertálás erre a kódolásra (%s) nem támogatott\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr ""
@@ -304,26 +304,26 @@
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O hiba\n"
diff --git a/po/id.po b/po/id.po
index 724ea01..78f5a1c 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -19,24 +19,24 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Penggunaan: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "atau:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Penggunaan: %s [OPSI...] [-f PENGKODEAN] [-e PENGKODEAN] [BERKAS MASUKAN...]\n"
@@ -44,23 +44,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "atau:  %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Ubah teks dari satu pengkodean ke pengkodean yang lain.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Opsi mengontrol format masukan dan keluaran:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -69,7 +69,7 @@
 "  -f PENGKODEAN, --from-code=PENGKODEAN\n"
 "                              pengkodean dari masukan\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -78,17 +78,17 @@
 "  -t PENGKODEAN, --to-code=PENGKODEAN\n"
 "                              pengkodean dari keluaran\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Opsi mengontrol masalah pengubahan:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          abaikan karakter yang tidak dapat diubah\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -97,12 +97,12 @@
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitusi untuk karakter Unicode yang tidak dapat diubah\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMATSTRING   substitusi untuk byte tidak terubah\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -111,32 +111,32 @@
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitusi untuk karakter lebar tidak terubah\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Opsi mengontrol keluaran error:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                tekan pesan error mengenai masalah konversi\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informasi:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  daftar dari pengkodean yang didukung\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      tampilkan bantuan ini dan keluar\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   keluarkan informasi versi dan keluar\n"
@@ -145,14 +145,14 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Laporkan bugs ke <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -161,14 +161,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -178,7 +178,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -189,7 +189,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -198,7 +198,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argumen: String berakhir ditengah dari sebuah direktif."
@@ -206,7 +206,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:377
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -214,7 +214,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -226,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -239,42 +239,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: tidak dapat mengkonversi"
@@ -283,7 +283,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: karakter atau urutan shift tidak lengkap"
@@ -291,61 +291,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "I/O error"
diff --git a/po/it.po b/po/it.po
index 282a442..568b599 100644
--- a/po/it.po
+++ b/po/it.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2009-01-08 22:24+0100\n"
 "Last-Translator: Milo Casagrande <milo_casagrande@yahoo.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,24 +19,24 @@
 "Plural-Forms:nplurals=2; plural=(n != 1)\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uso: iconv [-c] [-s] [-f DAL_CODICE] [-t AL_CODICE] [FILE...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "o:   iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare \"%s --help\" per ulteriori informazioni.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Uso: %s [OPZIONI...] [-f CODIFICA] [-t CODIFICA] [FILE...]\n"
@@ -44,23 +44,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "o:   %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Converte il testo da una codifica a un'altra.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Opzioni per il controllo del formato di input e di output:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -69,7 +69,7 @@
 "  -f CODIFICA, --from-code=CODIFICA\n"
 "                              La codifica dell'input\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -78,17 +78,17 @@
 "  -t CODIFICA, --to-code=CODIFICA\n"
 "                              La codifica dell'output\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Opzioni per il controllo dei problemi di conversione:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          Tralascia i caratteri non convertibili\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -97,14 +97,14 @@
 "  --unicode-subst=STRINGA_FORMATO\n"
 "                              Sostituzione per i caratteri Unicode non convertibili\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 "  --byte-subst=STRINGA_FORMATO\n"
 "                              Sostituzione per i byte non convertibili\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -113,32 +113,32 @@
 "  --widechar-subst=STRINGA_FORMATO\n"
 "                              Sostituzione per i caratteri wide non convertibili\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Opzioni per il controllo degli errori di output:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                Tralascia i messaggi di errore dei problemi di conversione\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  Elenca le codifiche supportate\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      Visualizza questo aiuto ed esce\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   Stampa la versione ed esce\n"
@@ -147,16 +147,16 @@
 #. 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:186
+#: src/iconv.c:184
 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"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -165,14 +165,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -182,7 +182,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,7 +193,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -201,7 +201,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, 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."
@@ -209,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:377
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -218,7 +218,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -230,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -245,14 +245,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -260,14 +260,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -276,14 +276,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: impossibile convertire"
@@ -292,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: carattere o sequenza di shift incompleto"
@@ -300,61 +300,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "Errore di I/O"
diff --git a/po/libiconv.pot b/po/libiconv.pot
index 4d2c12a..969ddf5 100644
--- a/po/libiconv.pot
+++ b/po/libiconv.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libiconv 1.12\n"
+"Project-Id-Version: GNU libiconv 1.13\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -19,24 +19,24 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr ""
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -44,91 +44,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr ""
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -137,27 +137,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -165,7 +165,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -174,14 +174,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -189,14 +189,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -206,7 +206,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -217,42 +217,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr ""
@@ -261,7 +261,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr ""
@@ -269,61 +269,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index c445849..6b9f532 100644
--- a/po/nl.po
+++ b/po/nl.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2007-12-27 20:29+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -20,24 +20,24 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Gebruik: iconv [-c] [-s] [-f vancode] [-t naarcode] [bestand ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Gebruik: %s [OPTIE...] [-f CODERING] [-t CODERING] [INVOERBESTAND...]\n"
@@ -45,24 +45,24 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "of:    %s -l\n"
 
 # Weet niet of "codering" herhaald hoeft te worden.
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Zet tekst om van één codering naar een andere.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Opties die weerslag hebben op het formaat van de in- en uitvoer:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -71,7 +71,7 @@
 "  -f CODERING, --from-code=CODERING\n"
 "                              de codering van de invoer\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -80,64 +80,64 @@
 "  -t CODERING, --to-code=CODERING\n"
 "                              de codering van de uitvoer\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Opties die weerslag hebben op omzettingsproblemen:\n"
 
 # of misschien "gooi ... weg"
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          laat onomzetbare tekens vallen\n"
 
 # Of iets als FORMATTERINGSTEKST?
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr "  --unicode-subst=TEKST       vervanging voor onomzetbare Unicode-tekens\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=TEKST          vervanging voor onomzetbare bytes\n"
 
 # iets beters dan "brede tekens"?
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr "  --widechar-subst=TEKST      vervanging voor onomzetbare brede tekens\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Opties die weerslag hebben op foutmeldingen:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                onderdruk meldingen van omzettingsproblemen\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  toon een lijst van de ondersteunde coderingen\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      toon deze hulptekst en beëindig het programma\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   toon versie-informatie en beëindig het programma\n"
@@ -146,16 +146,16 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 "Meld bugs aan <bug-gnu-libiconv@gnu.org>.\n"
 "Meld fouten in de vertaling aan <vertaling@vrijschrift.nl>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -165,14 +165,14 @@
 "Er is GEEN GARANTIE, voor zover dit wettelijk toegestaan is.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -182,7 +182,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -193,7 +193,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -202,7 +202,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s argument: De tekst stopt midden in een commando."
@@ -210,14 +210,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:377
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s argument: Het '%c' teken is geen geldige omzettingsspecificatie."
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -232,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -244,14 +244,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "kan Unicode-vervanging niet omzetten naar de doelcodering: %s"
@@ -259,7 +259,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:538
+#: src/iconv.c:536
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "kan byte-vervanging niet omzetten naar een brede tekenreeks: %s"
@@ -267,21 +267,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:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "kan brede tekenvervanging 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: omzetting onmogelijk"
@@ -291,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: onvolledig teken of onvolledige shift sequence"
@@ -299,61 +299,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: I/O fout"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "omzetting vanuit %s niet ondersteund"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "omzetting naar %s niet ondersteund"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "omzetting van %s naar %s niet ondersteund"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "probeer '%s -l' om de lijst van ondersteunde coderingen te krijgen"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "I/O fout"
diff --git a/po/pl.po b/po/pl.po
index 604d5ed..d00d13e 100644
--- a/po/pl.po
+++ b/po/pl.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2007-12-26 23:20+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -20,24 +20,24 @@
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Sk³adnia: iconv [-c] [-s] [f z_kodu] [-t do_kodu] [plik ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "lub:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' poka¿e wiêcej informacji.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Sk³adnia: %s [OPCJA...] [-f KODOWANIE] [-t KODOWANIE] [PLIK_WEJ...]\n"
@@ -45,23 +45,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "lub:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Konwersja tekstu z jednego kodowania do innego.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Opcje steruj±ce formatem wej¶cia i wyj¶cia:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -70,7 +70,7 @@
 "  -f KODOWANIE, --from-code=KODOWANIE\n"
 "                              kodowanie wej¶cia\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -79,17 +79,17 @@
 "  -t KODOWANIE, --to-code=KODOWANIE\n"
 "                              kodowanie wyj¶cia\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Opcje steruj±ce zagadnieniami konwersji:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          pominiêcie niekonwertowalnych znaków\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -98,12 +98,12 @@
 "  --unicode-subst=£AÑCUCH_FORMATUJ¡CY\n"
 "                              zamiennik dla niekonwertowalnych znaków Unicode\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=£AÑCUCH_FORMATUJ¡CY   zamiennik dla niekonwertowalnych bajtów\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -112,32 +112,32 @@
 "  --widechar-subst=£AÑCUCH_FORMATUJ¡CY\n"
 "                              zamiennik dla niekonwertowalnych znaków szerokich\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Opcje steruj±ce wyj¶ciem b³êdów:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                pominiêcie komunikatów b³êdów dotycz±cych konwersji\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Wyj¶cie informacyjne:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  wypisanie obs³ugiwanych kodowañ\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      wy¶wietlenie tego opisu i zakoñczenie\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   wy¶wietlenie informacji o wersji i zakoñczenie\n"
@@ -146,14 +146,14 @@
 #. 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:186
+#: src/iconv.c:184
 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:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -163,14 +163,14 @@
 
 # s TRANSLATORS: The %s placeholder expands to an author's name.
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -180,7 +180,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -191,7 +191,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -199,7 +199,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, 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."
@@ -207,14 +207,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -226,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -244,28 +244,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -274,14 +274,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: nie mo¿na skonwertowaæ"
@@ -290,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u niedokoñczony znak lub sekwencja shift"
@@ -298,61 +298,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "b³±d wej./wyj."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 58bca41..b10d400 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2002-07-22 03:50-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -18,24 +18,24 @@
 "Content-Transfer-Encoding: 8-bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uso: iconv [-c] [-s] [-f fromcode] [-t tocode] [arquivo ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ou:  iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -43,91 +43,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ou:  iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -136,27 +136,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +164,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +173,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +188,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +205,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -216,42 +216,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: impossível converter\n"
@@ -260,7 +260,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: seqüência de caracteres ou deslocamentos incompleta\n"
@@ -268,61 +268,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: erro de E/S\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversão de %s não é suportada\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversão para %s não é suportada\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversão de %s para %s não é suportada\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: erro de E/S\n"
diff --git a/po/rm.po b/po/rm.po
index 890c624..2ef42ad 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -18,7 +18,7 @@
 "X-Generator: KBabel 1.2\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Adöver: iconv [-c] [-s] [-f codificaziun d'origin] [-t codificaziun da "
@@ -26,18 +26,18 @@
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "obain:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -45,91 +45,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "obain:    iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -138,27 +138,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -166,7 +166,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -175,14 +175,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -190,14 +190,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -207,7 +207,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -218,42 +218,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nu poss convertir\n"
@@ -262,7 +262,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: segn incumplet o sequenza da translocaziun\n"
@@ -270,61 +270,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: sbagl I/O\n"
diff --git a/po/ro.po b/po/ro.po
index 547850c..c710815 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -17,24 +17,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Folosire: iconv [-c] [-s] [-f din_cod] [-t în_cod] [fiºier ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "sau:   iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -42,91 +42,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "sau:   iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -135,27 +135,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -163,7 +163,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -172,14 +172,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -187,14 +187,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -204,7 +204,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nu pot converti\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: caracter sau secvenþã de shift incomplete\n"
@@ -267,61 +267,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: erori I/O\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversia din %s nu este suportatã\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversia în %s nu este suportatã\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversia din %s în %s nu este suportatã\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: eroare I/O\n"
diff --git a/po/ru.po b/po/ru.po
index 57a172c..5321266 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2003-06-03 17:53+0400\n"
 "Last-Translator: Dmitry S. Sivachenko <mitya@cavia.pp.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -18,24 +18,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: iconv [-c] [-s] [-f fromcode] [-t tocode] [ÆÁÊÌ ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ÉÌÉ:   iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -43,91 +43,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ÉÌÉ:   iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -136,27 +136,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +164,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +173,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +188,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +205,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -216,42 +216,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ÎÅ ÕÄÁÅÔÓÑ ÐÒÅÏÂÒÁÚÏ×ÁÔØ\n"
@@ -260,7 +260,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ÎÅÐÏÌÎÙÊ ÓÉÍ×ÏÌ ÉÌÉ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÓÄ×ÉÇÁ\n"
@@ -268,61 +268,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ÏÛÉÂËÁ ××ÏÄÁ-×Ù×ÏÄÁ\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ × %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ %s × %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "incov: ÏÛÉÂËÁ ××ÏÄÁ-×Ù×ÏÄÁ\n"
diff --git a/po/sk.po b/po/sk.po
index aacfc46..e16b71c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-01-31 09:14+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -17,24 +17,24 @@
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Použitie: iconv [-c] [-s] [-f zkódovania] [-t dokódovania] [súbor ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "alebo:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pre viac informácií skúste použiť `%s --help'.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Použitie: %s [VOĽBA...] [-f KÓDOVANIA] [-t KÓDOVANIE] [VSTUPNÝSÚBOR...]\n"
@@ -42,23 +42,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "alebo:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Konvertuje text z jedného kódovania do iného kódovania.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Voľby ovplyvňujúce vstupný a výstupný formát:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -67,7 +67,7 @@
 "  -f KÓDOVANIE, --from-code=KÓDOVANIE\n"
 "                              kódovanie vstupu\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -76,17 +76,17 @@
 "  -t KÓDOVANIE, --to-code=KÓDOVANIE\n"
 "                              kódovanie výstupu\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Voľby ovplyvňujúce problémy s konverziou:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          vynechať nekonvertovateľné znaky\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -95,12 +95,12 @@
 "  --unicode-subst=FORMÁTOVÝREŤAZEC\n"
 "                              náhrada pre nekonvertovateľné znaky Unicode\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMÁTOVÝREŤAZEC   náhrada pre nekonvertovateľné bajty\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -109,32 +109,32 @@
 "  --widechar-subst=FORMÁTOVÝREŤAZEC\n"
 "                              náhrada pre nekonvertovateľné široké znaky\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Voľby ovplyvňujúce chybový výstup:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                potlačí chybové správy o problémoch s konverziou\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Infomatívny výstup:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  zoznam podporovaných kódovaní\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      zobraziť túto pomoc a skončiť\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   vypísať informáciu o verzii a skončiť\n"
@@ -143,17 +143,17 @@
 #. 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:186
+#: src/iconv.c:184
 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"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -162,14 +162,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -179,7 +179,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -190,7 +190,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -198,7 +198,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Parameter %s: Reťazec končí v strede direktívy."
@@ -206,14 +206,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -225,7 +225,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -243,28 +243,28 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
@@ -272,14 +272,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: nie je možné konvertovať"
@@ -288,7 +288,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: nekompletný znak alebo preraďovacia sekvencia"
@@ -296,61 +296,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "V/V chyba"
diff --git a/po/sl.po b/po/sl.po
index f3651a0..e6be235 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libiconv package.
 # Primož Peterlin <primozz.peterlin@gmail.com>, 2002, 2006, 2007, 2008.
-# $Id$
+# $Id: libiconv-1.12.sl.po 1.3 2008/04/27 19:23:24 Primoz Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -20,24 +20,24 @@
 "%100==4 ? 3 : 0);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f vh_nabor] [-t izh_nabor] [datoteka ...]<"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ali:     iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za več informacij.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Uporaba: %s [IZBIRA...] [-f KODIRANJE] [-t KODIRANJE] [DATOTEKA...]\n"
@@ -45,23 +45,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ali:     %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Pretvori besedilo iz enega kodnega nabora v drugega.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Izbire, ki določajo vhodni in izhodni zapis:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -70,7 +70,7 @@
 "  -f KODIRANJE, --from-code=KODIRANJE\n"
 "                              kodni nabor vhoda\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -79,17 +79,17 @@
 "  -t KODIRANJE, --to-code=KODIRANJE\n"
 "                              kodni nabor izhoda\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Izbire, ki določajo odziv na težave pri pretvorbi:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          zavrzi znake, ki jih ni mogoče pretvoriti\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -98,12 +98,12 @@
 "  --unicode-subst=OBLIKOVNI_NIZ\n"
 "                              zamenjava za nepretvorljive unikodne znake\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=OBLIKOVNI_NIZ  zamenjava za nepretvorljive bajte\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -112,32 +112,32 @@
 "  --widechar-subst=OBLIKOVNI_NIZ\n"
 "                              zamenjava za nepretvorljive široke znake\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Izbire, ki določajo izpis napak:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                brez poročil o napakah pri pretvorbi\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  izpiši podprte nabore znakov\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      izpiši ta navodila in končaj\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   izpiši informacijo o različici in končaj\n"
@@ -146,14 +146,14 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Napake javite na <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -162,14 +162,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -177,7 +177,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -187,14 +187,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argument %s: niz se konča sredi direktive."
@@ -202,14 +202,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -221,7 +221,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -237,42 +237,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u pretvorba ni mogoča"
@@ -281,7 +281,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u nepopolni znak ali pomično zaporedje"
@@ -289,61 +289,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "V/I napaka"
diff --git a/po/sq.po b/po/sq.po
index 56528f1..da57541 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -16,24 +16,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Përdorimi: iconv [-c] [-s] [-f ngakodi] [-t tekkodi] [file ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ose:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -41,91 +41,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ose:    iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -134,27 +134,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -162,7 +162,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -171,14 +171,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -186,14 +186,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -203,7 +203,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -214,42 +214,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: konvertimi është i pamundur\n"
@@ -258,7 +258,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: simbol apo sekuencë ndryshuesish e paplotë\n"
@@ -266,61 +266,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: gabim I/O\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konvertimi nga %s nuk suportohet\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konvertimi në %s nuk suportohet\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konvertimi nga %s në %s nuk suportohet\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: gabim I/O\n"
diff --git a/po/sr.po b/po/sr.po
index 613f534..53e0c54 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.11-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2006-09-05 12:58-0400\n"
 "Last-Translator: Aleksandar Jelenak <jelenak@verizon.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -16,24 +16,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Употреба: iconv [-c] [-s] [-f изкод] [-t укод] [датотека ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "или:      iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Покушај „%s --help“ за више информација.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Употреба: %s [ОПЦИЈА...] [-f КОД] [-t КОД] [УЛАЗДАТОТЕКА...]\n"
@@ -41,23 +41,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "или:      %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Претвара текст из једног кодовања у друго.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Опције контролисања улазног и излазног формата:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -66,7 +66,7 @@
 "  -f КОДОВАЊЕ, --from-code=КОДОВАЊЕ\n"
 "                              улазно кодовање\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -75,17 +75,17 @@
 "  -t КОДОВАЊЕ, --to-code=КОДОВАЊЕ\n"
 "                              излазно кодовање\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Опције контролисања проблема претварања:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          одбаци непретворљиве знакове\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -94,12 +94,12 @@
 "  --unicode-subst=ФОРМАТНИСКА\n"
 "                              замена за непретворљиве Уникод знакове\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=ФОРМАТНИСКА    замена за непретворљиве бајтове\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -108,32 +108,32 @@
 "  --widechar-subst=ФОРМАТНИСКА\n"
 "                              замена за непретворљиве широке знакове\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Опције контролисања исписа грешака:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                спречи поруке грешака о проблемима претварања\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Информативни испис:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  прикажи подржана кодовања\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      прикажи ово објашњење и заврши\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   испиши верзију и заврши\n"
@@ -142,27 +142,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Пријава грешака на <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -171,7 +171,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -181,14 +181,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s аргумент: Ниска завршава у сред наредбе."
@@ -196,14 +196,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -214,7 +214,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:399
+#: src/iconv.c:397
 #, fuzzy, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -227,42 +227,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, fuzzy, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "iconv: не може претворити широки знак замене у циљно кодовање: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:620
+#: src/iconv.c:618
 #, fuzzy, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "iconv: не може претворити бајт замене у циљно кодовање: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: не може претворити"
@@ -271,7 +271,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: непотпуни знаковни или шифт низ"
@@ -279,61 +279,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "У/И грешка"
diff --git a/po/sv.po b/po/sv.po
index 9fb8c3c..d14507e 100644
--- a/po/sv.po
+++ b/po/sv.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-02-09 20:58+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -19,24 +19,24 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Användning: iconv [-c] [-s] [-f frånkod] [-t tillkod] [fil ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prova \"%s --help\" för mer information.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Användning: %s [FLAGGA...] [-f KODNING] [-t KODNING] [INMATNINGSFIL...]\n"
@@ -44,23 +44,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "eller: %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Konverterar text från en kodning till en annan kodning.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Flaggor som styr formatet på inmatning och utmatning:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -69,7 +69,7 @@
 "  -f KODNING,  --from-code=KODNING\n"
 "                              kodningen på inmatningen\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -78,17 +78,17 @@
 "  -t KODNING,  --to-code=KODNING\n"
 "                              kodningen på utmatningen\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Flaggor som kontrollerar konverteringsproblem:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          förkasta tecken som inte går att konvertera\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -97,13 +97,13 @@
 "  --unicode-subst=FORMATSTRÄNG\n"
 "                              ersättning av Unicode-tecken som inte går att konvertera\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMATSTRÄNG   ersättning av inte konverterbara byte\n"
 
 # Breda tecken? Finns det bättre ord?
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -112,32 +112,32 @@
 "  --widechar-subst=FORMATSTRÄNG\n"
 "                              ersättning av inte konverterbara breda tecken\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Flaggor som kontrollerar felutskrift:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                tysta felmeddelanden om konverteringsproblem\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utmatning:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  lista kodningar som stöds\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      visa denna hjälp och avsluta\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   skriv ut versionsinformation och avsluta\n"
@@ -146,16 +146,16 @@
 #. 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:186
+#: src/iconv.c:184
 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"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -164,14 +164,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:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -180,7 +180,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -190,14 +190,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "Argument %s: Strängen slutar mitt i ett direktiv."
@@ -205,14 +205,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -224,7 +224,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -237,42 +237,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: kan inte konvertera"
@@ -281,7 +281,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: ofullständigt tecken eller skiftsekvens"
@@ -289,61 +289,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "In-/Ut-fel"
diff --git a/po/tr.po b/po/tr.po
index d644ca9..c69d171 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -18,24 +18,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Kullanım: iconv [-c] [-s] [-f kaynakkod] [-t hedefkod] [dosya ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "veya:  iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -43,91 +43,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "veya:  iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -136,27 +136,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +164,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +173,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +188,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +205,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -216,42 +216,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: dönüştürülemedi\n"
@@ -260,7 +260,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: eksik karakter ya da shift dizisi\n"
@@ -268,61 +268,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O hatası\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: %s'den dönüşüm desteklenmiyor\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: %s'e dönüşüm desteklenmiyor\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: %s'den %s'e dönüşüm desteklenmiyor\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O hatası\n"
diff --git a/po/uk.po b/po/uk.po
index 37de28d..54baf5d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2003-02-09 17:27+0200\n"
 "Last-Translator: Volodymyr M. Lisivka <lvm@mystery.lviv.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,25 +16,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "÷ÉËÏÒÉÓÔÁÎÎÑ: iconv [-c] [-s] [-f Ú_ËÏÄÕ×ÁÎÎÑ] [-t Õ_ËÏÄÕ×ÁÎÎÑ] [ÆÁÊÌ ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "ÁÂÏ:   iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -42,91 +42,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ÁÂÏ:   iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -135,27 +135,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -163,7 +163,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -172,14 +172,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -187,14 +187,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -204,7 +204,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ÎÅ ×ÄÁÌÏÓÑ ÐÅÒÅÔ×ÏÒÉÔÉ\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ÎÅÚÁ×ÅÒÛÅÎÉÊ ÓÉÍ×ÏÌ ÞÉ ÐÏÓ̦ÄÏ×ΦÓÔØ ÚͦÎÉ ÒÅǦÓÔÒÕ\n"
@@ -267,61 +267,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ÐÏÍÉÌËÁ ÷/÷\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Ú %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Õ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Ú %s Õ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "incov: ÐÏÍÉÌËÁ ÷/÷\n"
diff --git a/po/vi.po b/po/vi.po
index 84c4824..1d8abc6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2007-12-29 19:37+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
@@ -18,24 +18,24 @@
 "X-Generator: LocFactoryEditor 1.7b1\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Cách sử dụng: iconv [-c] [-s] [-f từ_mã] [-t đến_mã] [tập_tin ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "hoặc:    iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Hãy thử lệnh trợ giúp « %s --help » để xem thông tin thêm.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN...] [-f BẢNG_MÃ] [-t BẢNG_MÃ] [TẬP_TIN_NHẬP...]\n"
@@ -43,23 +43,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "hoặc:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Chuyển đổi văn bản từ bảng mã này sang bảng mã khác.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Các tùy chọn điều khiển định dạng nhập vào và xuất ra:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -68,7 +68,7 @@
 "  -f BẢNG_MÃ, --from-code=BẢNG_MÃ\n"
 "                              bảng mã của kết nhập\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -77,17 +77,17 @@
 "  -t BẢNG_MÃ, --to-code=BẢNG_MÃ\n"
 "                              bảng mã của kết xuất\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Các tùy chọn điều khiển vấn đề chuyển đổi:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          hủy Các ký tự không thể chuyển đổi\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -96,14 +96,14 @@
 "  --unicode-subst=CHUỖI_ĐỊNH_DẠNG\n"
 "                              thay thế các ký tự Unicode không thể chuyển đổi\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 "  --byte-subst=CHUỖI_ĐỊNH_DẠNG\n"
 "\t\t\t\t\t\tthay thế các byte không thể chuyển đổi\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -112,32 +112,32 @@
 "  --widechar-subst=CHUỖI_ĐỊNH_DẠNG\n"
 "                             \t\tthay thế các ký tự rộng không thể chuyển đổi\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Các tùy chọn điều khiển kết xuất lỗi:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                thu hồi các thông điệp về vấn đề chuyển đổi\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Xuất thông tin:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  Liệt kê các bảng mã được hỗ trợ\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      Hiển thị trợ giúp này rồi thoát\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 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"
@@ -146,14 +146,14 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Thông báo lỗi cho <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -162,14 +162,14 @@
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Tác giả: %s.\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -177,7 +177,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -187,14 +187,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, 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ị."
@@ -202,14 +202,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -221,7 +221,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -231,42 +231,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: không thể chuyển đổi"
@@ -275,7 +275,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:653
+#: src/iconv.c:651
 #, 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"
@@ -284,48 +284,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 msgid "(stdin)"
 msgstr "(thiết bị nhập chuẩn)"
 
@@ -333,13 +333,13 @@
 #. 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "Lỗi V/R"
diff --git a/po/wa.po b/po/wa.po
index d1b1954..64c804c 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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+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"
@@ -17,25 +17,25 @@
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Po s' è siervi: iconv [-c] [-s] [-f ecôd._sourd] [-t ecôd._såme] [fitchî...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "oudonbén:       iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Sayîz «%s --help» po pus di racsegnes.\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Po s' è siervi: %s [TCHUZE...] [-f ECÔDAEDJE] [FITCHÎ_INTRÊYE...]\n"
@@ -43,23 +43,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "oudonbén:    %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Kiviersaedje di tecse d' èn ecôdaedje a èn ôte ecôdaedje.\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Tchuzes po controler li cogne di l' intrêye et l' rexhowe:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -68,7 +68,7 @@
 "  -f ECÔDAEDJE, --from-code=ECÔDAEDJE\n"
 "                              l' ecôdaedje do tecse d' intrêye\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -77,17 +77,17 @@
 "  -t ECÔDAEDJE, --to-code=ECÔDAEDJE\n"
 "                              l' ecôdaedje do tecse e rexhowe\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Tchuzes po controler les problinmes di kiviersaedje:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          leyî toumer les caracteres ki n' polèt nén esse kiviersés\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -96,12 +96,12 @@
 "  --unicode-subst=TCHINNE_FORMAT\n"
 "                              replaeçaedje po les caracteres unicôde ki n' polèt nén esse kiviersés\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=TCHINNE_FORMAT   replaeçaedje po les octets ki n' polèt nén esse kiviersés\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -110,32 +110,32 @@
 "  --widechar-subst=TCHINNE_FORMAT\n"
 "                              replaeçaedje po les caracteres wchar ki n' polèt nén esse kiviersés\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Tchuzes po controler li rexhowe d' arokes:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                èn nén håyner les messaedjes d' aroke so les probinmes di cviersaedje\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Rexhowe d' informåcion:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  djivêye des ecôdaedjes sopoirtés\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      mostere ci messaedje d' aidance chal.\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   mostere des informåcions sol modêye do programe\n"
@@ -144,27 +144,27 @@
 #. 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:186
+#: src/iconv.c:184
 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:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -174,7 +174,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -185,7 +185,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
@@ -194,7 +194,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:370
+#: src/iconv.c:368
 #, 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."
@@ -202,7 +202,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:377
+#: src/iconv.c:375
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
@@ -211,7 +211,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -223,7 +223,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -236,14 +236,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
@@ -251,7 +251,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:538
+#: src/iconv.c:536
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
@@ -259,14 +259,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
@@ -274,7 +274,7 @@
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: dji n' sai fé l' kiviersaedje"
@@ -283,7 +283,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s: %u:%u: caractere ou secwince di candjmint nén complete"
@@ -291,61 +291,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "Aroke d' I/R"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9ed5fa8..5c18e7a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2008-11-12 09:51+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -19,24 +19,24 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "用法:iconv [-c] [-s] [-f 输入编码] [-t 输出编码] [文件 ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "尝试‘%s --help’以获得更多信息。\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "用法: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
@@ -44,23 +44,23 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "或者: %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "将文本从一种编码转换成另一种编码。\n"
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "控制输入输出格式的选项:\n"
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -69,7 +69,7 @@
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              输入编码\n"
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -78,17 +78,17 @@
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              输出编码\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "控制字符转换的选项:\n"
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          忽略不可转换的字符\n"
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -97,12 +97,12 @@
 "  --unicode-subst=FORMATSTRING\n"
 "                              替代不可转换的 Unicode 字符\n"
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMATSTRING   替代不可转换的字节\n"
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -111,32 +111,32 @@
 "  --widechar-subst=FORMATSTRING\n"
 "                              替代不可转换的宽字符\n"
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "控制错误输出的选项:\n"
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                不显示有关转换出错的信息\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "输出信息:\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  列出支持的编码\n"
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      显示此帮助并退出\n"
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   显示版本信息并退出\n"
@@ -145,16 +145,16 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 "请发送错误报告至 <bug-gnu-libiconv@gnu.org>。\n"
 "请将翻译错误发送至 <translation-team-zh-cn@lists.sourceforge.net>。\n"
 
-#: src/iconv.c:197
-#, no-wrap
+#: src/iconv.c:195
+#, fuzzy, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
@@ -163,14 +163,14 @@
 "在法律所允许的范围内,没有任何担保。\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -178,7 +178,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -187,14 +187,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s 参数: 字符串在命令中部终止。"
@@ -202,14 +202,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -219,7 +219,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -229,42 +229,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: 无法转换"
@@ -273,7 +273,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:653
+#: src/iconv.c:651
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: 不完整的字符或者替换序列"
@@ -281,61 +281,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:666
+#: src/iconv.c:664
 #, 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:821
+#: src/iconv.c:819
 #, 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:1009
+#: src/iconv.c:1007
 #, 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:1015
+#: src/iconv.c:1013
 #, 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:1021
+#: src/iconv.c:1019
 #, 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:1026
+#: src/iconv.c:1024
 #, 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:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, c-format
 msgid "I/O error"
 msgstr "输入/输出错误"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1cb42d0..eb479f3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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: 2008-09-26 14:10+0200\n"
+"POT-Creation-Date: 2009-03-26 13:12+0100\n"
 "PO-Revision-Date: 2005-08-25 10:54+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -18,24 +18,24 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:105
+#: src/iconv.c:103
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "用法:iconv [-c] [-s] [-f 來源編碼] [-t 目的編碼] [檔案 ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:109
+#: src/iconv.c:107
 msgid "or:    iconv -l"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:111
+#: src/iconv.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:116
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
@@ -43,91 +43,91 @@
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:123
+#: src/iconv.c:121
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "或:  iconv -l"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:129
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:131
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:136
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:138
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:145
+#: src/iconv.c:143
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:148
+#: src/iconv.c:146
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:151
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:155
+#: src/iconv.c:153
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:158
+#: src/iconv.c:156
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:163
+#: src/iconv.c:161
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:166
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:170
+#: src/iconv.c:168
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:173
+#: src/iconv.c:171
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:176
+#: src/iconv.c:174
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:179
+#: src/iconv.c:177
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
@@ -136,27 +136,27 @@
 #. 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:186
+#: src/iconv.c:184
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:197
+#: src/iconv.c:195
 #, no-wrap
 msgid ""
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
+"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"
 msgstr ""
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:203
+#: src/iconv.c:201
 #, 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:297
+#: src/iconv.c:295
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -164,7 +164,7 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:312
+#: src/iconv.c:310
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -173,14 +173,14 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:328
+#: src/iconv.c:326
 #, 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:370
+#: src/iconv.c:368
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
@@ -188,14 +188,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:377
+#: src/iconv.c:375
 #, 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:383
+#: src/iconv.c:381
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -205,7 +205,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:399
+#: src/iconv.c:397
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -215,42 +215,42 @@
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:457
+#: src/iconv.c:455
 #, 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:497
+#: src/iconv.c:495
 #, 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:538
+#: src/iconv.c:536
 #, 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:579
+#: src/iconv.c:577
 #, 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:620
+#: src/iconv.c:618
 #, 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:639
+#: src/iconv.c:637
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv:%s:無法轉換\n"
@@ -259,7 +259,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:653
+#: src/iconv.c:651
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv:%s:不完整的字元或是換碼序列\n"
@@ -267,61 +267,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:666
+#: src/iconv.c:664
 #, c-format
 msgid "%s:%u:%u"
 msgstr ""
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:821
+#: src/iconv.c:819
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv:%s:輸入輸出錯誤\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1009
+#: src/iconv.c:1007
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv:不支援從 %s 進行轉換\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1015
+#: src/iconv.c:1013
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv:不支援轉換到 %s\n"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1021
+#: src/iconv.c:1019
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv:不支援從 %s 轉換到 %s\n"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1026
+#: src/iconv.c:1024
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1083
+#: src/iconv.c:1081
 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:1095
+#: src/iconv.c:1093
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1109
+#: src/iconv.c:1107
 #, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv:輸入輸出錯誤\n"