diff --git a/po/ChangeLog b/po/ChangeLog
index c904bf4d7e..e6e44cfcc4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-19  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-05-15  Dan Williams  <dcbw@redhat.com>
 
 	From Filip Miletic:
diff --git a/po/en_CA.po b/po/en_CA.po
index 440f7e77e9..ea2ab208af 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-13 16:11-0400\n"
-"PO-Revision-Date: 2005-05-13 14:52-0400\n"
+"POT-Creation-Date: 2005-05-19 13:46-0400\n"
+"PO-Revision-Date: 2005-05-19 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: examples/python/systray/eggtrayicon.c:111 gnome/applet/eggtrayicon.c:118
+#: ../examples/python/systray/eggtrayicon.c:111
+#: ../gnome/applet/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientation"
 
-#: examples/python/systray/eggtrayicon.c:112 gnome/applet/eggtrayicon.c:119
+#: ../examples/python/systray/eggtrayicon.c:112
+#: ../gnome/applet/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: gnome/applet/applet-dbus-info.c:852
+#: ../gnome/applet/applet-dbus-info.c:928
 #, c-format
 msgid ""
 "The requested wireless network '%s' does not appear to be in range.  A "
@@ -34,30 +36,34 @@ msgstr ""
 "The requested wireless network '%s' does not appear to be in range.  A "
 "different wireless network will be used if one is available."
 
-#: gnome/applet/applet-dbus.c:573
+#: ../gnome/applet/applet-dbus.c:575
 #, c-format
 msgid "Connection to the wireless network '%s' failed.\n"
 msgstr "Connection to the wireless network '%s' failed.\n"
 
-#: gnome/applet/applet-dbus.c:578
+#: ../gnome/applet/applet-dbus.c:580
 msgid "Connection to the wired network failed.\n"
 msgstr "Connection to the wired network failed.\n"
 
-#: gnome/applet/applet.c:194 gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:194 ../gnome/applet/applet.c:212
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: gnome/applet/applet.c:196 gnome/applet/applet.c:214
+#: ../gnome/applet/applet.c:196 ../gnome/applet/applet.c:214
 msgid "Copyright (C) 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: gnome/applet/applet.c:197 gnome/applet/applet.c:215
+#: ../gnome/applet/applet.c:197 ../gnome/applet/applet.c:215
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: gnome/applet/applet.c:280
+#: ../gnome/applet/applet.c:301
+msgid "VPN Error"
+msgstr "VPN Error"
+
+#: ../gnome/applet/applet.c:305
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
@@ -72,7 +78,39 @@ msgstr ""
 "\n"
 "The VPN service said: \"%s\""
 
-#: gnome/applet/applet.c:341
+#: ../gnome/applet/applet.c:310
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
+
+#: ../gnome/applet/applet.c:315
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a connection error.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+"\n"
+"Could not start the VPN connection '%s' due to a connection error.\n"
+"\n"
+"The VPN service said: \"%s\""
+
+#: ../gnome/applet/applet.c:381
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
@@ -87,9 +125,9 @@ msgstr ""
 "\n"
 "\"%s\""
 
-#: gnome/applet/applet.c:559 gnome/applet/applet.c:1922
-#: gnome/applet/other-network-dialog.c:315
-#: gnome/applet/passphrase-dialog.c:430
+#: ../gnome/applet/applet.c:599 ../gnome/applet/applet.c:1969
+#: ../gnome/applet/other-network-dialog.c:315
+#: ../gnome/applet/passphrase-dialog.c:428
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -97,129 +135,129 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: gnome/applet/applet.c:572
+#: ../gnome/applet/applet.c:612
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "The network device \"%s (%s)\" does not support wireless scanning."
 
-#: gnome/applet/applet.c:579
+#: ../gnome/applet/applet.c:619
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "The network device \"%s (%s)\" does not support link detection."
 
-#: gnome/applet/applet.c:700
+#: ../gnome/applet/applet.c:740
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparing device %s for the wired network..."
 
-#: gnome/applet/applet.c:702
+#: ../gnome/applet/applet.c:742
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: gnome/applet/applet.c:709
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configuring device %s for the wired network..."
 
-#: gnome/applet/applet.c:711
+#: ../gnome/applet/applet.c:751
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Attempting to join the wireless network '%s'..."
 
-#: gnome/applet/applet.c:718
+#: ../gnome/applet/applet.c:758
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Waiting for Network Key for the wireless network '%s'..."
 
-#: gnome/applet/applet.c:725 gnome/applet/applet.c:734
+#: ../gnome/applet/applet.c:765 ../gnome/applet/applet.c:774
 msgid "Requesting a network address from the wired network..."
 msgstr "Requesting a network address from the wired network..."
 
-#: gnome/applet/applet.c:727 gnome/applet/applet.c:736
+#: ../gnome/applet/applet.c:767 ../gnome/applet/applet.c:776
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: gnome/applet/applet.c:743
+#: ../gnome/applet/applet.c:783
 msgid "Finishing connection to the wired network..."
 msgstr "Finishing connection to the wired network..."
 
-#: gnome/applet/applet.c:745
+#: ../gnome/applet/applet.c:785
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Finishing connection to the wireless network '%s'..."
 
-#: gnome/applet/applet.c:791
+#: ../gnome/applet/applet.c:831
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: gnome/applet/applet.c:802
+#: ../gnome/applet/applet.c:842
 msgid "No network connection"
 msgstr "No network connection"
 
-#: gnome/applet/applet.c:809
+#: ../gnome/applet/applet.c:849
 msgid "Wired network connection"
 msgstr "Wired network connection"
 
-#: gnome/applet/applet.c:816
+#: ../gnome/applet/applet.c:856
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connected to an Ad-Hoc wireless network"
 
-#: gnome/applet/applet.c:830
+#: ../gnome/applet/applet.c:870
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: gnome/applet/applet.c:1181
+#: ../gnome/applet/applet.c:1228
 msgid "Other Wireless Networks..."
 msgstr "Other Wireless Networks..."
 
-#: gnome/applet/applet.c:1202
+#: ../gnome/applet/applet.c:1249
 msgid "Create new Wireless Network..."
 msgstr "Create new Wireless Network..."
 
-#: gnome/applet/applet.c:1315
+#: ../gnome/applet/applet.c:1362
 msgid "VPN Connections"
 msgstr "VPN Connections"
 
-#: gnome/applet/applet.c:1337
+#: ../gnome/applet/applet.c:1384
 msgid "Disconnect VPN..."
 msgstr "Disconnect VPN..."
 
-#: gnome/applet/applet.c:1366
+#: ../gnome/applet/applet.c:1413
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: gnome/applet/applet.c:1529
+#: ../gnome/applet/applet.c:1576
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
-#: gnome/applet/applet.c:1599 gnome/applet/applet.c:1647
+#: ../gnome/applet/applet.c:1646 ../gnome/applet/applet.c:1694
 msgid "Pause Wireless Scanning"
 msgstr "Pause Wireless Scanning"
 
-#: gnome/applet/applet.c:1604
+#: ../gnome/applet/applet.c:1651
 msgid "Resume Wireless Scanning"
 msgstr "Resume Wireless Scanning"
 
-#: gnome/applet/applet.c:1614 gnome/applet/applet.c:1653
+#: ../gnome/applet/applet.c:1661 ../gnome/applet/applet.c:1700
 msgid "Stop All Wireless Devices"
 msgstr "Stop All Wireless Devices"
 
-#: gnome/applet/applet.c:1619
+#: ../gnome/applet/applet.c:1666
 msgid "Start All Wireless Devices"
 msgstr "Start All Wireless Devices"
 
-#: gnome/applet/applet.c:1662
+#: ../gnome/applet/applet.c:1709
 msgid "Help"
 msgstr "Help"
 
-#: gnome/applet/applet.c:1669
+#: ../gnome/applet/applet.c:1716
 msgid "About"
 msgstr "About"
 
-#: gnome/applet/applet.c:2070
+#: ../gnome/applet/applet.c:2117
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -227,59 +265,59 @@ msgstr ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 
-#: gnome/applet/gtkcellrendererprogress.c:243
-#: gnome/applet/gtkcellrendererprogress.c:301
+#: ../gnome/applet/gtkcellrendererprogress.c:243
+#: ../gnome/applet/gtkcellrendererprogress.c:301
 #, c-format
 msgid "progress bar label|%d %%"
 msgstr "%d %%"
 
-#: gnome/applet/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: gnome/applet/menu-items.c:93
+#: ../gnome/applet/menu-items.c:93
 msgid "Wired Network"
 msgstr "Wired Network"
 
-#: gnome/applet/menu-items.c:166
+#: ../gnome/applet/menu-items.c:166
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Wireless Network (%s)"
 msgstr[1] "Wireless Networks (%s)"
 
-#: gnome/applet/menu-items.c:168
+#: ../gnome/applet/menu-items.c:168
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: gnome/applet/menu-items.c:294
+#: ../gnome/applet/menu-items.c:294
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
-#: gnome/applet/other-network-dialog.c:148
-#: gnome/applet/passphrase-dialog.c:164
-#: gnome/applet/wireless-applet.glade.h:27
+#: ../gnome/applet/other-network-dialog.c:148
+#: ../gnome/applet/passphrase-dialog.c:162
+#: ../gnome/applet/wireless-applet.glade.h:27
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: gnome/applet/other-network-dialog.c:151
-#: gnome/applet/passphrase-dialog.c:167
+#: ../gnome/applet/other-network-dialog.c:151
+#: ../gnome/applet/passphrase-dialog.c:165
 msgid "Ascii Key:"
 msgstr "ASCII Key:"
 
-#: gnome/applet/other-network-dialog.c:154
-#: gnome/applet/passphrase-dialog.c:170
+#: ../gnome/applet/other-network-dialog.c:154
+#: ../gnome/applet/passphrase-dialog.c:168
 msgid "Hex Key:"
 msgstr "Hex Key:"
 
-#: gnome/applet/other-network-dialog.c:229
+#: ../gnome/applet/other-network-dialog.c:229
 msgid "Create new wireless network"
 msgstr "Create new wireless network"
 
-#: gnome/applet/other-network-dialog.c:230
+#: ../gnome/applet/other-network-dialog.c:230
 msgid ""
 "Enter the ESSID and security settings of the wireless network you wish to "
 "create."
@@ -287,28 +325,24 @@ msgstr ""
 "Enter the ESSID and security settings of the wireless network you wish to "
 "create."
 
-#: gnome/applet/other-network-dialog.c:235
+#: ../gnome/applet/other-network-dialog.c:235
 msgid "Custom wireless network"
 msgstr "Custom wireless network"
 
-#: gnome/applet/other-network-dialog.c:236
+#: ../gnome/applet/other-network-dialog.c:236
 msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr "Enter the ESSID of the wireless network to which you wish to connect."
 
-#: gnome/applet/vpn-password-dialog.c:105
+#: ../gnome/applet/vpn-password-dialog.c:105
 #, c-format
 msgid "You must log in to access the Virtual Private Network '%s'."
 msgstr "You must log in to access the Virtual Private Network '%s'."
 
-#: gnome/applet/wireless-applet.glade.h:1
+#: ../gnome/applet/wireless-applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: gnome/applet/wireless-applet.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: gnome/applet/wireless-applet.glade.h:3
+#: ../gnome/applet/wireless-applet.glade.h:2
 msgid ""
 "128-bit Passphrase (WEP)\n"
 "Ascii Key (WEP)\n"
@@ -318,7 +352,7 @@ msgstr ""
 "ASCII Key (WEP)\n"
 "Hex Key (WEP)"
 
-#: gnome/applet/wireless-applet.glade.h:6
+#: ../gnome/applet/wireless-applet.glade.h:5
 msgid ""
 "128-bit passphrase (WEP)\n"
 "Ascii key (WEP)\n"
@@ -328,7 +362,7 @@ msgstr ""
 "ASCII key (WEP)\n"
 "Hex key (WEP)"
 
-#: gnome/applet/wireless-applet.glade.h:10
+#: ../gnome/applet/wireless-applet.glade.h:9
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -343,7 +377,7 @@ msgstr ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 
-#: gnome/applet/wireless-applet.glade.h:14
+#: ../gnome/applet/wireless-applet.glade.h:13
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -354,7 +388,7 @@ msgstr ""
 "\n"
 "%s  It will not be completely functional."
 
-#: gnome/applet/wireless-applet.glade.h:18
+#: ../gnome/applet/wireless-applet.glade.h:17
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -371,81 +405,85 @@ msgstr ""
 "wireless network is secure, click the checkbox below and NetworkManager will "
 "no longer pester you with stupid questions when you connect to it."
 
-#: gnome/applet/wireless-applet.glade.h:21
+#: ../gnome/applet/wireless-applet.glade.h:20
 msgid "Always Trust this Wireless Network"
 msgstr "Always Trust this Wireless Network"
 
-#: gnome/applet/wireless-applet.glade.h:22
+#: ../gnome/applet/wireless-applet.glade.h:21
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: gnome/applet/wireless-applet.glade.h:23
+#: ../gnome/applet/wireless-applet.glade.h:22
 msgid "Connect with encryption enabled"
 msgstr "Connect with encryption enabled"
 
-#: gnome/applet/wireless-applet.glade.h:24
+#: ../gnome/applet/wireless-applet.glade.h:23
 msgid "Don't remind me again"
 msgstr "Don't remind me again"
 
-#: gnome/applet/wireless-applet.glade.h:25
+#: ../gnome/applet/wireless-applet.glade.h:24
 msgid "Key Type:"
 msgstr "Key Type:"
 
-#: gnome/applet/wireless-applet.glade.h:26
+#: ../gnome/applet/wireless-applet.glade.h:25
 msgid "Key type:"
 msgstr "Key type:"
 
-#: gnome/applet/wireless-applet.glade.h:28
+#: ../gnome/applet/wireless-applet.glade.h:26
+msgid "Other Wireless Network..."
+msgstr "Other Wireless Network..."
+
+#: ../gnome/applet/wireless-applet.glade.h:28
 msgid "Wireless Network Key Required"
 msgstr "Wireless Network Key Required"
 
-#: gnome/applet/wireless-applet.glade.h:29
+#: ../gnome/applet/wireless-applet.glade.h:29
 msgid "Wireless _adapter:"
 msgstr "Wireless _adapter:"
 
-#: gnome/applet/wireless-applet.glade.h:30
+#: ../gnome/applet/wireless-applet.glade.h:30
 msgid "Wireless _network:"
 msgstr "Wireless _network:"
 
-#: gnome/applet/wireless-applet.glade.h:31
+#: ../gnome/applet/wireless-applet.glade.h:31
 msgid "_Login to Network"
 msgstr "_Login to Network"
 
-#: gnome/applet/wireless-applet.glade.h:32
+#: ../gnome/applet/wireless-applet.glade.h:32
 msgid "_OK"
 msgstr "_OK"
 
-#: src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "Unable to create netlink socket for monitoring wired ethernet devices - %s"
 
-#: src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:172
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "Unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 
-#: src/nm-netlink-monitor.c:404
+#: ../src/nm-netlink-monitor.c:404
 msgid "operation took too long"
 msgstr "Operation took too long"
 
-#: src/nm-netlink-monitor.c:501
+#: ../src/nm-netlink-monitor.c:501
 msgid "received data from wrong type of sender"
 msgstr "Received data from wrong type of sender"
 
-#: src/nm-netlink-monitor.c:514
+#: ../src/nm-netlink-monitor.c:514
 msgid "received data from unexpected sender"
 msgstr "Received data from unexpected sender"
 
-#: src/nm-netlink-monitor.c:536
+#: ../src/nm-netlink-monitor.c:536
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/nm-netlink-monitor.c:645
+#: ../src/nm-netlink-monitor.c:645
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "Too much data was sent over socket and some of it was lost"