Merged for 1.11.
diff --git a/po/af.po b/po/af.po
index fafe2e2..0529ac6 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -15,117 +15,117 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Gebruik so: iconv [-c] [-s] [-f vanaf-kode] [-t na-kode] [lêer ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "waarborg nie; selfs nie vir VERKOOPBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE "
 "DOEL nie.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geskryf deur %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: onvolledige karakter of skuifreeks\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: kan nie omskakeling doen nie\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: T/A-fout\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: omskakeling van %s word nie ondersteun nie\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: omskakeling na %s word nie ondersteun nie\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: omskakeling van %s na %s word nie ondersteun nie\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: T/A-fout\n"
 
diff --git a/po/ca.po b/po/ca.po
index 16b96d4..0a074f3 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -14,118 +14,118 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Forma d'ús: iconv [-c] [-s] [-f CODIF_ORIG] [-t CODIF_DEST] [FITXER ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "o:          iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "o:          iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o ADEQUACIÓ PER UN\n"
 "PROPÒSIT PARTICULAR.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, 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"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: no s'ha pogut convertir\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: error d'E/S\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: la conversió des de «%s» no és suportada\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: la conversió fins a «%s» no és suportada\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: la conversió des de «%s» fins a «%s» no és suportada\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(entrada estàndard)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, 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 4b0b7fe..9ebb049 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Brug: iconv [-c] [-s] [-f frakode] [-t tilkode] [fil ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -137,128 +137,131 @@
 "INGEN garanti; ikke engang for SALGBARHED eller EGNETHED FOR NOGET\n"
 "SÆRLIGT FORMÅL.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ufuldstændigt tegn eller skiftesekvens\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: kan ikke konvertere\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ind-/udskriftsfejl\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konvertering fra %s understøttes ikke\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konvertering til %s understøttes ikke\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konvertering fra %s til %s understøttes ikke\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(standard ind)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O-fejl\n"
 
diff --git a/po/de.po b/po/de.po
index 205fbb6..b10ce9e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.11-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2006-06-12 14:00+0200\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2006-07-04 05:11+0200\n"
 "Last-Translator: Bruno Haible <bruno@clisp.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -210,92 +210,97 @@
 "keine gültige Umwandlung."
 
 #: src/iconv.c:356
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+"»%s«-Argument: Die Formatzeichenkette verbraucht mehr als ein Argument: %u "
+"Argumente."
+msgstr[1] ""
 "»%s«-Argument: Die Formatzeichenkette verbraucht mehr als ein Argument: %u "
 "Argumente."
 
-#: src/iconv.c:408
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "Kann Byte-Ersatz nicht nach Unicode umwandeln: %s"
 
-#: src/iconv.c:444
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "Kann Unicode-Zeichen-Ersatz nicht in die Zielkodierung umwandeln: %s"
 
-#: src/iconv.c:481
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "Kann Byte-Ersatz nicht in eine »wide«-Zeichenkette umwandeln: %s"
 
-#: src/iconv.c:518
-#, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+#: src/iconv.c:521
+#, fuzzy, c-format
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 "iconv: Kann den »wide«-Zeichen-Ersatz nicht in die Zielkodierung umwandeln: %"
 "s"
 
-#: src/iconv.c:555
-#, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+#: src/iconv.c:558
+#, fuzzy, c-format
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "Kann Byte-Ersatz nicht in die Zielkodierung umwandeln: %s"
 
-#: src/iconv.c:589 src/iconv.c:633 src/iconv.c:707
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: unvollständiges Zeichen oder unvollständige Umschaltfolge"
 
-#: src/iconv.c:622 src/iconv.c:697
+#: src/iconv.c:625 src/iconv.c:700
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: Kann nicht umwandeln."
 
-#: src/iconv.c:664 src/iconv.c:727
+#: src/iconv.c:667 src/iconv.c:730
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
-#: src/iconv.c:739
+#: src/iconv.c:742
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Ein-/Ausgabefehler"
 
-#: src/iconv.c:923
+#: src/iconv.c:926
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "Umwandlung ausgehend von %s ist nicht unterstützt."
 
-#: src/iconv.c:925
+#: src/iconv.c:928
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "Umwandlung nach %s ist nicht unterstützt."
 
-#: src/iconv.c:927
+#: src/iconv.c:930
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "Umwandlung von %s nach %s ist nicht unterstützt."
 
-#: src/iconv.c:928
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 "Versuchen Sie »%s -l«, um eine Liste aller unterstützten Kodierungen zu "
 "erhalten."
 
-#: src/iconv.c:982
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(Standard-Eingabe)"
 
-#: src/iconv.c:990
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/iconv.c:1001
+#: src/iconv.c:1004
 #, c-format
 msgid "I/O error"
 msgstr "Ein-/Ausgabefehler"
diff --git a/po/el.po b/po/el.po
index ad6b337..ed8d148 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -14,117 +14,117 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Χρήση: iconv [-c] [-s] [-f από_κώδικα] [-t tocode] [αρχείο...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "είτε: iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "είτε: iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 " εγγύηση' ούτε ακόμα για ΕΜΠΟΡΕΥΜΑΤΟΠΟΙΗΣΗ ή ΚΑΤΑΛΗΛΟΤΗΤΑ ΓΙΑ ΕΝΑΝ "
 "ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Γράφτηκε από τον %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: μη ολοκληρωμένος χαρακτήρας ή shift συνέχεια\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: δεν μπορεί να γίνει η μετατροπή\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O σφάλμα\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: μετατροπή από %s μη υποστηριζόμενη\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: μετατροπή σε %s μη υποστηριζόμενη\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: μετατροπή από %s σε %s μη υποστηριζόμενη\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O σφάλμα\n"
 
diff --git a/po/eo.po b/po/eo.po
index 80235db..86740ba 100644
--- a/po/eo.po
+++ b/po/eo.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: 2006-06-12 14:00+0200\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2006-07-02 10:42+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -184,87 +184,91 @@
 "konvertospecifo."
 
 #: src/iconv.c:356
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+"%s argumento: La formatoĉeno konsumas pli ol unu argumenton: %u argumentoj."
+msgstr[1] ""
 "%s argumento: La formatoĉeno konsumas pli ol unu argumenton: %u argumentoj."
 
-#: src/iconv.c:408
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ne povas konverti bitoksubstituon al Unikodo: %s"
 
-#: src/iconv.c:444
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "ne povas konverti unikodan substituon al celkodo: %s"
 
-#: src/iconv.c:481
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "ne povas konverti bitoksubstituon al larĝa signoĉeno: %s"
 
-#: src/iconv.c:518
-#, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+#: src/iconv.c:521
+#, fuzzy, c-format
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "iconv: ne povas konverti larĝasignan substituon al celkodo: %s"
 
-#: src/iconv.c:555
-#, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+#: src/iconv.c:558
+#, fuzzy, c-format
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "iconv: ne povas konverti bitoksubstituon al celkodo: %s"
 
-#: src/iconv.c:589 src/iconv.c:633 src/iconv.c:707
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: malkompleta signo aŭ reĝimŝanĝa kodo"
 
-#: src/iconv.c:622 src/iconv.c:697
+#: src/iconv.c:625 src/iconv.c:700
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ne povas konverti"
 
-#: src/iconv.c:664 src/iconv.c:727
+#: src/iconv.c:667 src/iconv.c:730
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
-#: src/iconv.c:739
+#: src/iconv.c:742
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: leg/skrib-eraro"
 
-#: src/iconv.c:923
+#: src/iconv.c:926
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "konvertado de %s ne disponata"
 
-#: src/iconv.c:925
+#: src/iconv.c:928
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "konvertado al %s ne disponata"
 
-#: src/iconv.c:927
+#: src/iconv.c:930
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "konvertado de %s al %s ne disponata"
 
-#: src/iconv.c:928
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "provu '%s -l' por ricevi liston de konataj kodoj"
 
-#: src/iconv.c:982
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(normala enigo)"
 
-#: src/iconv.c:990
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/iconv.c:1001
+#: src/iconv.c:1004
 #, c-format
 msgid "I/O error"
 msgstr "leg/skrib-eraro"
diff --git a/po/es.po b/po/es.po
index 00aeedc..11658fe 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -15,117 +15,117 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Modo de empleo: iconv [-c] [-s] [-f desde] [-t hasta] [fichero ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "o bien: iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "o bien: iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
 "FIN DETERMINADO.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: carácter o secuencia de desplazamiento incompleta\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: no se puede convertir\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: error de E/S\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: no se admite la conversión de `%s'\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "no se admite la conversión a `%s'\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: no se admite la conversión de `%s' a `%s'\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(entrada estándar)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, 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 6ab839b..022b536 100644
--- a/po/et.po
+++ b/po/et.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2003-05-29 10:35+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,117 +15,117 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Kasutamine: iconv [-c] [-s] [-f koodist] [-t koodi] [fail ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "või:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "või:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks, vastavalt seadustega\n"
 "lubatud piiridele.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjutanud %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: mittetäielik sümbol või nihkejärjend\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ei saa teisendada\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: S/V viga\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: teisendust tabelist %s ei toetata\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: teisendust tabelisse %s ei toetata\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: teisendust %s -> %s ei toetata\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(standardsisend)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: S/V viga\n"
 
diff --git a/po/fi.po b/po/fi.po
index 2e5914d..058f9f6 100644
--- a/po/fi.po
+++ b/po/fi.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2002-07-05 13:43%z\n"
 "Last-Translator: Matti Koskimies <matti@apulanta.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -14,118 +14,118 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Käyttö: iconv [-c] [-s] [-f syöttökoodaus] [-t tuloskoodaus] [tiedosto ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "tai:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "tai:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen.\n"
 "Katso GPL-lisenssistä lisää yksityiskohtia.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjoittanut %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: epätäydellinen vaihto- tai merkkijono\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ei voi muuntaa\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O-virhe\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: muunnos %s-koodauksesta ei ole tuettu\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: muunnos %s-koodaukseen ei tuettu\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: muunnos %s-koodauksesta %s-koodaukseen ei ole tuettu\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(oletussyöte)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O-virhe\n"
 
diff --git a/po/fr.po b/po/fr.po
index 6ab4d34..bde836c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2004-05-10 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -15,117 +15,117 @@
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Usage: iconv [-c] [-s] [-f code_source] [-t code_cible] [fichier ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ou:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ou:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit pas %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: caractère incomplet ou séquence de décalage\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ne peut convertir\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ERREUR E/S\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversion à partir de %s non supportée\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversion vers %s non supportée\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversion à partir de %s vers %s non supportée\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: ERREUR E/S\n"
 
diff --git a/po/ga.po b/po/ga.po
index f5270a9..478f626 100644
--- a/po/ga.po
+++ b/po/ga.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: 2006-06-12 14:00+0200\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2006-07-16 14:58-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -190,92 +190,97 @@
 "mar shonraitheoir tiontaithe."
 
 #: src/iconv.c:356
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+"argóint %s: Úsáideann an teaghrán formáidithe níos mó ná aon argóint amháin: "
+"%u argóint."
+msgstr[1] ""
 "argóint %s: Úsáideann an teaghrán formáidithe níos mó ná aon argóint amháin: "
 "%u argóint."
 
-#: src/iconv.c:408
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "ní féidir ionadaíocht bhirt a thiontú go Unicode: %s"
 
-#: src/iconv.c:444
+#: src/iconv.c:447
 #, 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"
 
-#: src/iconv.c:481
+#: src/iconv.c:484
 #, 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"
 
-#: src/iconv.c:518
-#, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+#: src/iconv.c:521
+#, fuzzy, c-format
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 "iconv: ní féidir ionadaíocht widechar a thiontú go dtí an sprioc-ionchódú: %s"
 
-#: src/iconv.c:555
-#, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+#: src/iconv.c:558
+#, fuzzy, c-format
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 "iconv: ní féidir ionadaíocht bhirt a thiontú go dtí an sprioc-ionchódú: %s"
 
-#: src/iconv.c:589 src/iconv.c:633 src/iconv.c:707
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: carachtar nó seicheamh neamhiomlán"
 
-#: src/iconv.c:622 src/iconv.c:697
+#: src/iconv.c:625 src/iconv.c:700
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: ní féidir tiontú"
 
-#: src/iconv.c:664 src/iconv.c:727
+#: src/iconv.c:667 src/iconv.c:730
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
-#: src/iconv.c:739
+#: src/iconv.c:742
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: Earráid I/A"
 
-#: src/iconv.c:923
+#: src/iconv.c:926
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "ní thacaítear le tiontú ó %s"
 
-#: src/iconv.c:925
+#: src/iconv.c:928
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "ní thacaítear le tiontú go %s"
 
-#: src/iconv.c:927
+#: src/iconv.c:930
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "ní thacaítear le tiontú ó %s go %s"
 
-#: src/iconv.c:928
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 "bain triail as '%s -l' chun liosta de na hionchóduithe a dtacaítear leo a "
 "thaispeáint"
 
-#: src/iconv.c:982
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:990
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/iconv.c:1001
+#: src/iconv.c:1004
 #, c-format
 msgid "I/O error"
 msgstr "Earráid I/A"
diff --git a/po/gl.po b/po/gl.po
index c2b103c..678eb3b 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -14,117 +14,117 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Emprego: iconv [-c] [-s] [-f decodigo] [-t acodigo] [ficheiro ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ou:      iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ou:      iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "garantía; nin sequera de COMERCIABILIDADE ou APTITUDE PARA UN FIN "
 "DETERMINADO.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: secuencia de caracteres ou desprazamentos incompleta\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: non se pode converter\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: erro de E/S\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversión de %s non soportada\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversión a %s non soportada\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversión de %s a %s non soportada\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(entrada estándar)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, 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 06737d8..d6ccae5 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -18,117 +18,117 @@
 "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n"
 "X-Generator: TransDict server\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f izkoda] [-t ukod] [datoteka ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ili:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ili:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -138,128 +138,131 @@
 "kopiranja.  NEMA\n"
 "garancije; čak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisao %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: nezavršena znakovna ili shift sekvenca\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ne mogu konvertirati\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: U/I greška\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konverzija iz %s nije podržana\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konverzija u %s nije podržana\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konverzija iz %s u %s nije podržana\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, 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 eeb1e70..8930f78 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -15,117 +15,117 @@
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 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 ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "vagy:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "vagy:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,130 +136,133 @@
 "SEMMILYEN garanciát nem vállalunk, még azt sem állítjuk, hogy ez a program\n"
 "KERESKEDELMI CÉLOKRA ALKALMAS vagy HASZNÁLHATÓ EGY ADOTT FELADATRA.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Írta %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: nem egész karakter vagy eltolási szekvencia\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: konvertálás sikertelen\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O hiba\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, 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"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: a konvertálás erre a kódolásra (%s) nem támogatott\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr ""
 "iconv: a konvertálás errõl a kódolásról (%s)\n"
 "erre a kódlásra (%s) nem támogatott\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O hiba\n"
 
diff --git a/po/id.po b/po/id.po
index cdad140..cd56b42 100644
--- a/po/id.po
+++ b/po/id.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2002-10-15 15:22GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -17,117 +17,117 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Penggunaan: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "atau:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "atau:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: karakter atau urutan shift tidak lengkap\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: tidak dapat mengkonversi\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: kesalahan I/O\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konversi dari %s tidak didukung\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konversi ke %s tidak didukung\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konversi dari %s to %s tidak didukung\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: kesalahan I/O\n"
 
diff --git a/po/it.po b/po/it.po
index a8f52f9..cacbd31 100644
--- a/po/it.po
+++ b/po/it.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2002-12-02 23:06+0100\n"
 "Last-Translator: Marco Parrone <marc0@autistici.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -14,117 +14,117 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uso: iconv [-c] [-s] [-f dacodice] [-t acodice] [file ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "o:   iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "o:   iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "NON c'è alcuna garanzia; neanche di COMMERCIABILITÀ o APPLICABILITÀ PER UNO\n"
 "SCOPO PARTICOLARE.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: carattere o sequenza di modificatori incompleta\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: non è possibile convertire\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: errore di I/O\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: la conversione da %s non è supportata\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: la conversione verso %s non è supportata\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: la conversione da %s verso %s non è supportata\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: errore di I/O\n"
 
diff --git a/po/nl.po b/po/nl.po
index 61ef9bc..42380ca 100644
--- a/po/nl.po
+++ b/po/nl.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2003-08-04 22:20+0100\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Gebruik: iconv [-c] [-s] [-f vancode] [-t naarcode] [bestand ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "of:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: incompleet teken of verschuivingsreeks\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: kan niet converteren\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O fout\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversie van %s niet ondersteund\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversie naar %s niet ondersteund\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversie van %s naar %s niet ondersteund\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O fout\n"
 
diff --git a/po/pl.po b/po/pl.po
index 7a3633d..4b0a763 100644
--- a/po/pl.po
+++ b/po/pl.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2003-10-13 22:56+0100\n"
 "Last-Translator: Arkadiusz Lipiec <A.Lipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -15,117 +15,117 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "U¿ycie: iconv [-c] [-s] [f z_kodu] [-t do_kodu] [plik ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "lub:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "lub:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "licencji. Na oprogramowanie to nie jest udzielana ¯ADNA GWARANCJA; nawet\n"
 "gwarancja RÊKOJMI lub PRZYDATNO¦CI DO OKRE¦LONEGO CELU.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisane przez %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: niedokoñczony znak lub sekwencja shift\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nie mo¿na skonwertowaæ\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: b³±d wej./wyj.\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konwersja z kodu %s jest nieobs³ugiwana\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konwersja do kodu %s jest nieobs³ugiwana\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konwersja z kodu %s do kodu %s jest nieobs³ugiwana\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: b³±d wej./wyj.\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 948200d..75ad940 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uso: iconv [-c] [-s] [-f fromcode] [-t tocode] [arquivo ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ou:  iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ou:  iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -138,128 +138,131 @@
 "ou\n"
 "ADEQUAÇÃO À QUALQUER FINALIDADE PARTICULAR.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: seqüência de caracteres ou deslocamentos incompleta\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: impossível converter\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: erro de E/S\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversão de %s não é suportada\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversão para %s não é suportada\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversão de %s para %s não é suportada\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, 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 32a3cad..27ffc11 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -16,119 +16,119 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "Adöver: iconv [-c] [-s] [-f codificaziun d'origin] [-t codificaziun da "
 "destinaziun] [datoteca ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "obain:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "obain:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -139,128 +139,131 @@
 "I nu da INGÜNA garanzia; neir na per MARCHADANTIBILITÀ o per\n"
 "l'OPPORTUNITÀ PER ÜN BÖT PARTICULAR.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scrit da %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: segn incumplet o sequenza da translocaziun\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nu poss convertir\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: sbagl d'I/O\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversiun davent da %s na sustgnida\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversiun vers %s na sustgnida\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversiun da %s vers %s na sustgnida\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: sbagl I/O\n"
 
diff --git a/po/ro.po b/po/ro.po
index 54fefc9..7e75a2b 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -15,117 +15,117 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Folosire: iconv [-c] [-s] [-f din_cod] [-t în_cod] [fiºier ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "sau:   iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "sau:   iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, fuzzy, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "existã nici o garanþie; nici mãcarVANDABILITATEA sau MODIFICAREA ÎNTR-UN\n"
 "SCOP PRIVAT.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: caracter sau secvenþã de shift incomplete\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nu pot converti\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: erori I/O\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: conversia din %s nu este suportatã\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: conversia în %s nu este suportatã\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: conversia din %s în %s nu este suportatã\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: eroare I/O\n"
 
diff --git a/po/ru.po b/po/ru.po
index e01179c..65dba6f 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: iconv [-c] [-s] [-f fromcode] [-t tocode] [ÆÁÊÌ ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ÉÌÉ:   iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ÉÌÉ:   iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -137,128 +137,131 @@
 "ëïííåòþåóëïê\n"
 "ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒÙ: %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ÎÅÐÏÌÎÙÊ ÓÉÍ×ÏÌ ÉÌÉ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÓÄ×ÉÇÁ\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ÎÅ ÕÄÁÅÔÓÑ ÐÒÅÏÂÒÁÚÏ×ÁÔØ\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ÏÛÉÂËÁ ××ÏÄÁ-×Ù×ÏÄÁ\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ × %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ %s × %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "incov: ÏÛÉÂËÁ ××ÏÄÁ-×Ù×ÏÄÁ\n"
 
diff --git a/po/sk.po b/po/sk.po
index 3c41419..c0e0ba0 100644
--- a/po/sk.po
+++ b/po/sk.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2003-09-05 07:05+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -14,117 +14,117 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Použitie: iconv [-c] [-s] [-f z_kódu] [-t do kódu] [súbor ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "alebo:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "alebo:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "VHODNOSTI\n"
 "NA KONKRÉTNY ÚČEL.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: nekompletný znak alebo preraďovacia sekvencia\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: nemôžem konvertovať\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: V/V chyba\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konverzia z %s nie je podporovaná\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konverzia do %s nie je podporovaná\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konverzia z %s do %s nie je podporovaná\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(štandardný vstup)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: V/V chyba\n"
 
diff --git a/po/sl.po b/po/sl.po
index 307343f..16a3e30 100644
--- a/po/sl.po
+++ b/po/sl.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2002-08-13 15:09+0200\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f vh_nabor] [-t izh_nabor] [datoteka ...]<"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ali:   iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ali:   iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "raz¹irjate, so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
 "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: nepopolni znak ali pomièno zaporedje\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: pretvorba ni mogoèa\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: V/I napaka\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: pretvorba iz nabora %s ni podprta\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: pretvorba v nabor %s ni podprta\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: pretvorba iz nabora %s v nabor %s ni podprta\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: V/I napaka\n"
 
diff --git a/po/sq.po b/po/sq.po
index f4a7077..46063a9 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -14,117 +14,117 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Përdorimi: iconv [-c] [-s] [-f ngakodi] [-t tekkodi] [file ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ose:    iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ose:    iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -134,128 +134,131 @@
 "asnjë\n"
 "garanci; as për TREGËTI apo PËRDORIM PËR NJË QËLLIM TË VEÇANTË.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Shkruar nga %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: simbol apo sekuencë ndryshuesish e paplotë\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: konvertimi është i pamundur\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: gabim I/O\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konvertimi nga %s nuk suportohet\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konvertimi në %s nuk suportohet\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konvertimi nga %s në %s nuk suportohet\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: gabim I/O\n"
 
diff --git a/po/sr.po b/po/sr.po
index f5d4a9d..763b9ee 100644
--- a/po/sr.po
+++ b/po/sr.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2003-11-13 14:36-0500\n"
 "Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -14,117 +14,117 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Употреба: iconv [-c] [-s] [-f изкод] [-t укод] [датотека ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "или:      iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "или:      iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,131 @@
 "гаранција; чак ни о КОМЕРЦИЈАЛНОЈ ВРЕДНОСТИ или ИСПУЊАВАЊУ ОДРЕЂЕНЕ "
 "ПОТРЕБЕ.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написао %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: непотпуни знаковни или шифт низ\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: не може претворити\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: У/И грешка\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: претварање из %s није подржано\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: претварање у %s није подржано\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: претварање из %s у %s није подржано\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(стдул)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: У/И грешка\n"
 
diff --git a/po/sv.po b/po/sv.po
index cb812ff..1ecee9f 100644
--- a/po/sv.po
+++ b/po/sv.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2002-05-30 19:23+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Användning: iconv [-c] [-s] [-f frånkod] [-t tillkod] [fil ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "eller: iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
 "SPECIELLT ÄNDAMÅL.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ofullständigt tecken eller skiftsekvens\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: kan inte konvertera\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: in-/utmatningsfel\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: konvertering från %s stöds inte\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: konvertering till %s stöds inte\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: konvertering från %s till %s stöds inte\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(standard in)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O-fel\n"
 
diff --git a/po/tr.po b/po/tr.po
index 52becd0..6dfaf49 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -16,117 +16,117 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Kullanım: iconv [-c] [-s] [-f kaynakkod] [-t hedefkod] [dosya ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "veya:  iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "veya:  iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "HİÇ BİR garantisi yoktur; hatta SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA\n"
 "UYGUNLUĞU için dahi garanti verilmez.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Yazan: %s\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: eksik karakter ya da shift dizisi\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: dönüştürülemedi\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: I/O hatası\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: %s'den dönüşüm desteklenmiyor\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: %s'e dönüşüm desteklenmiyor\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: %s'den %s'e dönüşüm desteklenmiyor\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(standart girdi)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: I/O hatası\n"
 
diff --git a/po/uk.po b/po/uk.po
index 558920e..341f47b 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -14,118 +14,118 @@
 "Content-Type: text/plain; charset=KOI8-U\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr ""
 "÷ÉËÏÒÉÓÔÁÎÎÑ: iconv [-c] [-s] [-f Ú_ËÏÄÕ×ÁÎÎÑ] [-t Õ_ËÏÄÕ×ÁÎÎÑ] [ÆÁÊÌ ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ÁÂÏ:   iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ÁÂÏ:   iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "ëïíåòã¶êîï·\n"
 "ã¶îîïóô¶ ÁÂÏ ðòéäáôîïóô¶ äìñ ëïîëòåôîï· ã¶ì¶.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒ: %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: ÎÅÚÁ×ÅÒÛÅÎÉÊ ÓÉÍ×ÏÌ ÞÉ ÐÏÓ̦ÄÏ×ΦÓÔØ ÚͦÎÉ ÒÅǦÓÔÒÕ\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: ÎÅ ×ÄÁÌÏÓÑ ÐÅÒÅÔ×ÏÒÉÔÉ\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: ÐÏÍÉÌËÁ ÷/÷\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Ú %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Õ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: ÐÅÒÅÔ×ÏÒÅÎÎÑ Ú %s Õ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(ÓÔÄ. ×צÄ)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "incov: ÐÏÍÉÌËÁ ÷/÷\n"
 
diff --git a/po/vi.po b/po/vi.po
index 172af2c..1695a0e 100644
--- a/po/vi.po
+++ b/po/vi.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: 2006-06-12 14:00+0200\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2006-06-23 16:38+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
@@ -188,89 +188,92 @@
 "đổi hợp lệ."
 
 #: src/iconv.c:356
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr "Đối số %s: chuỗi dạng thức ăn nhiều đối số: %u đối số."
+msgstr[0] "Đối số %s: chuỗi dạng thức ăn nhiều đối số: %u đối số."
+msgstr[1] "Đối số %s: chuỗi dạng thức ăn nhiều đối số: %u đối số."
 
-#: src/iconv.c:408
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "không thể chuyển đổi sự thay thế byte sang Unicode: %s"
 
-#: src/iconv.c:444
+#: src/iconv.c:447
 #, 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"
 
-#: src/iconv.c:481
+#: src/iconv.c:484
 #, 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"
 
-#: src/iconv.c:518
-#, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+#: src/iconv.c:521
+#, fuzzy, c-format
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 "iconv: không thể chuyển đổi sự thay thế ký tự rộng sang bảng mã đích: %s"
 
-#: src/iconv.c:555
-#, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+#: src/iconv.c:558
+#, fuzzy, c-format
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "iconv: không thể chuyển đổi sự thay thế byte sang bảng mã đích: %s"
 
-#: src/iconv.c:589 src/iconv.c:633 src/iconv.c:707
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, 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 toàn"
 
-#: src/iconv.c:622 src/iconv.c:697
+#: src/iconv.c:625 src/iconv.c:700
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: không thể chuyển đổi"
 
 # Variable: don't translate / Biến: đừng dịch
-#: src/iconv.c:664 src/iconv.c:727
+#: src/iconv.c:667 src/iconv.c:730
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
-#: src/iconv.c:739
+#: src/iconv.c:742
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: lỗi nhập/xuất"
 
-#: src/iconv.c:923
+#: src/iconv.c:926
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "không hỗ trợ khả năng chuyển đổi từ %s"
 
-#: src/iconv.c:925
+#: src/iconv.c:928
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "không hỗ trợ khả năng chuyển đổi sang %s"
 
-#: src/iconv.c:927
+#: src/iconv.c:930
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "không hỗ trợ khả năng chuyển đổi từ %s sang %s"
 
-#: src/iconv.c:928
+#: src/iconv.c:931
 #, 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ợ"
 
-#: src/iconv.c:982
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(thiết bị nhập chuẩn)"
 
 # Variable: don't translate / Biến: đừng dịch
-#: src/iconv.c:990
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/iconv.c:1001
+#: src/iconv.c:1004
 #, c-format
 msgid "I/O error"
 msgstr "Lỗi nhập/xuất"
diff --git a/po/wa.po b/po/wa.po
index 7c52584..1505488 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2004-04-05 20:24+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -14,118 +14,118 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 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î...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "oudonbén:       iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "oudonbén:       iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -136,128 +136,131 @@
 "I n' a NOLE WAERANTEYE; nén minme ki vos VINDRÎZ bén\n"
 "li programe ou ki vos vs è SIEVRÎZ BÉN PO ENE SÔRE OU L' ÔTE.\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Sicrît pa %s.\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv: %s: caractere ou secwince di candjmint nén complete\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv: %s: dji n' sai fé l' kiviersaedje\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv: %s: "
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv: %s: aroke d' intrêye/rexhowe\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv: li cviersaedje a pårti d' l' ecôdaedje %s n' est nén sopoirté\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv: li cviersaedje viè l' ecôdaedje %s n' est nén sopoirté\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv: li cviersaedje di l' ecôdaedje %s viè %s n' est nén sopoirté\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(intrêye sitandård)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv: aroke d' intrêye/rexhowe\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d94a52e..83a5e52 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\n"
 "PO-Revision-Date: 2003-06-01 23:55+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -15,117 +15,117 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "用法:iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -134,128 +134,130 @@
 "这是自由软件;请查看源代码中的复制条件。本软件不提供任何担保,包括销售\n"
 "或者适用性担保。\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv:%s:不完整的字符或者换码序列\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv:%s:无法转换\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv:%s:"
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv:%s:输入输出错误\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv:不支持从 %s 进行转换\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv:不支持转换到 %s\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv:不支持从 %s 转换到 %s\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(标准输入)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv:输入输出错误\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b7671ed..df898e4 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: 2006-01-23 14:26+0100\n"
+"POT-Creation-Date: 2006-07-19 21:16+0200\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"
@@ -16,117 +16,117 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/iconv.c:80
+#: src/iconv.c:107
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "用法:iconv [-c] [-s] [-f 來源編碼] [-t 目的編碼] [檔案 ...]"
 
-#: src/iconv.c:82
+#: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:84
+#: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/iconv.c:87
+#: src/iconv.c:114
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr ""
 
-#: src/iconv.c:91
+#: src/iconv.c:118
 #, fuzzy, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "或:  iconv -l"
 
-#: src/iconv.c:96
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr ""
 
-#: src/iconv.c:100
+#: src/iconv.c:127
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr ""
 
-#: src/iconv.c:103
+#: src/iconv.c:130
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
 
-#: src/iconv.c:107
+#: src/iconv.c:134
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
 
-#: src/iconv.c:112
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr ""
 
-#: src/iconv.c:115
+#: src/iconv.c:142
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr ""
 
-#: src/iconv.c:118
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
 
-#: src/iconv.c:122
+#: src/iconv.c:149
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr ""
 
-#: src/iconv.c:125
+#: src/iconv.c:152
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
 
-#: src/iconv.c:130
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr ""
 
-#: src/iconv.c:133
+#: src/iconv.c:160
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr ""
 
-#: src/iconv.c:137
+#: src/iconv.c:164
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/iconv.c:140
+#: src/iconv.c:167
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr ""
 
-#: src/iconv.c:143
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr ""
 
-#: src/iconv.c:146
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr ""
 
-#: src/iconv.c:149
+#: src/iconv.c:176
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
 
-#: src/iconv.c:159
+#: src/iconv.c:186
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -135,128 +135,130 @@
 "這是自由軟體;請檢視原始碼中的複製條件。本軟體不提供任何擔保,包括銷售\n"
 "或是適用性擔保。\n"
 
-#: src/iconv.c:162
+#: src/iconv.c:189
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
 
-#: src/iconv.c:253
+#: src/iconv.c:280
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr ""
 
-#: src/iconv.c:264
+#: src/iconv.c:291
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
 msgstr ""
 
-#: src/iconv.c:276
+#: src/iconv.c:303
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr ""
 
-#: src/iconv.c:314
+#: src/iconv.c:341
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr ""
 
-#: src/iconv.c:316
+#: src/iconv.c:343
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:318
+#: src/iconv.c:345
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
 msgstr ""
 
-#: src/iconv.c:329
+#: src/iconv.c:356
 #, c-format
 msgid ""
+"%s argument: The format string consumes more than one argument: %u argument."
+msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr ""
+msgstr[0] ""
 
-#: src/iconv.c:381
+#: src/iconv.c:411
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr ""
 
-#: src/iconv.c:417
+#: src/iconv.c:447
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:454
+#: src/iconv.c:484
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr ""
 
-#: src/iconv.c:491
+#: src/iconv.c:521
 #, c-format
-msgid "iconv: cannot convert widechar substitution to target encoding: %s"
+msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:528
+#: src/iconv.c:558
 #, c-format
-msgid "iconv: cannot convert byte substitution to target encoding: %s"
+msgid "cannot convert byte substitution to target encoding: %s"
 msgstr ""
 
-#: src/iconv.c:562 src/iconv.c:606 src/iconv.c:680
+#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
 #, fuzzy, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "iconv:%s:不完整的字元或是換碼序列\n"
 
-#: src/iconv.c:595 src/iconv.c:670
+#: src/iconv.c:625 src/iconv.c:700
 #, fuzzy, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "iconv:%s:無法轉換\n"
 
-#: src/iconv.c:637 src/iconv.c:700
+#: src/iconv.c:667 src/iconv.c:730
 #, fuzzy, c-format
 msgid "%s:%u:%u"
 msgstr "iconv:%s:"
 
-#: src/iconv.c:712
+#: src/iconv.c:742
 #, fuzzy, c-format
 msgid "%s: I/O error"
 msgstr "iconv:%s:輸入輸出錯誤\n"
 
-#: src/iconv.c:896
+#: src/iconv.c:926
 #, fuzzy, c-format
 msgid "conversion from %s unsupported"
 msgstr "iconv:不支援從 %s 進行轉換\n"
 
-#: src/iconv.c:898
+#: src/iconv.c:928
 #, fuzzy, c-format
 msgid "conversion to %s unsupported"
 msgstr "iconv:不支援轉換到 %s\n"
 
-#: src/iconv.c:900
+#: src/iconv.c:930
 #, fuzzy, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "iconv:不支援從 %s 轉換到 %s\n"
 
-#: src/iconv.c:901
+#: src/iconv.c:931
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr ""
 
-#: src/iconv.c:955
+#: src/iconv.c:985
 msgid "(stdin)"
 msgstr "(標準輸入)"
 
-#: src/iconv.c:963
+#: src/iconv.c:993
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/iconv.c:974
-#, fuzzy
+#: src/iconv.c:1004
+#, fuzzy, c-format
 msgid "I/O error"
 msgstr "iconv:輸入輸出錯誤\n"