diff --git a/po/ChangeLog b/po/ChangeLog
index f2cda9b..6e0f3ad 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-20  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-04-06  Christian Rose  <menthos@menthos.com>
 
 	* ug.po: Added Uighur translation by
diff --git a/po/en_CA.po b/po/en_CA.po
index 7d69543..0ec6b11 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zenity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-07 12:02-0500\n"
-"PO-Revision-Date: 2005-02-07 13:39-0400\n"
+"POT-Creation-Date: 2005-04-20 16:35-0400\n"
+"PO-Revision-Date: 2005-04-20 13:39-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,270 +23,276 @@ msgstr ""
 #. You can also include other translators who have contributed to
 #. this translation; in that case, please write them on separate
 #. lines seperated by newlines (\n).
-#: src/about.c:377
+#: ../src/about.c:378
 msgid "translator-credits"
 msgstr ""
 "Maintainer: Adam Weinberger <adamw@gnome.org>\n"
 "Alexander Winston <alexander.winston@comcast.net>"
 
-#: src/about.c:407
+#: ../src/about.c:408
 msgid "Display dialog boxes from shell scripts"
 msgstr "Display dialogue boxes from shell scripts"
 
-#: src/about.c:411
+#: ../src/about.c:412
 msgid "(C) 2003 Sun Microsystems"
 msgstr "(C) 2003 Sun Microsystems"
 
-#: src/about.c:495
+#: ../src/about.c:496
 msgid "Credits"
 msgstr "Credits"
 
-#: src/about.c:522
+#: ../src/about.c:523
 msgid "Written by"
 msgstr "Written by"
 
-#: src/about.c:535
+#: ../src/about.c:536
 msgid "Translated by"
 msgstr "Translated by"
 
-#: src/eggtrayicon.c:118
+#: ../src/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientation"
 
-#: src/eggtrayicon.c:119
+#: ../src/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: src/main.c:90
+#: ../src/main.c:90
 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:158
+#: ../src/notification.c:158
 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:230 ../src/notification.c:259
 msgid "Zenity notification"
 msgstr "Zenity notification"
 
-#: src/tree.c:304
+#: ../src/tree.c:304
 msgid "No column titles specified for List dialog.\n"
 msgstr "No column titles specified for List dialogue.\n"
 
-#: src/zenity.glade.h:1
+#: ../src/zenity.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: src/zenity.glade.h:2
+#: ../src/zenity.glade.h:2
 msgid "About Zenity"
 msgstr "About Zenity"
 
-#: src/zenity.glade.h:3
+#: ../src/zenity.glade.h:3
 msgid "Add a new entry"
 msgstr "Add a new entry"
 
-#: src/zenity.glade.h:4
+#: ../src/zenity.glade.h:4
 msgid "All updates are complete."
 msgstr "All updates are complete."
 
-#: src/zenity.glade.h:5
+#: ../src/zenity.glade.h:5
 msgid "An error has occurred."
 msgstr "An error has occurred."
 
-#: src/zenity.glade.h:6
+#: ../src/zenity.glade.h:6
 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:7
 msgid "C_alendar:"
 msgstr "C_alendar:"
 
-#: src/zenity.glade.h:8
+#: ../src/zenity.glade.h:8
 msgid "Calendar selection"
 msgstr "Calendar selection"
 
-#: src/zenity.glade.h:9
+#: ../src/zenity.glade.h:9
 msgid "Error"
 msgstr "Error"
 
-#: src/zenity.glade.h:10
+#: ../src/zenity.glade.h:10
 msgid "Information"
 msgstr "Information"
 
-#: src/zenity.glade.h:11
+#: ../src/zenity.glade.h:11
 msgid "Progress"
 msgstr "Progress"
 
-#: src/zenity.glade.h:12
+#: ../src/zenity.glade.h:12
 msgid "Question"
 msgstr "Question"
 
-#: src/zenity.glade.h:13
+#: ../src/zenity.glade.h:13
 msgid "Running..."
 msgstr "Running..."
 
-#: src/zenity.glade.h:14
+#: ../src/zenity.glade.h:14
 msgid "Select a date from below."
 msgstr "Select a date from below."
 
-#: src/zenity.glade.h:15
+#: ../src/zenity.glade.h:15
 msgid "Select a file"
 msgstr "Select a file"
 
-#: src/zenity.glade.h:16
+#: ../src/zenity.glade.h:16
 msgid "Select items from the list"
 msgstr "Select items from the list"
 
-#: src/zenity.glade.h:17
+#: ../src/zenity.glade.h:17
 msgid "Select items from the list below."
 msgstr "Select items from the list below."
 
-#: src/zenity.glade.h:18
+#: ../src/zenity.glade.h:18
 msgid "Text View"
 msgstr "Text View"
 
-#: src/zenity.glade.h:19
+#: ../src/zenity.glade.h:19
 msgid "Warning"
 msgstr "Warning"
 
-#: src/zenity.glade.h:20
+#: ../src/zenity.glade.h:20
 msgid "_Credits"
 msgstr "_Credits"
 
-#: src/zenity.glade.h:21
+#: ../src/zenity.glade.h:21
 msgid "_Enter new text:"
 msgstr "_Enter new text:"
 
-#: src/option.c:99
+#: ../src/option.c:100
 msgid "Set the dialog title"
 msgstr "Set the dialogue title"
 
-#: src/option.c:100
+#: ../src/option.c:101
 msgid "TITLE"
 msgstr "TITLE"
 
-#: src/option.c:108
+#: ../src/option.c:109
 msgid "Set the window icon"
 msgstr "Set the window icon"
 
-#: src/option.c:109
+#: ../src/option.c:110
 msgid "ICONPATH"
 msgstr "ICONPATH"
 
-#: src/option.c:117
+#: ../src/option.c:118
 msgid "Set the width"
 msgstr "Set the width"
 
-#: src/option.c:118
+#: ../src/option.c:119
 msgid "WIDTH"
 msgstr "WIDTH"
 
-#: src/option.c:126
+#: ../src/option.c:127
 msgid "Set the height"
 msgstr "Set the height"
 
-#: src/option.c:127
+#: ../src/option.c:128
 msgid "HEIGHT"
 msgstr "HEIGHT"
 
-#: src/option.c:141
+#: ../src/option.c:142
 msgid "Display calendar dialog"
 msgstr "Display calendar dialogue"
 
-#: src/option.c:150 src/option.c:210 src/option.c:253 src/option.c:277
-#: src/option.c:361 src/option.c:472 src/option.c:524 src/option.c:581
+#: ../src/option.c:151 ../src/option.c:211 ../src/option.c:254
+#: ../src/option.c:287 ../src/option.c:380 ../src/option.c:491
+#: ../src/option.c:543 ../src/option.c:609
 msgid "Set the dialog text"
 msgstr "Set the dialogue text"
 
-#: src/option.c:159
+#: ../src/option.c:160
 msgid "Set the calendar day"
 msgstr "Set the calendar day"
 
-#: src/option.c:168
+#: ../src/option.c:169
 msgid "Set the calendar month"
 msgstr "Set the calendar month"
 
-#: src/option.c:177
+#: ../src/option.c:178
 msgid "Set the calendar year"
 msgstr "Set the calendar year"
 
-#: src/option.c:186
+#: ../src/option.c:187
 msgid "Set the format for the returned date"
 msgstr "Set the format for the returned date"
 
-#: src/option.c:201
+#: ../src/option.c:202
 msgid "Display text entry dialog"
 msgstr "Display text entry dialogue"
 
-#: src/option.c:219
+#: ../src/option.c:220
 msgid "Set the entry text"
 msgstr "Set the entry text"
 
-#: src/option.c:228
+#: ../src/option.c:229
 msgid "Hide the entry text"
 msgstr "Hide the entry text"
 
-#: src/option.c:244
+#: ../src/option.c:245
 msgid "Display error dialog"
 msgstr "Display error dialogue"
 
-#: src/option.c:268
+#: ../src/option.c:263 ../src/option.c:296 ../src/option.c:552
+#: ../src/option.c:618
+msgid "Do not enable text wrapping"
+msgstr "Do not enable text wrapping"
+
+#: ../src/option.c:278
 msgid "Display info dialog"
 msgstr "Display info dialogue"
 
-#: src/option.c:292
+#: ../src/option.c:311
 msgid "Display file selection dialog"
 msgstr "Display file selection dialogue"
 
-#: src/option.c:301
+#: ../src/option.c:320
 msgid "Set the filename"
 msgstr "Set the filename"
 
-#: src/option.c:302 src/option.c:549
+#: ../src/option.c:321 ../src/option.c:577
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: src/option.c:310
+#: ../src/option.c:329
 msgid "Allow multiple files to be selected"
 msgstr "Allow multiple files to be selected"
 
-#: src/option.c:319
+#: ../src/option.c:338
 msgid "Activate directory-only selection"
 msgstr "Activate directory-only selection"
 
-#: src/option.c:328
+#: ../src/option.c:347
 msgid "Activate save mode"
 msgstr "Activate save mode"
 
-#: src/option.c:337 src/option.c:397
+#: ../src/option.c:356 ../src/option.c:416
 msgid "Set output separator character"
 msgstr "Set output separator character"
 
-#: src/option.c:338 src/option.c:398
+#: ../src/option.c:357 ../src/option.c:417
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
-#: src/option.c:352
+#: ../src/option.c:371
 msgid "Display list dialog"
 msgstr "Display list dialogue"
 
-#: src/option.c:370
+#: ../src/option.c:389
 msgid "Set the column header"
 msgstr "Set the column header"
 
-#: src/option.c:379
+#: ../src/option.c:398
 msgid "Use check boxes for first column"
 msgstr "Use check boxes for first column"
 
-#: src/option.c:388
+#: ../src/option.c:407
 msgid "Use radio buttons for first column"
 msgstr "Use radio buttons for first column"
 
-#: src/option.c:406 src/option.c:557
+#: ../src/option.c:425 ../src/option.c:585
 msgid "Allow changes to text"
 msgstr "Allow changes to text"
 
-#: src/option.c:415
+#: ../src/option.c:434
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -294,172 +300,174 @@ msgstr ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 
-#: src/option.c:430
+#: ../src/option.c:449
 msgid "Display notification"
 msgstr "Display notification"
 
-#: src/option.c:439
+#: ../src/option.c:458
 msgid "Set the notification text"
 msgstr "Set the notification text"
 
-#: src/option.c:448
+#: ../src/option.c:467
 msgid "Listen for commands on stdin"
 msgstr "Listen for commands on stdin"
 
-#: src/option.c:463
+#: ../src/option.c:482
 msgid "Display progress indication dialog"
 msgstr "Display progress indication dialogue"
 
-#: src/option.c:481
+#: ../src/option.c:500
 msgid "Set initial percentage"
 msgstr "Set initial percentage"
 
-#: src/option.c:490
+#: ../src/option.c:509
 msgid "Pulsate progress bar"
 msgstr "Pulsate progress bar"
 
-#: src/option.c:500
+#: ../src/option.c:519
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Dismiss the dialogue when 100% has been reached"
 
-#: src/option.c:515
+#: ../src/option.c:534
 msgid "Display question dialog"
 msgstr "Display question dialogue"
 
-#: src/option.c:539
+#: ../src/option.c:567
 msgid "Display text information dialog"
 msgstr "Display text information dialogue"
 
-#: src/option.c:548
+#: ../src/option.c:576
 msgid "Open file"
 msgstr "Open file"
 
-#: src/option.c:572
+#: ../src/option.c:600
 msgid "Display warning dialog"
 msgstr "Display warning dialogue"
 
-#: src/option.c:596
+#: ../src/option.c:633
 msgid "About zenity"
 msgstr "About zenity"
 
-#: src/option.c:605
+#: ../src/option.c:642
 msgid "Print version"
 msgstr "Print version"
 
-#: src/option.c:1190
+#: ../src/option.c:1232
 msgid "General options"
 msgstr "General options"
 
-#: src/option.c:1191
+#: ../src/option.c:1233
 msgid "Show general options"
 msgstr "Show general options"
 
-#: src/option.c:1200
+#: ../src/option.c:1242
 msgid "Calendar options"
 msgstr "Calendar options"
 
-#: src/option.c:1201
+#: ../src/option.c:1243
 msgid "Show calendar options"
 msgstr "Show calendar options"
 
-#: src/option.c:1210
+#: ../src/option.c:1252
 msgid "Text entry options"
 msgstr "Text entry options"
 
-#: src/option.c:1211
+#: ../src/option.c:1253
 msgid "Show text entry options"
 msgstr "Show text entry options"
 
-#: src/option.c:1220
+#: ../src/option.c:1262
 msgid "Error options"
 msgstr "Error options"
 
-#: src/option.c:1221
+#: ../src/option.c:1263
 msgid "Show error options"
 msgstr "Show error options"
 
-#: src/option.c:1230
+#: ../src/option.c:1272
 msgid "Info options"
 msgstr "Info options"
 
-#: src/option.c:1231
+#: ../src/option.c:1273
 msgid "Show info options"
 msgstr "Show info options"
 
-#: src/option.c:1240
+#: ../src/option.c:1282
 msgid "File selection options"
 msgstr "File selection options"
 
-#: src/option.c:1241
+#: ../src/option.c:1283
 msgid "Show file selection options"
 msgstr "Show file selection options"
 
-#: src/option.c:1250
+#: ../src/option.c:1292
 msgid "List options"
 msgstr "List options"
 
-#: src/option.c:1251
+#: ../src/option.c:1293
 msgid "Show list options"
 msgstr "Show list options"
 
-#: src/option.c:1260
+#: ../src/option.c:1302
 msgid "Notification icon options"
 msgstr "Notification icon options"
 
-#: src/option.c:1261
+#: ../src/option.c:1303
 msgid "Show notification icon options"
 msgstr "Show notification icon options"
 
-#: src/option.c:1270
+#: ../src/option.c:1312
 msgid "Progress options"
 msgstr "Progress options"
 
-#: src/option.c:1271
+#: ../src/option.c:1313
 msgid "Show progress options"
 msgstr "Show progress options"
 
-#: src/option.c:1280
+#: ../src/option.c:1322
 msgid "Question options"
 msgstr "Question options"
 
-#: src/option.c:1281
+#: ../src/option.c:1323
 msgid "Show question options"
 msgstr "Show question options"
 
-#: src/option.c:1290
+#: ../src/option.c:1332
 msgid "Warning options"
 msgstr "Warning options"
 
-#: src/option.c:1291
+#: ../src/option.c:1333
 msgid "Show warning options"
 msgstr "Show warning options"
 
-#: src/option.c:1300
+#: ../src/option.c:1342
 msgid "Text information options"
 msgstr "Text information options"
 
-#: src/option.c:1301
+#: ../src/option.c:1343
 msgid "Show text information options"
 msgstr "Show text information options"
 
-#: src/option.c:1310
+#: ../src/option.c:1352
 msgid "Miscellaneous options"
 msgstr "Miscellaneous options"
 
-#: src/option.c:1311
+#: ../src/option.c:1353
 msgid "Show miscellaneous options"
 msgstr "Show miscellaneous options"
 
-#: src/option.c:1334
-msgid "Syntax error\n"
-msgstr "Syntax error\n"
+#: ../src/option.c:1376
+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:1338
+#: ../src/option.c:1380
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s is not supported for this dialogue\n"
 
-#: src/option.c:1342
+#: ../src/option.c:1384
 msgid "Two or more dialog options specified\n"
 msgstr "Two or more dialogue options specified\n"