Merged for 1.11.

Author: bhaible

po/af.po

@@ -7,125 +7,125 @@ msgid ""
 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"
 "MIME-Version: 1.0\n"
 "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 @@ msgstr ""
 "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"