diff --git a/po/ChangeLog b/po/ChangeLog
index 803c223..6800fa1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-15  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2007-08-15  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index e7d11f7..2fde3ff 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-23 15:53-0500\n"
+"POT-Creation-Date: 2007-08-15 18:03-0400\n"
 "PO-Revision-Date: 2005-07-03 13:39-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -16,49 +16,81 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/about.c:248
+#: ../src/about.c:65
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public Licence as published by the Free "
+"Software Foundation; either version 2 of the Licence, or (at your option) "
+"any later version.\n"
+
+#: ../src/about.c:69
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for "
+"more details.\n"
+
+#: ../src/about.c:73
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: ../src/about.c:264
 msgid "translator-credits"
 msgstr ""
 "Maintainer: Adam Weinberger <adamw@gnome.org>\n"
 "Alexander Winston <alexander.winston@comcast.net>"
 
-#: ../src/about.c:257
+#: ../src/about.c:276
 msgid "Display dialog boxes from shell scripts"
 msgstr "Display dialogue boxes from shell scripts"
 
-#: ../src/eggtrayicon.c:118
-msgid "Orientation"
-msgstr "Orientation"
-
-#: ../src/eggtrayicon.c:119
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
-#: ../src/main.c:93
+#: ../src/main.c:94
+#, c-format
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "You must specify a dialogue type. See 'zenity --help' for details\n"
 
-#: ../src/notification.c:161
+#: ../src/notification.c:139
+#, c-format
 msgid "could not parse command from stdin\n"
 msgstr "Could not parse command from stdin\n"
 
-#: ../src/notification.c:230 ../src/notification.c:259
+#: ../src/notification.c:252 ../src/notification.c:269
 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 dialogue.\n"
 
 #: ../src/tree.c:326
+#, c-format
 msgid "You should use only one List dialog type.\n"
 msgstr "You should use only one List dialogue type.\n"
 
@@ -71,217 +103,248 @@ msgid "Adjust the scale value"
 msgstr "Adjust the scale value"
 
 #: ../src/zenity.glade.h:3
-msgid "Adjust the scale value."
-msgstr "Adjust the scale value."
-
-#: ../src/zenity.glade.h:4
 msgid "All updates are complete."
 msgstr "All updates are complete."
 
-#: ../src/zenity.glade.h:5
+#: ../src/zenity.glade.h:4
 msgid "An error has occurred."
 msgstr "An error has occurred."
 
-#: ../src/zenity.glade.h:6
+#: ../src/zenity.glade.h:5
 msgid "Are you sure you want to proceed?"
 msgstr "Are you sure you want to proceed?"
 
-#: ../src/zenity.glade.h:7
+#: ../src/zenity.glade.h:6
 msgid "C_alendar:"
 msgstr "C_alendar:"
 
-#: ../src/zenity.glade.h:8
+#: ../src/zenity.glade.h:7
 msgid "Calendar selection"
 msgstr "Calendar selection"
 
-#: ../src/zenity.glade.h:9
+#: ../src/zenity.glade.h:8
 msgid "Error"
 msgstr "Error"
 
-#: ../src/zenity.glade.h:10
+#: ../src/zenity.glade.h:9
 msgid "Information"
 msgstr "Information"
 
-#: ../src/zenity.glade.h:11
+#: ../src/zenity.glade.h:10
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/zenity.glade.h:12
+#: ../src/zenity.glade.h:11
 msgid "Question"
 msgstr "Question"
 
-#: ../src/zenity.glade.h:13
+#: ../src/zenity.glade.h:12
 msgid "Running..."
 msgstr "Running..."
 
-#: ../src/zenity.glade.h:14
+#: ../src/zenity.glade.h:13
 msgid "Select a date from below."
 msgstr "Select a date from below."
 
-#: ../src/zenity.glade.h:15
+#: ../src/zenity.glade.h:14
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../src/zenity.glade.h:16
+#: ../src/zenity.glade.h:15
 msgid "Select items from the list"
 msgstr "Select items from the list"
 
-#: ../src/zenity.glade.h:17
+#: ../src/zenity.glade.h:16
 msgid "Select items from the list below."
 msgstr "Select items from the list below."
 
-#: ../src/zenity.glade.h:18
+#: ../src/zenity.glade.h:17
 msgid "Text View"
 msgstr "Text View"
 
-#: ../src/zenity.glade.h:19
+#: ../src/zenity.glade.h:18
 msgid "Warning"
 msgstr "Warning"
 
-#: ../src/zenity.glade.h:20
+#: ../src/zenity.glade.h:19
 msgid "_Enter new text:"
 msgstr "_Enter new text:"
 
-#: ../src/option.c:114
+#: ../src/option.c:117
 msgid "Set the dialog title"
 msgstr "Set the dialogue title"
 
-#: ../src/option.c:115
+#: ../src/option.c:118
 msgid "TITLE"
 msgstr "TITLE"
 
-#: ../src/option.c:123
+#: ../src/option.c:126
 msgid "Set the window icon"
 msgstr "Set the window icon"
 
-#: ../src/option.c:124
+#: ../src/option.c:127
 msgid "ICONPATH"
 msgstr "ICONPATH"
 
-#: ../src/option.c:132
+#: ../src/option.c:135
 msgid "Set the width"
 msgstr "Set the width"
 
-#: ../src/option.c:133
+#: ../src/option.c:136
 msgid "WIDTH"
 msgstr "WIDTH"
 
-#: ../src/option.c:141
+#: ../src/option.c:144
 msgid "Set the height"
 msgstr "Set the height"
 
-#: ../src/option.c:142
+#: ../src/option.c:145
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: ../src/option.c:156
+#: ../src/option.c:153
+msgid "Set dialog timeout in seconds"
+msgstr "Set dialogue timeout in seconds"
+
+#: ../src/option.c:168
 msgid "Display calendar dialog"
 msgstr "Display calendar dialogue"
 
-#: ../src/option.c:165 ../src/option.c:225 ../src/option.c:268
-#: ../src/option.c:301 ../src/option.c:394 ../src/option.c:523
-#: ../src/option.c:575 ../src/option.c:641 ../src/option.c:674
+#: ../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 "Set the dialogue text"
 
-#: ../src/option.c:174
+#: ../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 "TEXT"
+
+#: ../src/option.c:186
 msgid "Set the calendar day"
 msgstr "Set the calendar day"
 
-#: ../src/option.c:183
+#: ../src/option.c:187
+msgid "DAY"
+msgstr "DAY"
+
+#: ../src/option.c:195
 msgid "Set the calendar month"
 msgstr "Set the calendar month"
 
-#: ../src/option.c:192
+#: ../src/option.c:196
+msgid "MONTH"
+msgstr "MONTH"
+
+#: ../src/option.c:204
 msgid "Set the calendar year"
 msgstr "Set the calendar year"
 
-#: ../src/option.c:201
+#: ../src/option.c:205
+msgid "YEAR"
+msgstr "YEAR"
+
+#: ../src/option.c:213
 msgid "Set the format for the returned date"
 msgstr "Set the format for the returned date"
 
-#: ../src/option.c:216
+#: ../src/option.c:214
+msgid "PATTERN"
+msgstr "PATTERN"
+
+#: ../src/option.c:228
 msgid "Display text entry dialog"
 msgstr "Display text entry dialogue"
 
-#: ../src/option.c:234
+#: ../src/option.c:246
 msgid "Set the entry text"
 msgstr "Set the entry text"
 
-#: ../src/option.c:243
+#: ../src/option.c:255
 msgid "Hide the entry text"
 msgstr "Hide the entry text"
 
-#: ../src/option.c:259
+#: ../src/option.c:271
 msgid "Display error dialog"
 msgstr "Display error dialogue"
 
-#: ../src/option.c:277 ../src/option.c:310 ../src/option.c:584
-#: ../src/option.c:650
+#: ../src/option.c:289 ../src/option.c:322 ../src/option.c:615
+#: ../src/option.c:681
 msgid "Do not enable text wrapping"
 msgstr "Do not enable text wrapping"
 
-#: ../src/option.c:292
+#: ../src/option.c:304
 msgid "Display info dialog"
 msgstr "Display info dialogue"
 
-#: ../src/option.c:325
+#: ../src/option.c:337
 msgid "Display file selection dialog"
 msgstr "Display file selection dialogue"
 
-#: ../src/option.c:334
+#: ../src/option.c:346
 msgid "Set the filename"
 msgstr "Set the filename"
 
-#: ../src/option.c:335 ../src/option.c:609
+#: ../src/option.c:347 ../src/option.c:640
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: ../src/option.c:343
+#: ../src/option.c:355
 msgid "Allow multiple files to be selected"
 msgstr "Allow multiple files to be selected"
 
-#: ../src/option.c:352
+#: ../src/option.c:364
 msgid "Activate directory-only selection"
 msgstr "Activate directory-only selection"
 
-#: ../src/option.c:361
+#: ../src/option.c:373
 msgid "Activate save mode"
 msgstr "Activate save mode"
 
-#: ../src/option.c:370 ../src/option.c:430
+#: ../src/option.c:382 ../src/option.c:451
 msgid "Set output separator character"
 msgstr "Set output separator character"
 
-#: ../src/option.c:371 ../src/option.c:431
+#: ../src/option.c:383 ../src/option.c:452
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
-#: ../src/option.c:385
+#: ../src/option.c:391
+msgid "Confirm file selection if filename already exists"
+msgstr "Confirm file selection if filename already exists"
+
+#: ../src/option.c:406
 msgid "Display list dialog"
 msgstr "Display list dialogue"
 
-#: ../src/option.c:403
+#: ../src/option.c:424
 msgid "Set the column header"
 msgstr "Set the column header"
 
-#: ../src/option.c:412
+#: ../src/option.c:425
+msgid "COLUMN"
+msgstr "COLUMN"
+
+#: ../src/option.c:433
 msgid "Use check boxes for first column"
 msgstr "Use check boxes for first column"
 
-#: ../src/option.c:421
+#: ../src/option.c:442
 msgid "Use radio buttons for first column"
 msgstr "Use radio buttons for first column"
 
-#: ../src/option.c:439
+#: ../src/option.c:460
 msgid "Allow multiple rows to be selected"
 msgstr "Allow multiple rows to be selected"
 
-#: ../src/option.c:448 ../src/option.c:617
+#: ../src/option.c:469 ../src/option.c:648
 msgid "Allow changes to text"
 msgstr "Allow changes to text"
 
-#: ../src/option.c:457
+#: ../src/option.c:478
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -289,214 +352,234 @@ msgstr ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 
-#: ../src/option.c:466
+#: ../src/option.c:479 ../src/option.c:488
+msgid "NUMBER"
+msgstr "NUMBER"
+
+#: ../src/option.c:487
 msgid "Hide a specific column"
 msgstr "Hide a specific column"
 
-#: ../src/option.c:481
+#: ../src/option.c:502
 msgid "Display notification"
 msgstr "Display notification"
 
-#: ../src/option.c:490
+#: ../src/option.c:511
 msgid "Set the notification text"
 msgstr "Set the notification text"
 
-#: ../src/option.c:499
+#: ../src/option.c:520
 msgid "Listen for commands on stdin"
 msgstr "Listen for commands on stdin"
 
-#: ../src/option.c:514
+#: ../src/option.c:535
 msgid "Display progress indication dialog"
 msgstr "Display progress indication dialogue"
 
-#: ../src/option.c:532
+#: ../src/option.c:553
 msgid "Set initial percentage"
 msgstr "Set initial percentage"
 
-#: ../src/option.c:541
+#: ../src/option.c:554
+msgid "PERCENTAGE"
+msgstr "PERCENTAGE"
+
+#: ../src/option.c:562
 msgid "Pulsate progress bar"
 msgstr "Pulsate progress bar"
 
-#: ../src/option.c:551
+#: ../src/option.c:572
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Dismiss the dialogue when 100% has been reached"
 
-#: ../src/option.c:566
+#: ../src/option.c:582
+#, 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
 msgid "Display question dialog"
 msgstr "Display question dialogue"
 
-#: ../src/option.c:599
+#: ../src/option.c:630
 msgid "Display text information dialog"
 msgstr "Display text information dialogue"
 
-#: ../src/option.c:608
+#: ../src/option.c:639
 msgid "Open file"
 msgstr "Open file"
 
-#: ../src/option.c:632
+#: ../src/option.c:663
 msgid "Display warning dialog"
 msgstr "Display warning dialogue"
 
-#: ../src/option.c:665
+#: ../src/option.c:696
 msgid "Display scale dialog"
 msgstr "Display scale dialogue"
 
-#: ../src/option.c:683
+#: ../src/option.c:714
 msgid "Set initial value"
 msgstr "Set initial value"
 
-#: ../src/option.c:692
+#: ../src/option.c:715 ../src/option.c:724 ../src/option.c:733
+#: ../src/option.c:742
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../src/option.c:723
 msgid "Set minimum value"
 msgstr "Set minimum value"
 
-#: ../src/option.c:701
+#: ../src/option.c:732
 msgid "Set maximum value"
 msgstr "Set maximum value"
 
-#: ../src/option.c:710
+#: ../src/option.c:741
 msgid "Set step size"
 msgstr "Set step size"
 
-#: ../src/option.c:719
+#: ../src/option.c:750
 msgid "Print partial values"
 msgstr "Print partial values"
 
-#: ../src/option.c:728
+#: ../src/option.c:759
 msgid "Hide value"
 msgstr "Hide value"
 
-#: ../src/option.c:743
+#: ../src/option.c:774
 msgid "About zenity"
 msgstr "About zenity"
 
-#: ../src/option.c:752
+#: ../src/option.c:783
 msgid "Print version"
 msgstr "Print version"
 
-#: ../src/option.c:1385
+#: ../src/option.c:1425
 msgid "General options"
 msgstr "General options"
 
-#: ../src/option.c:1386
+#: ../src/option.c:1426
 msgid "Show general options"
 msgstr "Show general options"
 
-#: ../src/option.c:1396
+#: ../src/option.c:1436
 msgid "Calendar options"
 msgstr "Calendar options"
 
-#: ../src/option.c:1397
+#: ../src/option.c:1437
 msgid "Show calendar options"
 msgstr "Show calendar options"
 
-#: ../src/option.c:1407
+#: ../src/option.c:1447
 msgid "Text entry options"
 msgstr "Text entry options"
 
-#: ../src/option.c:1408
+#: ../src/option.c:1448
 msgid "Show text entry options"
 msgstr "Show text entry options"
 
-#: ../src/option.c:1418
+#: ../src/option.c:1458
 msgid "Error options"
 msgstr "Error options"
 
-#: ../src/option.c:1419
+#: ../src/option.c:1459
 msgid "Show error options"
 msgstr "Show error options"
 
-#: ../src/option.c:1429
+#: ../src/option.c:1469
 msgid "Info options"
 msgstr "Info options"
 
-#: ../src/option.c:1430
+#: ../src/option.c:1470
 msgid "Show info options"
 msgstr "Show info options"
 
-#: ../src/option.c:1440
+#: ../src/option.c:1480
 msgid "File selection options"
 msgstr "File selection options"
 
-#: ../src/option.c:1441
+#: ../src/option.c:1481
 msgid "Show file selection options"
 msgstr "Show file selection options"
 
-#: ../src/option.c:1451
+#: ../src/option.c:1491
 msgid "List options"
 msgstr "List options"
 
-#: ../src/option.c:1452
+#: ../src/option.c:1492
 msgid "Show list options"
 msgstr "Show list options"
 
-#: ../src/option.c:1462
+#: ../src/option.c:1502
 msgid "Notification icon options"
 msgstr "Notification icon options"
 
-#: ../src/option.c:1463
+#: ../src/option.c:1503
 msgid "Show notification icon options"
 msgstr "Show notification icon options"
 
-#: ../src/option.c:1473
+#: ../src/option.c:1513
 msgid "Progress options"
 msgstr "Progress options"
 
-#: ../src/option.c:1474
+#: ../src/option.c:1514
 msgid "Show progress options"
 msgstr "Show progress options"
 
-#: ../src/option.c:1484
+#: ../src/option.c:1524
 msgid "Question options"
 msgstr "Question options"
 
-#: ../src/option.c:1485
+#: ../src/option.c:1525
 msgid "Show question options"
 msgstr "Show question options"
 
-#: ../src/option.c:1495
+#: ../src/option.c:1535
 msgid "Warning options"
 msgstr "Warning options"
 
-#: ../src/option.c:1496
+#: ../src/option.c:1536
 msgid "Show warning options"
 msgstr "Show warning options"
 
-#: ../src/option.c:1506
+#: ../src/option.c:1546
 msgid "Scale options"
 msgstr "Scale options"
 
-#: ../src/option.c:1507
+#: ../src/option.c:1547
 msgid "Show scale options"
 msgstr "Show scale options"
 
-#: ../src/option.c:1517
+#: ../src/option.c:1557
 msgid "Text information options"
 msgstr "Text information options"
 
-#: ../src/option.c:1518
+#: ../src/option.c:1558
 msgid "Show text information options"
 msgstr "Show text information options"
 
-#: ../src/option.c:1528
+#: ../src/option.c:1568
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-#: ../src/option.c:1529
+#: ../src/option.c:1569
 msgid "Show miscellaneous options"
 msgstr "Show miscellaneous options"
 
-#: ../src/option.c:1554
+#: ../src/option.c:1594
+#, 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:1558
+#: ../src/option.c:1598
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s is not supported for this dialogue\n"
 
-#: ../src/option.c:1562
+#: ../src/option.c:1602
+#, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "Two or more dialogue options specified\n"