diff --git a/po/ChangeLog b/po/ChangeLog
index 5ec59ea..992958f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-16  Priit Laes  <plaes@svn.gnome.org>
+
+	* et.po: Estonian translation update by Ivar Smolin.
+
 2007-08-16  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
 	* th.po: Updated Thai translation.
diff --git a/po/et.po b/po/et.po
index 3e00a87..a0a1860 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,18 +2,19 @@
 # Estonian translation of Zenity.
 #
 # Copyright (C) 2003-2006 Free Software Foundation, Inc
+# Copyright (C) 2007 The GNOME Project.
 # This file is distributed under the same license as the Zenity package.
 #
 # Priit Laes <amd store20 com>, 2003-2006.
-# Ivar Smolin <okul@linux.ee>, 2005, 2006.
+# Ivar Smolin <okul@linux.ee>, 2005-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Zenity HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-11 03:21+0100\n"
-"PO-Revision-Date: 2006-12-11 07:56+0300\n"
-"Last-Translator: Priit Laes <amd@store20.com>\n"
+"POT-Creation-Date: 2007-08-14 03:56+0100\n"
+"PO-Revision-Date: 2007-08-14 10:25+0300\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Gnome eesti <et-gnome@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +60,7 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Priit Laes <amd@store20.com>, 2003-2006.\n"
-"Ivar Smolin <okul@linux.ee>, 2005, 2006."
+"Ivar Smolin <okul@linux.ee>, 2005-2007."
 
 #: ../src/about.c:276
 msgid "Display dialog boxes from shell scripts"
@@ -70,11 +71,11 @@ msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr ""
 "Sa pead määrama dialoogiliigi. Lisateavet saad 'zenity --help' käsuga\n"
 
-#: ../src/notification.c:138
+#: ../src/notification.c:139
 msgid "could not parse command from stdin\n"
 msgstr "standardsisendist tulnud käsku pole võimalik töödelda\n"
 
-#: ../src/notification.c:251 ../src/notification.c:268
+#: ../src/notification.c:252 ../src/notification.c:269
 msgid "Zenity notification"
 msgstr "Zenity teadustus"
 
@@ -92,7 +93,7 @@ msgstr "Tulpade pealkirjad pole loendidialoogi jaoks määratud.\n"
 
 #: ../src/tree.c:326
 msgid "You should use only one List dialog type.\n"
-msgstr "Sa peaks kasutama ainult ühte loendidialoogi tüüpi\n"
+msgstr "Sa peaks kasutama ainult ühte loendidialoogi liiki\n"
 
 #: ../src/zenity.glade.h:1
 msgid "Add a new entry"
@@ -170,177 +171,181 @@ msgstr "Hoiatus"
 msgid "_Enter new text:"
 msgstr "_Sisesta uus tekst:"
 
-#: ../src/option.c:116
+#: ../src/option.c:117
 msgid "Set the dialog title"
 msgstr "Dialoogi pealkirja määramine"
 
-#: ../src/option.c:117
+#: ../src/option.c:118
 msgid "TITLE"
 msgstr "PEALKIRI"
 
-#: ../src/option.c:125
+#: ../src/option.c:126
 msgid "Set the window icon"
 msgstr "Akna ikooni määramine"
 
-#: ../src/option.c:126
+#: ../src/option.c:127
 msgid "ICONPATH"
 msgstr "IKOONIRADA"
 
-#: ../src/option.c:134
+#: ../src/option.c:135
 msgid "Set the width"
 msgstr "Laiuse seadmine"
 
-#: ../src/option.c:135
+#: ../src/option.c:136
 msgid "WIDTH"
 msgstr "LAIUS"
 
-#: ../src/option.c:143
+#: ../src/option.c:144
 msgid "Set the height"
 msgstr "Kõrguse seadmine"
 
-#: ../src/option.c:144
+#: ../src/option.c:145
 msgid "HEIGHT"
 msgstr "KÕRGUS"
 
-#: ../src/option.c:158
+#: ../src/option.c:153
+msgid "Set dialog timeout in seconds"
+msgstr "Dialoogi ajapiirangu määramine sekundites"
+
+#: ../src/option.c:168
 msgid "Display calendar dialog"
 msgstr "Kalendridialoogi kuvamine"
 
-#: ../src/option.c:167 ../src/option.c:227 ../src/option.c:270
-#: ../src/option.c:303 ../src/option.c:405 ../src/option.c:534
-#: ../src/option.c:596 ../src/option.c:662 ../src/option.c:695
+#: ../src/option.c:177 ../src/option.c:237 ../src/option.c:280
+#: ../src/option.c:313 ../src/option.c:415 ../src/option.c:544
+#: ../src/option.c:606 ../src/option.c:672 ../src/option.c:705
 msgid "Set the dialog text"
 msgstr "Dialoogi teksti määramine"
 
-#: ../src/option.c:168 ../src/option.c:228 ../src/option.c:237
-#: ../src/option.c:246 ../src/option.c:271 ../src/option.c:304
-#: ../src/option.c:406 ../src/option.c:502 ../src/option.c:535
-#: ../src/option.c:597 ../src/option.c:663 ../src/option.c:696
+#: ../src/option.c:178 ../src/option.c:238 ../src/option.c:247
+#: ../src/option.c:256 ../src/option.c:281 ../src/option.c:314
+#: ../src/option.c:416 ../src/option.c:512 ../src/option.c:545
+#: ../src/option.c:607 ../src/option.c:673 ../src/option.c:706
 msgid "TEXT"
 msgstr "TEKST"
 
-#: ../src/option.c:176
+#: ../src/option.c:186
 msgid "Set the calendar day"
 msgstr "Kalendri päeva määramine"
 
-#: ../src/option.c:177
+#: ../src/option.c:187
 msgid "DAY"
 msgstr "PÄEV"
 
-#: ../src/option.c:185
+#: ../src/option.c:195
 msgid "Set the calendar month"
 msgstr "Kalendri kuu määramine"
 
-#: ../src/option.c:186
+#: ../src/option.c:196
 msgid "MONTH"
 msgstr "KUU"
 
-#: ../src/option.c:194
+#: ../src/option.c:204
 msgid "Set the calendar year"
 msgstr "Kalendri aasta määramine"
 
-#: ../src/option.c:195
+#: ../src/option.c:205
 msgid "YEAR"
 msgstr "AASTA"
 
-#: ../src/option.c:203
+#: ../src/option.c:213
 msgid "Set the format for the returned date"
 msgstr "Tagastatava kuupäeva vormingu määramine"
 
-#: ../src/option.c:204
+#: ../src/option.c:214
 msgid "PATTERN"
 msgstr "MUSTER"
 
-#: ../src/option.c:218
+#: ../src/option.c:228
 msgid "Display text entry dialog"
 msgstr "Tekstisisestusdialoogi kuvamine"
 
-#: ../src/option.c:236
+#: ../src/option.c:246
 msgid "Set the entry text"
 msgstr "Teksti määramine"
 
-#: ../src/option.c:245
+#: ../src/option.c:255
 msgid "Hide the entry text"
 msgstr "Teksti peitmine"
 
-#: ../src/option.c:261
+#: ../src/option.c:271
 msgid "Display error dialog"
 msgstr "Veadialoogi kuvamine"
 
-#: ../src/option.c:279 ../src/option.c:312 ../src/option.c:605
-#: ../src/option.c:671
+#: ../src/option.c:289 ../src/option.c:322 ../src/option.c:615
+#: ../src/option.c:681
 msgid "Do not enable text wrapping"
 msgstr "Tekstimurdmise aktiveerimise keelamine"
 
-#: ../src/option.c:294
+#: ../src/option.c:304
 msgid "Display info dialog"
 msgstr "Teabedialoogi kuvamine"
 
-#: ../src/option.c:327
+#: ../src/option.c:337
 msgid "Display file selection dialog"
 msgstr "Failivalikudialoogi kuvamine"
 
-#: ../src/option.c:336
+#: ../src/option.c:346
 msgid "Set the filename"
 msgstr "Failinime määramine"
 
-#: ../src/option.c:337 ../src/option.c:630
+#: ../src/option.c:347 ../src/option.c:640
 msgid "FILENAME"
 msgstr "FAILINIMI"
 
-#: ../src/option.c:345
+#: ../src/option.c:355
 msgid "Allow multiple files to be selected"
 msgstr "Mitme faili samaaegset valimise lubamine"
 
-#: ../src/option.c:354
+#: ../src/option.c:364
 msgid "Activate directory-only selection"
 msgstr "Ainult kaustade valimise aktiveerimine"
 
-#: ../src/option.c:363
+#: ../src/option.c:373
 msgid "Activate save mode"
 msgstr "Salvestusrežiimi aktiveerimine"
 
-#: ../src/option.c:372 ../src/option.c:441
+#: ../src/option.c:382 ../src/option.c:451
 msgid "Set output separator character"
 msgstr "Väljundi eraldustähe määramine"
 
-#: ../src/option.c:373 ../src/option.c:442
+#: ../src/option.c:383 ../src/option.c:452
 msgid "SEPARATOR"
 msgstr "ERALDAJA"
 
-#: ../src/option.c:381
+#: ../src/option.c:391
 msgid "Confirm file selection if filename already exists"
 msgstr "Faili valikul kinnituse k[simine kui failinimi juba olemas on"
 
-#: ../src/option.c:396
+#: ../src/option.c:406
 msgid "Display list dialog"
 msgstr "Nimekirjadialoogi kuvamine"
 
-#: ../src/option.c:414
+#: ../src/option.c:424
 msgid "Set the column header"
 msgstr "Vali veeru päis"
 
-#: ../src/option.c:415
+#: ../src/option.c:425
 msgid "COLUMN"
 msgstr "VEERG"
 
-#: ../src/option.c:423
+#: ../src/option.c:433
 msgid "Use check boxes for first column"
 msgstr "Kasuta esimese veeru jaoks märkeruute"
 
-#: ../src/option.c:432
+#: ../src/option.c:442
 msgid "Use radio buttons for first column"
 msgstr "Kasuta esimese veeru jaoks raadionuppe"
 
-#: ../src/option.c:450
+#: ../src/option.c:460
 msgid "Allow multiple rows to be selected"
 msgstr "Luba mitme rea samaaegset valimist"
 
-#: ../src/option.c:459 ../src/option.c:638
+#: ../src/option.c:469 ../src/option.c:648
 msgid "Allow changes to text"
 msgstr "Luba teksti muuta"
 
-#: ../src/option.c:468
+#: ../src/option.c:478
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -348,263 +353,233 @@ msgstr ""
 "Trüki kindel tulp (Vaikimisi on 1. Kasutades 'ALL' parameetrit, saad "
 "väljastada kõik tulbad korraga)"
 
-#: ../src/option.c:469 ../src/option.c:478
+#: ../src/option.c:479 ../src/option.c:488
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../src/option.c:477
+#: ../src/option.c:487
 msgid "Hide a specific column"
 msgstr "Peida spetsiifiline veerg"
 
-#: ../src/option.c:492
+#: ../src/option.c:502
 msgid "Display notification"
 msgstr "Teadustuskuva"
 
-#: ../src/option.c:501
+#: ../src/option.c:511
 msgid "Set the notification text"
 msgstr "Teadustusteksti määramine"
 
-#: ../src/option.c:510
+#: ../src/option.c:520
 msgid "Listen for commands on stdin"
 msgstr "Kuula käske standardsisendist"
 
-#: ../src/option.c:525
+#: ../src/option.c:535
 msgid "Display progress indication dialog"
 msgstr "Kuva edenemisteabe dialoog"
 
-#: ../src/option.c:543
+#: ../src/option.c:553
 msgid "Set initial percentage"
 msgstr "Lähteprotsendi määramine"
 
-#: ../src/option.c:544
+#: ../src/option.c:554
 msgid "PERCENTAGE"
 msgstr "PROTSENT"
 
-#: ../src/option.c:552
+#: ../src/option.c:562
 msgid "Pulsate progress bar"
 msgstr "Pulseeriv olekuriba"
 
-#: ../src/option.c:562
+#: ../src/option.c:572
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Sulge dialoog kui 100% on saavutatud"
 
-#: ../src/option.c:572
+#: ../src/option.c:582
 #, no-c-format
 msgid "Kill parent process if cancel button is pressed"
 msgstr "Peata vanemprotsess tühistusnupu vajutamisel"
 
-#: ../src/option.c:587
+#: ../src/option.c:597
 msgid "Display question dialog"
 msgstr "Küsimusdialoogi kuvamine"
 
-#: ../src/option.c:620
+#: ../src/option.c:630
 msgid "Display text information dialog"
 msgstr "Tekstiteabedialoogi kuvamine"
 
-#: ../src/option.c:629
+#: ../src/option.c:639
 msgid "Open file"
 msgstr "Ava fail"
 
-#: ../src/option.c:653
+#: ../src/option.c:663
 msgid "Display warning dialog"
 msgstr "Hoiatusdialoogi kuvamine"
 
-#: ../src/option.c:686
+#: ../src/option.c:696
 msgid "Display scale dialog"
 msgstr "Skaaladialoogi kuvamine"
 
-#: ../src/option.c:704
+#: ../src/option.c:714
 msgid "Set initial value"
 msgstr "Lähteväärtuse määramine"
 
-#: ../src/option.c:705 ../src/option.c:714 ../src/option.c:723
-#: ../src/option.c:732
+#: ../src/option.c:715 ../src/option.c:724 ../src/option.c:733
+#: ../src/option.c:742
 msgid "VALUE"
 msgstr "VÄÄRTUS"
 
-#: ../src/option.c:713
+#: ../src/option.c:723
 msgid "Set minimum value"
 msgstr "Väikseima väärtuse seadmine"
 
-#: ../src/option.c:722
+#: ../src/option.c:732
 msgid "Set maximum value"
 msgstr "Suurima väärtuse seadmine"
 
-#: ../src/option.c:731
+#: ../src/option.c:741
 msgid "Set step size"
 msgstr "Sammu suuruse määramine"
 
-#: ../src/option.c:740
+#: ../src/option.c:750
 msgid "Print partial values"
 msgstr "Osaliste väärtuste printimine"
 
-#: ../src/option.c:749
+#: ../src/option.c:759
 msgid "Hide value"
 msgstr "Väärtuse peitmine"
 
-#: ../src/option.c:764
+#: ../src/option.c:774
 msgid "About zenity"
 msgstr "Zenity-st lähemalt"
 
-#: ../src/option.c:773
+#: ../src/option.c:783
 msgid "Print version"
 msgstr "Printversioon"
 
-#: ../src/option.c:1414
+#: ../src/option.c:1425
 msgid "General options"
 msgstr "Üldised seaded"
 
-#: ../src/option.c:1415
+#: ../src/option.c:1426
 msgid "Show general options"
 msgstr "Kuva üldised seaded"
 
-#: ../src/option.c:1425
+#: ../src/option.c:1436
 msgid "Calendar options"
 msgstr "Kalendriseaded"
 
-#: ../src/option.c:1426
+#: ../src/option.c:1437
 msgid "Show calendar options"
 msgstr "Kuva kalendriseaded"
 
-#: ../src/option.c:1436
+#: ../src/option.c:1447
 msgid "Text entry options"
 msgstr "Tekstisisestuse seaded"
 
-#: ../src/option.c:1437
+#: ../src/option.c:1448
 msgid "Show text entry options"
 msgstr "Kuva tekstisisestuse seaded"
 
-#: ../src/option.c:1447
+#: ../src/option.c:1458
 msgid "Error options"
 msgstr "Veaseaded"
 
-#: ../src/option.c:1448
+#: ../src/option.c:1459
 msgid "Show error options"
 msgstr "Kuva veaseaded"
 
-#: ../src/option.c:1458
+#: ../src/option.c:1469
 msgid "Info options"
 msgstr "Teabe valikud"
 
-#: ../src/option.c:1459
+#: ../src/option.c:1470
 msgid "Show info options"
 msgstr "Teabe valikute kuvamine"
 
-#: ../src/option.c:1469
+#: ../src/option.c:1480
 msgid "File selection options"
 msgstr "Failivalimise valikud"
 
-#: ../src/option.c:1470
+#: ../src/option.c:1481
 msgid "Show file selection options"
 msgstr "Failivalimise valikute kuvamine"
 
-#: ../src/option.c:1480
+#: ../src/option.c:1491
 msgid "List options"
 msgstr "Nimekirja valikud"
 
-#: ../src/option.c:1481
+#: ../src/option.c:1492
 msgid "Show list options"
 msgstr "Nimekirja valikute kuvamine"
 
-#: ../src/option.c:1491
+#: ../src/option.c:1502
 msgid "Notification icon options"
 msgstr "Teateikooni seaded"
 
-#: ../src/option.c:1492
+#: ../src/option.c:1503
 msgid "Show notification icon options"
 msgstr "Kuva teateikooni seaded"
 
-#: ../src/option.c:1502
+#: ../src/option.c:1513
 msgid "Progress options"
 msgstr "Edenemise seaded"
 
-#: ../src/option.c:1503
+#: ../src/option.c:1514
 msgid "Show progress options"
 msgstr "Edenemisteabe sätete kuvamine"
 
-#: ../src/option.c:1513
+#: ../src/option.c:1524
 msgid "Question options"
 msgstr "Küsimuse seaded"
 
-#: ../src/option.c:1514
+#: ../src/option.c:1525
 msgid "Show question options"
 msgstr "Küsimuse valikute kuvamine"
 
-#: ../src/option.c:1524
+#: ../src/option.c:1535
 msgid "Warning options"
 msgstr "Hoiatuse seaded"
 
-#: ../src/option.c:1525
+#: ../src/option.c:1536
 msgid "Show warning options"
 msgstr "Hoiatuse valikute kuvamine"
 
-#: ../src/option.c:1535
+#: ../src/option.c:1546
 msgid "Scale options"
 msgstr "Skaala valikud"
 
-#: ../src/option.c:1536
+#: ../src/option.c:1547
 msgid "Show scale options"
 msgstr "Skaala valikute näitamine"
 
-#: ../src/option.c:1546
+#: ../src/option.c:1557
 msgid "Text information options"
 msgstr "Tekstiteabe valikud"
 
-#: ../src/option.c:1547
+#: ../src/option.c:1558
 msgid "Show text information options"
 msgstr "Tekstiteabe valikute kuvamine"
 
-#: ../src/option.c:1557
+#: ../src/option.c:1568
 msgid "Miscellaneous options"
 msgstr "Mitmesugused seaded"
 
-#: ../src/option.c:1558
+#: ../src/option.c:1569
 msgid "Show miscellaneous options"
 msgstr "Kuva mitmesugused seaded"
 
-#: ../src/option.c:1583
+#: ../src/option.c:1594
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "See valik ei ole saadaval. Palun vaata --help võtit võimalike "
 "kasutusvõimaluste jaoks.\n"
 
-#: ../src/option.c:1587
+#: ../src/option.c:1598
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s ei ole selle dialoogitüübi poolt toetatud\n"
 
-#: ../src/option.c:1591
+#: ../src/option.c:1602
 msgid "Two or more dialog options specified\n"
-msgstr "Kaks või enam dialoogitüüpi määratud\n"
-
-#~ msgid "Orientation"
-#~ msgstr "Suund"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Salve suund"
-
-#~ msgid "Adjust the scale value."
-#~ msgstr "Skaala väärtuse kohandamine."
-
-#~ msgid "(C) 2003 Sun Microsystems"
-#~ msgstr "(C) 2003 Sun Microsystems"
-
-#~ msgid "Credits"
-#~ msgstr "Autorid"
-
-#~ msgid "Written by"
-#~ msgstr "Programmeerimine"
-
-#~ msgid "Translated by"
-#~ msgstr "Tõlge"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "About Zenity"
-#~ msgstr "Zenity-st lähemalt"
-
-#~ msgid "_Credits"
-#~ msgstr "_Autorid"
+msgstr "Määratud on kaks või enam dialoogiliiki\n"