Updated translation.
diff --git a/po/ChangeLog b/po/ChangeLog
index 1d9c6fe..30c1274 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-04 Bruno Haible <bruno@clisp.org>
+
+ * et.po: Update from Toomas Soome <Toomas.Soome@microlink.ee>.
+
2010-06-04 Bruno Haible <bruno@clisp.org>
* Makevars (MSGMERGE_OPTIONS): Define to empty.
diff --git a/po/et.po b/po/et.po
index d8ec98a..11323e8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,20 +1,21 @@
# Estonian translations for libiconv.
# Copyright (C) 2003 Free Software Foundation, Inc.
# This file is distributed under the same license as the libiconv package.
-# Toomas Soome <Toomas.Soome@microlink.ee>, 2006.
+# Toomas Soome <Toomas.Soome@microlink.ee>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: libiconv 1.11-pre1\n"
+"Project-Id-Version: libiconv 1.12\n"
"Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
"POT-Creation-Date: 2009-06-30 22:53+0200\n"
-"PO-Revision-Date: 2006-07-28 10:58+0300\n"
+"PO-Revision-Date: 2010-08-04 15:37+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
-"Language-Team: Estonian <et@li.org>\n"
+"Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: The first line of the short usage message.
#: src/iconv.c:103
@@ -148,12 +149,15 @@
msgstr "Vigadest teatage palun aadressil <bug-gnu-libiconv@gnu.org>.\n"
#: src/iconv.c:195
-#, no-wrap
+#, fuzzy, no-wrap
msgid ""
"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
+"Litsents GPLv2+: GNU GPL versioon 2 või uuem <http://gnu.org/licenses/gpl.html>\n"
+"See on vaba tarkvara: teil on lubatud seda muuta ja levitada.\n"
+"GARANTII PUDUB, vastavalt seadusega lubatud piiridele.\n"
#. TRANSLATORS: The %s placeholder expands to an author's name.
#: src/iconv.c:201
@@ -214,13 +218,13 @@
#. 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:397
-#, fuzzy, c-format
+#, 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] ""
-"%s argument: Vormingu sõne nõuab enam kui ühte argumenti: %u argumenti."
+"%s argument: Vormingu sõne nõuab enam kui ühte argumenti: %u argument."
msgstr[1] ""
"%s argument: Vormingu sõne nõuab enam kui ühte argumenti: %u argumenti."
@@ -248,16 +252,16 @@
#. TRANSLATORS: An error message.
#. The %s placeholder expands to a piece of text, specified through --widechar-subst.
#: src/iconv.c:577
-#, fuzzy, c-format
+#, c-format
msgid "cannot convert widechar substitution to target encoding: %s"
-msgstr "iconv: mitmebaidilisi sümboleid ei saa sihttabelisse teisendada: %s"
+msgstr "widechar sümboleid ei saa sihttabelisse teisendada: %s"
#. TRANSLATORS: An error message.
#. The %s placeholder expands to a piece of text, specified through --byte-subst.
#: src/iconv.c:618
-#, fuzzy, c-format
+#, c-format
msgid "cannot convert byte substitution to target encoding: %s"
-msgstr "iconv: baitide asendust ei saa sihttabelisse teisendada: %s"
+msgstr "baitide asendust ei saa sihttabelisse teisendada: %s"
#. TRANSLATORS: An error message.
#. The placeholders expand to the input file name, a line number, and a column number.
@@ -336,15 +340,3 @@
#, c-format
msgid "I/O error"
msgstr "S/V viga"
-
-#~ msgid ""
-#~ "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"
-#~ msgstr ""
-#~ "See on vaba tarkvara; kopeerimise tingimused leiate lähtetekstist. "
-#~ "Garantii\n"
-#~ "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks, vastavalt "
-#~ "seadustega\n"
-#~ "lubatud piiridele.\n"