Updated translations.
diff --git a/po/ChangeLog b/po/ChangeLog
index b1ca9fc..78c4606 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15  Bruno Haible  <bruno@clisp.org>
+
+	* sl.po: Update from
+	Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>.
+
 2007-09-15  Bruno Haible  <bruno@clisp.org>
 
 	* eo.po: Update from Edmund Grimley Evans <edmundo@rano.org>.
diff --git a/po/sl.po b/po/sl.po
index a0d0544..710b9d3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,25 +1,30 @@
 # -*- mode:po; coding:utf-8; -*- Slovenian messages for libiconv.
-# Copyright (C) 2002, 2006 Free Software Foundation, Inc.
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2002, 2006.
+# Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
+# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2002, 2006, 2007.
 # This file is distributed under the same license as the libiconv package.
 # $Id$
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libiconv 1.11-pre1\n"
+"Project-Id-Version: libiconv 1.11\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2006-07-19 21:16+0200\n"
-"PO-Revision-Date: 2006-09-28 14:33+0200\n"
+"POT-Creation-Date: 2007-06-30 16:40+0200\n"
+"PO-Revision-Date: 2007-10-15 16:03+0200\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
-#: src/iconv.c:107
+#. TRANSLATORS: The first line of the short usage message.
+#: src/iconv.c:105
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "Uporaba: iconv [-c] [-s] [-f vh_nabor] [-t izh_nabor] [datoteka ...]<"
 
+#. TRANSLATORS: The second line of the short usage message.
+#. Align it correctly against the first line.
 #: src/iconv.c:109
 msgid "or:    iconv -l"
 msgstr "ali:   iconv -l"
@@ -29,27 +34,33 @@
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za več informacij.\n"
 
-#: src/iconv.c:114
+#. TRANSLATORS: The first line of the long usage message.
+#. The %s placeholder expands to the program name.
+#: src/iconv.c:116
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "Uporaba: %s [IZBIRA...] [-f KODIRANJE] [-t KODIRANJE] [DATOTEKA...]\n"
 
-#: src/iconv.c:118
+#. TRANSLATORS: The second line of the long usage message.
+#. Align it correctly against the first line.
+#. The %s placeholder expands to the program name.
+#: src/iconv.c:123
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "ali:     %s -l\n"
 
-#: src/iconv.c:123
+#. TRANSLATORS: Description of the iconv program.
+#: src/iconv.c:129
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "Pretvori besedilo iz enega kodnega nabora v drugega.\n"
 
-#: src/iconv.c:127
+#: src/iconv.c:133
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "Izbire, ki določajo vhodni in izhodni zapis:\n"
 
-#: src/iconv.c:130
+#: src/iconv.c:136
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -58,7 +69,7 @@
 "  -f KODIRANJE, --from-code=KODIRANJE\n"
 "                              kodni nabor vhoda\n"
 
-#: src/iconv.c:134
+#: src/iconv.c:140
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -67,17 +78,17 @@
 "  -t KODIRANJE, --to-code=KODIRANJE\n"
 "                              kodni nabor izhoda\n"
 
-#: src/iconv.c:139
+#: src/iconv.c:145
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "Izbire, ki določajo odziv na težave pri pretvorbi:\n"
 
-#: src/iconv.c:142
+#: src/iconv.c:148
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          zavrzi znake, ki jih ni mogoče pretvoriti\n"
 
-#: src/iconv.c:145
+#: src/iconv.c:151
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -86,12 +97,12 @@
 "  --unicode-subst=OBLIKOVNI_NIZ\n"
 "                              zamenjava za nepretvorljive unikodne znake\n"
 
-#: src/iconv.c:149
+#: src/iconv.c:155
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=OBLIKOVNI_NIZ  zamenjava za nepretvorljive bajte\n"
 
-#: src/iconv.c:152
+#: src/iconv.c:158
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -100,41 +111,45 @@
 "  --widechar-subst=OBLIKOVNI_NIZ\n"
 "                              zamenjava za nepretvorljive široke znake\n"
 
-#: src/iconv.c:157
+#: src/iconv.c:163
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "Izbire, ki določajo izpis napak:\n"
 
-#: src/iconv.c:160
+#: src/iconv.c:166
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                brez poročil o napakah pri pretvorbi\n"
 
-#: src/iconv.c:164
+#: src/iconv.c:170
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
 
-#: src/iconv.c:167
+#: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  izpiši podprte nabore znakov\n"
 
-#: src/iconv.c:170
+#: src/iconv.c:176
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      izpiši ta navodila in končaj\n"
 
-#: src/iconv.c:173
+#: src/iconv.c:179
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   izpiši informacijo o različici in končaj\n"
 
-#: src/iconv.c:176
+#. TRANSLATORS: This one line message is only for English.
+#. When translating, append a second line, telling where to report
+#. translation bugs; put in your translation team's email address or
+#. homepage.
+#: src/iconv.c:186
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr "Napake javite na <bug-gnu-libiconv@gnu.org>.\n"
 
-#: src/iconv.c:186
+#: src/iconv.c:196
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -144,18 +159,23 @@
 "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:189
+#. TRANSLATORS: The %s placeholder expands to an author's name.
+#: src/iconv.c:200
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
 
-#: src/iconv.c:280
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#: src/iconv.c:294
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
 msgstr "argument %s: oblikovna direktiva z nestalno širino tu ni dovoljena."
 
-#: src/iconv.c:291
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#: src/iconv.c:309
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -163,22 +183,31 @@
 msgstr ""
 "argument %s: oblikovna direktiva z nestalno natančnostjo tu ni dovoljena."
 
-#: src/iconv.c:303
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#: src/iconv.c:325
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "argument %s: oblikovna direktiva z velikostjo tu ni dovoljena."
 
-#: src/iconv.c:341
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#: src/iconv.c:367
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "argument %s: niz se konča sredi direktive."
 
-#: src/iconv.c:343
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#. The %c placeholder expands to an unknown format directive.
+#: src/iconv.c:374
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "argument %s: znak %c ni veljavno določilo pretvorbe."
 
-#: src/iconv.c:345
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#: src/iconv.c:380
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -187,93 +216,132 @@
 "argument %s: znak, ki zaključuje oblikovno direktivo, ni veljavno določilo "
 "pretvorbe."
 
-#: src/iconv.c:356
-#, fuzzy, c-format
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a command-line option.
+#. The %u placeholder expands to the number of arguments consumed by the format string.
+#: src/iconv.c:396
+#, 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[0] ""
 "argument %s: oblikovni niz porabi več kot en argument: %u argumentov."
-msgstr[1] ""
-"argument %s: oblikovni niz porabi več kot en argument: %u argumentov."
+msgstr[1] "argument %s: oblikovni niz porabi več kot en argument: %u argument."
+msgstr[2] ""
+"argument %s: oblikovni niz porabi več kot en argument: %u argumenta."
+msgstr[3] ""
+"argument %s: oblikovni niz porabi več kot en argument: %u argumente."
 
-#: src/iconv.c:411
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a piece of text, specified through --byte-subst.
+#: src/iconv.c:454
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "nadomestnega bajta ni mogoče pretvoriti v unikod: %s"
 
-#: src/iconv.c:447
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a piece of text, specified through --unicode-subst.
+#: src/iconv.c:494
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "nadomestnega unikoda ni mogoče pretvoriti v ciljni nabor: %s"
 
-#: src/iconv.c:484
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a piece of text, specified through --byte-subst.
+#: src/iconv.c:535
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "nadomestnega bajta ni mogoče pretvoriti v široki niz: %s"
 
-#: src/iconv.c:521
-#, fuzzy, c-format
-msgid "cannot convert widechar substitution to target encoding: %s"
-msgstr ""
-"iconv: pretvorba nadomestnega širokega znaka v ciljni nabor ni mogoča: %s"
-
-#: src/iconv.c:558
-#, fuzzy, c-format
-msgid "cannot convert byte substitution to target encoding: %s"
-msgstr "iconv: pretvorba nadomestnega bajta v ciljni nabor ni mogoča: %s"
-
-#: src/iconv.c:592 src/iconv.c:636 src/iconv.c:710
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a piece of text, specified through --widechar-subst.
+#: src/iconv.c:576
 #, c-format
-msgid "%s:%u:%u: incomplete character or shift sequence"
-msgstr "%s:%u:%u nepopolni znak ali pomično zaporedje"
+msgid "cannot convert widechar substitution to target encoding: %s"
+msgstr "pretvorba nadomestnega širokega znaka v ciljni nabor ni mogoča: %s"
 
-#: src/iconv.c:625 src/iconv.c:700
+#. TRANSLATORS: An error message.
+#. The %s placeholder expands to a piece of text, specified through --byte-subst.
+#: src/iconv.c:617
+#, c-format
+msgid "cannot convert byte substitution to target encoding: %s"
+msgstr "pretvorba nadomestnega bajta v ciljni nabor ni mogoča: %s"
+
+#. TRANSLATORS: An error message.
+#. The placeholders expand to the input file name, a line number, and a column number.
+#: src/iconv.c:636
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u pretvorba ni mogoča"
 
-#: src/iconv.c:667 src/iconv.c:730
+#. TRANSLATORS: An error message.
+#. The placeholders expand to the input file name, a line number, and a column number.
+#. A "shift sequence" is a sequence of bytes that changes the state of the converter;
+#. this concept exists only for "stateful" encodings like ISO-2022-JP.
+#: src/iconv.c:650
+#, c-format
+msgid "%s:%u:%u: incomplete character or shift sequence"
+msgstr "%s:%u:%u nepopolni znak ali pomično zaporedje"
+
+#. TRANSLATORS: The first part of an error message.
+#. It is followed by a colon and a detail message.
+#. The placeholders expand to the input file name, a line number, and a column number.
+#: src/iconv.c:663
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
-#: src/iconv.c:742
+#. TRANSLATORS: An error message.
+#. The placeholder expands to the input file name.
+#: src/iconv.c:818
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: V/I napaka"
 
-#: src/iconv.c:926
+#. TRANSLATORS: An error message.
+#. The placeholder expands to the encoding name, specified through --from-code.
+#: src/iconv.c:1006
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "pretvorba iz nabora %s ni podprta"
 
-#: src/iconv.c:928
+#. TRANSLATORS: An error message.
+#. The placeholder expands to the encoding name, specified through --to-code.
+#: src/iconv.c:1012
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "pretvorba v nabor %s ni podprta"
 
-#: src/iconv.c:930
+#. TRANSLATORS: An error message.
+#. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
+#: src/iconv.c:1018
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "pretvorba iz nabora %s v nabor %s ni podprta"
 
-#: src/iconv.c:931
+#. TRANSLATORS: Additional advice after an error message.
+#. The %s placeholder expands to the program name.
+#: src/iconv.c:1023
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "poskusite »%s -l« za seznam podprtih naborov znakov"
 
-#: src/iconv.c:985
+#. TRANSLATORS: A filename substitute denoting standard input.
+#: src/iconv.c:1080
 msgid "(stdin)"
 msgstr "(stdin)"
 
-#: src/iconv.c:993
+#. TRANSLATORS: The first part of an error message.
+#. It is followed by a colon and a detail message.
+#. The %s placeholder expands to the input file name.
+#: src/iconv.c:1092
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/iconv.c:1004
+#. TRANSLATORS: An error message.
+#: src/iconv.c:1106
 #, c-format
 msgid "I/O error"
 msgstr "V/I napaka"