diff --git a/po/ChangeLog b/po/ChangeLog
index fd4f1c6..cd55955 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-20  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
 2008-04-19  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/he.po b/po/he.po
index d47b222..fb64ee4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-19 03:53+0100\n"
+"POT-Creation-Date: 2008-03-29 22:13+0000\n"
 "PO-Revision-Date: 2005-07-14\n"
 "Last-Translator: Yair Hershkovitz <yairhr@gmail.com> \n"
 "Language-Team: Hebrew\n"
@@ -58,10 +58,12 @@ msgid "Display dialog boxes from shell scripts"
 msgstr "מציג תיבות דו-שיח בתסריטים"
 
 #: ../src/main.c:94
+#, c-format
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "You must specify a dialog type. See 'zenity --help' for details\n"
 
 #: ../src/notification.c:139
+#, c-format
 msgid "could not parse command from stdin\n"
 msgstr "could not parse command from stdin\n"
 
@@ -70,18 +72,22 @@ msgid "Zenity notification"
 msgstr "Zenity notification"
 
 #: ../src/scale.c:56
+#, c-format
 msgid "Maximum value must be greater than minimum value.\n"
 msgstr "Maximum value must be greater than minimum value.\n"
 
 #: ../src/scale.c:63
+#, c-format
 msgid "Value out of range.\n"
 msgstr "Value out of range.\n"
 
 #: ../src/tree.c:320
+#, c-format
 msgid "No column titles specified for List dialog.\n"
 msgstr "No column titles specified for List dialog.\n"
 
 #: ../src/tree.c:326
+#, c-format
 msgid "You should use only one List dialog type.\n"
 msgstr "You should use only one List dialog type.\n"
 
@@ -161,181 +167,187 @@ msgstr "אזהרה"
 msgid "_Enter new text:"
 msgstr "_הכנס טקסט חדש:"
 
-#: ../src/option.c:117
+#: ../src/option.c:119
 msgid "Set the dialog title"
 msgstr "Set the dialog title"
 
-#: ../src/option.c:118
+#: ../src/option.c:120
 msgid "TITLE"
 msgstr "TITLE"
 
-#: ../src/option.c:126
+#: ../src/option.c:128
 msgid "Set the window icon"
 msgstr "Set the window icon"
 
-#: ../src/option.c:127
+#: ../src/option.c:129
 msgid "ICONPATH"
 msgstr "ICONPATH"
 
-#: ../src/option.c:135
+#: ../src/option.c:137
 msgid "Set the width"
 msgstr "Set the width"
 
-#: ../src/option.c:136
+#: ../src/option.c:138
 msgid "WIDTH"
 msgstr "WIDTH"
 
-#: ../src/option.c:144
+#: ../src/option.c:146
 msgid "Set the height"
 msgstr "Set the height"
 
-#: ../src/option.c:145
+#: ../src/option.c:147
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: ../src/option.c:153
+#: ../src/option.c:155
 msgid "Set dialog timeout in seconds"
 msgstr "Set dialog timeout in seconds"
 
-#: ../src/option.c:168
+#. Timeout for closing the dialog
+#: ../src/option.c:157
+msgid "TIMEOUT"
+msgstr "TIMEOUT"
+
+#: ../src/option.c:171
 msgid "Display calendar dialog"
 msgstr "Display calendar dialog"
 
-#: ../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
+#: ../src/option.c:180 ../src/option.c:240 ../src/option.c:283
+#: ../src/option.c:316 ../src/option.c:418 ../src/option.c:548
+#: ../src/option.c:610 ../src/option.c:694 ../src/option.c:727
 msgid "Set the dialog text"
 msgstr "Set the dialog text"
 
-#: ../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
+#: ../src/option.c:181 ../src/option.c:241 ../src/option.c:250
+#: ../src/option.c:259 ../src/option.c:284 ../src/option.c:317
+#: ../src/option.c:419 ../src/option.c:516 ../src/option.c:549
+#: ../src/option.c:611 ../src/option.c:620 ../src/option.c:629
+#: ../src/option.c:695 ../src/option.c:728
 msgid "TEXT"
 msgstr "TEXT"
 
-#: ../src/option.c:186
+#: ../src/option.c:189
 msgid "Set the calendar day"
 msgstr "Set the calendar day"
 
-#: ../src/option.c:187
+#: ../src/option.c:190
 msgid "DAY"
 msgstr "DAY"
 
-#: ../src/option.c:195
+#: ../src/option.c:198
 msgid "Set the calendar month"
 msgstr "Set the calendar month"
 
-#: ../src/option.c:196
+#: ../src/option.c:199
 msgid "MONTH"
 msgstr "MONTH"
 
-#: ../src/option.c:204
+#: ../src/option.c:207
 msgid "Set the calendar year"
 msgstr "Set the calendar year"
 
-#: ../src/option.c:205
+#: ../src/option.c:208
 msgid "YEAR"
 msgstr "YEAR"
 
-#: ../src/option.c:213
+#: ../src/option.c:216
 msgid "Set the format for the returned date"
 msgstr "Set the format for the returned date"
 
-#: ../src/option.c:214
+#: ../src/option.c:217
 msgid "PATTERN"
 msgstr "PATTERN"
 
-#: ../src/option.c:228
+#: ../src/option.c:231
 msgid "Display text entry dialog"
 msgstr "Display text entry dialog"
 
-#: ../src/option.c:246
+#: ../src/option.c:249
 msgid "Set the entry text"
 msgstr "Set the entry text"
 
-#: ../src/option.c:255
+#: ../src/option.c:258
 msgid "Hide the entry text"
 msgstr "Hide the entry text"
 
-#: ../src/option.c:271
+#: ../src/option.c:274
 msgid "Display error dialog"
 msgstr "Display error dialog"
 
-#: ../src/option.c:289 ../src/option.c:322 ../src/option.c:615
-#: ../src/option.c:681
+#: ../src/option.c:292 ../src/option.c:325 ../src/option.c:637
+#: ../src/option.c:703
 msgid "Do not enable text wrapping"
 msgstr "Do not enable text wrapping"
 
-#: ../src/option.c:304
+#: ../src/option.c:307
 msgid "Display info dialog"
 msgstr "Display info dialog"
 
-#: ../src/option.c:337
+#: ../src/option.c:340
 msgid "Display file selection dialog"
 msgstr "Display file selection dialog"
 
-#: ../src/option.c:346
+#: ../src/option.c:349
 msgid "Set the filename"
 msgstr "Set the filename"
 
-#: ../src/option.c:347 ../src/option.c:640
+#: ../src/option.c:350 ../src/option.c:662
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: ../src/option.c:355
+#: ../src/option.c:358
 msgid "Allow multiple files to be selected"
 msgstr "Allow multiple files to be selected"
 
-#: ../src/option.c:364
+#: ../src/option.c:367
 msgid "Activate directory-only selection"
 msgstr "Activate directory-only selection"
 
-#: ../src/option.c:373
+#: ../src/option.c:376
 msgid "Activate save mode"
 msgstr "Activate save mode"
 
-#: ../src/option.c:382 ../src/option.c:451
+#: ../src/option.c:385 ../src/option.c:454
 msgid "Set output separator character"
 msgstr "Set output separator character"
 
-#: ../src/option.c:383 ../src/option.c:452
+#: ../src/option.c:386 ../src/option.c:455
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
-#: ../src/option.c:391
+#: ../src/option.c:394
 msgid "Confirm file selection if filename already exists"
 msgstr "Confirm file selection if filename already exists"
 
-#: ../src/option.c:406
+#: ../src/option.c:409
 msgid "Display list dialog"
 msgstr "Display list dialog"
 
-#: ../src/option.c:424
+#: ../src/option.c:427
 msgid "Set the column header"
 msgstr "Set the column header"
 
-#: ../src/option.c:425
+#: ../src/option.c:428
 msgid "COLUMN"
 msgstr "COLUMN"
 
-#: ../src/option.c:433
+#: ../src/option.c:436
 msgid "Use check boxes for first column"
 msgstr "Use check boxes for first column"
 
-#: ../src/option.c:442
+#: ../src/option.c:445
 msgid "Use radio buttons for first column"
 msgstr "Use radio buttons for first column"
 
-#: ../src/option.c:460
+#: ../src/option.c:463
 msgid "Allow multiple rows to be selected"
 msgstr "Allow multiple rows to be selected"
 
-#: ../src/option.c:469 ../src/option.c:648
+#: ../src/option.c:472 ../src/option.c:670
 msgid "Allow changes to text"
 msgstr "Allow changes to text"
 
-#: ../src/option.c:478
+#: ../src/option.c:481
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -343,233 +355,244 @@ msgstr ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 
-#: ../src/option.c:479 ../src/option.c:488
+#. Column index number to print out on a list dialog
+#: ../src/option.c:483 ../src/option.c:492
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../src/option.c:487
+#: ../src/option.c:491
 msgid "Hide a specific column"
 msgstr "Hide a specific column"
 
-#: ../src/option.c:502
+#: ../src/option.c:506
 msgid "Display notification"
 msgstr "Display notification"
 
-#: ../src/option.c:511
+#: ../src/option.c:515
 msgid "Set the notification text"
 msgstr "Set the notification text"
 
-#: ../src/option.c:520
+#: ../src/option.c:524
 msgid "Listen for commands on stdin"
 msgstr "Listen for commands on stdin"
 
-#: ../src/option.c:535
+#: ../src/option.c:539
 msgid "Display progress indication dialog"
 msgstr "Display progress indication dialog"
 
-#: ../src/option.c:553
+#: ../src/option.c:557
 msgid "Set initial percentage"
 msgstr "Set initial percentage"
 
-#: ../src/option.c:554
+#: ../src/option.c:558
 msgid "PERCENTAGE"
 msgstr "PERCENTAGE"
 
-#: ../src/option.c:562
+#: ../src/option.c:566
 msgid "Pulsate progress bar"
 msgstr "Pulsate progress bar"
 
-#: ../src/option.c:572
+#: ../src/option.c:576
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Dismiss the dialog when 100% has been reached"
 
-#: ../src/option.c:582
+#: ../src/option.c:586
 #, no-c-format
 msgid "Kill parent process if cancel button is pressed"
 msgstr "Kill parent process if cancel button is pressed"
 
-#: ../src/option.c:597
+#: ../src/option.c:601
 msgid "Display question dialog"
 msgstr "Display question dialog"
 
-#: ../src/option.c:630
+#: ../src/option.c:619
+msgid "Sets the label of the Ok button"
+msgstr "Sets the label of the Ok button"
+
+#: ../src/option.c:628
+msgid "Sets the label of the Cancel button"
+msgstr "Sets the label of the Cancel button"
+
+#: ../src/option.c:652
 msgid "Display text information dialog"
 msgstr "Display text information dialog"
 
-#: ../src/option.c:639
+#: ../src/option.c:661
 msgid "Open file"
 msgstr "Open file"
 
-#: ../src/option.c:663
+#: ../src/option.c:685
 msgid "Display warning dialog"
 msgstr "Display warning dialog"
 
-#: ../src/option.c:696
+#: ../src/option.c:718
 msgid "Display scale dialog"
 msgstr "Display scale dialog"
 
-#: ../src/option.c:714
+#: ../src/option.c:736
 msgid "Set initial value"
 msgstr "Set initial value"
 
-#: ../src/option.c:715 ../src/option.c:724 ../src/option.c:733
-#: ../src/option.c:742
+#: ../src/option.c:737 ../src/option.c:746 ../src/option.c:755
+#: ../src/option.c:764
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../src/option.c:723
+#: ../src/option.c:745
 msgid "Set minimum value"
 msgstr "Set minimum value"
 
-#: ../src/option.c:732
+#: ../src/option.c:754
 msgid "Set maximum value"
 msgstr "Set maximum value"
 
-#: ../src/option.c:741
+#: ../src/option.c:763
 msgid "Set step size"
 msgstr "Set step size"
 
-#: ../src/option.c:750
+#: ../src/option.c:772
 msgid "Print partial values"
 msgstr "Print partial values"
 
-#: ../src/option.c:759
+#: ../src/option.c:781
 msgid "Hide value"
 msgstr "Hide value"
 
-#: ../src/option.c:774
+#: ../src/option.c:796
 msgid "About zenity"
 msgstr "About zenity"
 
-#: ../src/option.c:783
+#: ../src/option.c:805
 msgid "Print version"
 msgstr "Print version"
 
-#: ../src/option.c:1425
+#: ../src/option.c:1454
 msgid "General options"
 msgstr "General options"
 
-#: ../src/option.c:1426
+#: ../src/option.c:1455
 msgid "Show general options"
 msgstr "Show general options"
 
-#: ../src/option.c:1436
+#: ../src/option.c:1465
 msgid "Calendar options"
 msgstr "Calendar options"
 
-#: ../src/option.c:1437
+#: ../src/option.c:1466
 msgid "Show calendar options"
 msgstr "Show calendar options"
 
-#: ../src/option.c:1447
+#: ../src/option.c:1476
 msgid "Text entry options"
 msgstr "Text entry options"
 
-#: ../src/option.c:1448
+#: ../src/option.c:1477
 msgid "Show text entry options"
 msgstr "Show text entry options"
 
-#: ../src/option.c:1458
+#: ../src/option.c:1487
 msgid "Error options"
 msgstr "Error options"
 
-#: ../src/option.c:1459
+#: ../src/option.c:1488
 msgid "Show error options"
 msgstr "Show error options"
 
-#: ../src/option.c:1469
+#: ../src/option.c:1498
 msgid "Info options"
 msgstr "Info options"
 
-#: ../src/option.c:1470
+#: ../src/option.c:1499
 msgid "Show info options"
 msgstr "Show info options"
 
-#: ../src/option.c:1480
+#: ../src/option.c:1509
 msgid "File selection options"
 msgstr "File selection options"
 
-#: ../src/option.c:1481
+#: ../src/option.c:1510
 msgid "Show file selection options"
 msgstr "Show file selection options"
 
-#: ../src/option.c:1491
+#: ../src/option.c:1520
 msgid "List options"
 msgstr "List options"
 
-#: ../src/option.c:1492
+#: ../src/option.c:1521
 msgid "Show list options"
 msgstr "Show list options"
 
-#: ../src/option.c:1502
+#: ../src/option.c:1531
 msgid "Notification icon options"
 msgstr "Notification icon options"
 
-#: ../src/option.c:1503
+#: ../src/option.c:1532
 msgid "Show notification icon options"
 msgstr "Show notification icon options"
 
-#: ../src/option.c:1513
+#: ../src/option.c:1542
 msgid "Progress options"
 msgstr "Progress options"
 
-#: ../src/option.c:1514
+#: ../src/option.c:1543
 msgid "Show progress options"
 msgstr "Show progress options"
 
-#: ../src/option.c:1524
+#: ../src/option.c:1553
 msgid "Question options"
 msgstr "Question options"
 
-#: ../src/option.c:1525
+#: ../src/option.c:1554
 msgid "Show question options"
 msgstr "Show question options"
 
-#: ../src/option.c:1535
+#: ../src/option.c:1564
 msgid "Warning options"
 msgstr "Warning options"
 
-#: ../src/option.c:1536
+#: ../src/option.c:1565
 msgid "Show warning options"
 msgstr "Show warning options"
 
-#: ../src/option.c:1546
+#: ../src/option.c:1575
 msgid "Scale options"
 msgstr "Scale options"
 
-#: ../src/option.c:1547
+#: ../src/option.c:1576
 msgid "Show scale options"
 msgstr "Show scale options"
 
-#: ../src/option.c:1557
+#: ../src/option.c:1586
 msgid "Text information options"
 msgstr "Text information options"
 
-#: ../src/option.c:1558
+#: ../src/option.c:1587
 msgid "Show text information options"
 msgstr "Show text information options"
 
-#: ../src/option.c:1568
+#: ../src/option.c:1597
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-#: ../src/option.c:1569
+#: ../src/option.c:1598
 msgid "Show miscellaneous options"
 msgstr "Show miscellaneous options"
 
-#: ../src/option.c:1594
+#: ../src/option.c:1623
+#, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr ""
 "This option is not available. Please see --help for all possible usages.\n"
 
-#: ../src/option.c:1598
+#: ../src/option.c:1627
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s is not supported for this dialog\n"
 
-#: ../src/option.c:1602
+#: ../src/option.c:1631
+#, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "Two or more dialog options specified\n"