diff --git a/po/ChangeLog b/po/ChangeLog
index 0694328325..972253bcdd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-31  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2006-01-31  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index b59fc2fbc7..82acda0fa5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 12:18-0500\n"
+"POT-Creation-Date: 2006-01-31 21:00-0500\n"
 "PO-Revision-Date: 2005-09-06 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -17,78 +17,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:934
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passphrase for wireless network %s"
 
-#: ../gnome/applet/applet-dbus.c:274
+#: ../gnome/applet/applet-dbus.c:244
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Connection to the wireless network '%s' failed."
 
-#: ../gnome/applet/applet-dbus.c:279
+#: ../gnome/applet/applet-dbus.c:249
 msgid "Connection to the wired network failed."
 msgstr "Connection to the wired network failed."
 
-#: ../gnome/applet/applet.c:180
-msgid "Error displaying connection information: "
-msgstr "Error displaying connection information: "
+#: ../gnome/applet/applet.c:179
+msgid "Error displaying connection information:"
+msgstr "Error displaying connection information:"
 
-#: ../gnome/applet/applet.c:199
+#: ../gnome/applet/applet.c:196
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Could not find some required resources (the glade file)!"
 
-#: ../gnome/applet/applet.c:210
+#: ../gnome/applet/applet.c:207
 msgid "No active connections!"
 msgstr "No active connections!"
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:224
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Wired Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:226
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Wireless Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
+#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
+#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
 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:327 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
 msgid "translator-credits"
 msgstr "Adam Weinberger <adamw@gnome.org>"
 
-#: ../gnome/applet/applet.c:439
+#: ../gnome/applet/applet.c:441
 msgid "VPN Error"
 msgstr "VPN Error"
 
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:445
 msgid "VPN Login Failure"
 msgstr "VPN Login Failure"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:446
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Could not start the VPN connection '%s' due to a login failure."
 
-#: ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:450
 msgid "VPN Start Failure"
 msgstr "VPN Start Failure"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:451
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -97,25 +97,25 @@ msgstr ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 
-#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
+#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
 msgid "VPN Connect Failure"
 msgstr "VPN Connect Failure"
 
-#: ../gnome/applet/applet.c:454
+#: ../gnome/applet/applet.c:456
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Could not start the VPN connection '%s' due to a connection error."
 
-#: ../gnome/applet/applet.c:458
+#: ../gnome/applet/applet.c:460
 msgid "VPN Configuration Error"
 msgstr "VPN Configuration Error"
 
-#: ../gnome/applet/applet.c:459
+#: ../gnome/applet/applet.c:461
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../gnome/applet/applet.c:464
+#: ../gnome/applet/applet.c:466
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -124,23 +124,23 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../gnome/applet/applet.c:472
+#: ../gnome/applet/applet.c:474
 #, c-format
 msgid "The VPN service said: \"%s\""
 msgstr "The VPN service said: \"%s\""
 
-#: ../gnome/applet/applet.c:541
+#: ../gnome/applet/applet.c:543
 #, c-format
 msgid "VPN connection '%s' said:"
 msgstr "VPN connection '%s' said:"
 
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:545
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
-#: ../gnome/applet/other-network-dialog.c:457
-#: ../gnome/applet/passphrase-dialog.c:209
+#: ../gnome/applet/applet.c:762 ../gnome/applet/applet.c:2516
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:227
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -148,163 +148,163 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../gnome/applet/applet.c:772
+#: ../gnome/applet/applet.c:774
 #, 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:780
+#: ../gnome/applet/applet.c:782
 #, 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:928
+#: ../gnome/applet/applet.c:929
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparing device %s for the wired network..."
 
-#: ../gnome/applet/applet.c:930
+#: ../gnome/applet/applet.c:931
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:938
+#: ../gnome/applet/applet.c:939
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configuring device %s for the wired network..."
 
-#: ../gnome/applet/applet.c:940
+#: ../gnome/applet/applet.c:941
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Attempting to join the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:948
+#: ../gnome/applet/applet.c:949
 #, 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:956 ../gnome/applet/applet.c:966
+#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
 msgid "Requesting a network address from the wired network..."
 msgstr "Requesting a network address from the wired network..."
 
-#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968
+#: ../gnome/applet/applet.c:959 ../gnome/applet/applet.c:969
 #, 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:976
+#: ../gnome/applet/applet.c:977
 msgid "Finishing connection to the wired network..."
 msgstr "Finishing connection to the wired network..."
 
-#: ../gnome/applet/applet.c:978
+#: ../gnome/applet/applet.c:979
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Finishing connection to the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:1095
+#: ../gnome/applet/applet.c:1096
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: ../gnome/applet/applet.c:1108 ../gnome/applet/applet.c:1842
+#: ../gnome/applet/applet.c:1109 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
-#: ../gnome/applet/applet.c:1113
+#: ../gnome/applet/applet.c:1114
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../gnome/applet/applet.c:1118
+#: ../gnome/applet/applet.c:1119
 msgid "Wired network connection"
 msgstr "Wired network connection"
 
-#: ../gnome/applet/applet.c:1122
+#: ../gnome/applet/applet.c:1123
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connected to an Ad-Hoc wireless network"
 
-#: ../gnome/applet/applet.c:1124
+#: ../gnome/applet/applet.c:1125
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1146
+#: ../gnome/applet/applet.c:1147
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN connection to '%s'"
 
-#: ../gnome/applet/applet.c:1154
+#: ../gnome/applet/applet.c:1155
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN connecting to '%s'"
 
-#: ../gnome/applet/applet.c:1567
+#: ../gnome/applet/applet.c:1568
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connect to Other Wireless Network..."
 
-#: ../gnome/applet/applet.c:1588
+#: ../gnome/applet/applet.c:1589
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Network..."
 
-#: ../gnome/applet/applet.c:1709
+#: ../gnome/applet/applet.c:1710
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../gnome/applet/applet.c:1744
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Configure VPN..."
 
-#: ../gnome/applet/applet.c:1748
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "_Disconnect VPN..."
 
-#: ../gnome/applet/applet.c:1770
+#: ../gnome/applet/applet.c:1771
 msgid "_Dial Up Connections"
 msgstr "_Dial-Up Connections"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1781
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connect to %s..."
 
-#: ../gnome/applet/applet.c:1787
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Disconnect from %s..."
 
-#: ../gnome/applet/applet.c:1836
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: ../gnome/applet/applet.c:2028
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2184
+#: ../gnome/applet/applet.c:2185
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2190
+#: ../gnome/applet/applet.c:2191
 msgid "Enable _Wireless"
 msgstr "Enable _Wireless"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2196
+#: ../gnome/applet/applet.c:2197
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. Help item
-#: ../gnome/applet/applet.c:2207
+#: ../gnome/applet/applet.c:2208
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../gnome/applet/applet.c:2216
+#: ../gnome/applet/applet.c:2217
 msgid "_About"
 msgstr "_About"
 
-#: ../gnome/applet/applet.c:2633
+#: ../gnome/applet/applet.c:2635
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -312,19 +312,23 @@ msgstr ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 
-#: ../gnome/applet/wireless-security-option.c:158
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Open System"
 
-#: ../gnome/applet/wireless-security-option.c:161
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../gnome/applet/wireless-security-option.c:212
-msgid "TKIP (Default)"
-msgstr "TKIP (Default)"
+#: ../gnome/applet/wireless-security-option.c:209
+msgid "Automatic (Default)"
+msgstr "Automatic (Default)"
 
-#: ../gnome/applet/wireless-security-option.c:221
+#: ../gnome/applet/wireless-security-option.c:217
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:225
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
@@ -332,15 +336,15 @@ msgstr "AES-CCMP"
 msgid "None"
 msgstr "None"
 
-#: ../gnome/applet/wso-wep-ascii.c:128
+#: ../gnome/applet/wso-wep-ascii.c:127
 msgid "WEP 40/128-bit ASCII"
 msgstr "WEP 40/128-bit ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:125
+#: ../gnome/applet/wso-wep-hex.c:124
 msgid "WEP 40/128-bit hex"
 msgstr "WEP 40/128-bit hex"
 
-#: ../gnome/applet/wso-wep-passphrase.c:125
+#: ../gnome/applet/wso-wep-passphrase.c:124
 msgid "WEP Passphrase"
 msgstr "WEP Passphrase"
 
@@ -378,7 +382,7 @@ msgstr[1] "Wireless Networks"
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:354
+#: ../gnome/applet/other-network-dialog.c:352
 #, c-format
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
@@ -387,11 +391,11 @@ msgstr ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
 
-#: ../gnome/applet/other-network-dialog.c:360
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Create new wireless network"
 
-#: ../gnome/applet/other-network-dialog.c:361
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
@@ -399,22 +403,34 @@ msgstr ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
 
-#: ../gnome/applet/other-network-dialog.c:365
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Create New Wireless Network"
 
-#: ../gnome/applet/other-network-dialog.c:370
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Existing wireless network"
 
-#: ../gnome/applet/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:369
 msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Enter the name of the wireless network to which you wish to connect."
 
-#: ../gnome/applet/other-network-dialog.c:373
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Connect to Other Wireless Network"
 
+#: ../gnome/applet/passphrase-dialog.c:214
+msgid "Error connecting to wireless network"
+msgstr "Error connecting to wireless network"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+
 #: ../gnome/applet/vpn-password-dialog.c:152
 #: ../gnome/applet/vpn-password-dialog.c:189
 #, c-format
@@ -517,22 +533,26 @@ msgid "Destination Address:"
 msgstr "Destination Address:"
 
 #: ../gnome/applet/wireless-applet.glade.h:21
+msgid "Driver:"
+msgstr "Driver:"
+
+#: ../gnome/applet/wireless-applet.glade.h:22
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
-#: ../gnome/applet/wireless-applet.glade.h:22
+#: ../gnome/applet/wireless-applet.glade.h:23
 msgid "IP Address:"
 msgstr "IP Address:"
 
-#: ../gnome/applet/wireless-applet.glade.h:23
+#: ../gnome/applet/wireless-applet.glade.h:24
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../gnome/applet/wireless-applet.glade.h:24
+#: ../gnome/applet/wireless-applet.glade.h:25
 msgid "Key:"
 msgstr "Key:"
 
-#: ../gnome/applet/wireless-applet.glade.h:25
+#: ../gnome/applet/wireless-applet.glade.h:26
 msgid ""
 "None\n"
 "WEP Passphrase\n"
@@ -544,7 +564,7 @@ msgstr ""
 "WEP 40/128-bit hex\n"
 "WEP 40/128-bit ASCII\n"
 
-#: ../gnome/applet/wireless-applet.glade.h:30
+#: ../gnome/applet/wireless-applet.glade.h:31
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -552,87 +572,87 @@ msgstr ""
 "Open System\n"
 "Shared Key"
 
-#: ../gnome/applet/wireless-applet.glade.h:32
+#: ../gnome/applet/wireless-applet.glade.h:33
 msgid "Other Wireless Network..."
 msgstr "Other Wireless Network..."
 
-#: ../gnome/applet/wireless-applet.glade.h:33
+#: ../gnome/applet/wireless-applet.glade.h:34
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: ../gnome/applet/wireless-applet.glade.h:34
+#: ../gnome/applet/wireless-applet.glade.h:35
 msgid "Password:"
 msgstr "Password:"
 
-#: ../gnome/applet/wireless-applet.glade.h:35
+#: ../gnome/applet/wireless-applet.glade.h:36
 msgid "Primary DNS:"
 msgstr "Primary DNS:"
 
-#: ../gnome/applet/wireless-applet.glade.h:36
+#: ../gnome/applet/wireless-applet.glade.h:37
 msgid "Secondary DNS:"
 msgstr "Secondary DNS:"
 
-#: ../gnome/applet/wireless-applet.glade.h:37
+#: ../gnome/applet/wireless-applet.glade.h:38
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../gnome/applet/wireless-applet.glade.h:38
+#: ../gnome/applet/wireless-applet.glade.h:39
 msgid "Type:"
 msgstr "Type:"
 
-#: ../gnome/applet/wireless-applet.glade.h:39
+#: ../gnome/applet/wireless-applet.glade.h:40
 msgid "User Name:"
 msgstr "User Name:"
 
-#: ../gnome/applet/wireless-applet.glade.h:40
+#: ../gnome/applet/wireless-applet.glade.h:41
 msgid "Wireless Network Key Required"
 msgstr "Wireless Network Key Required"
 
-#: ../gnome/applet/wireless-applet.glade.h:41
+#: ../gnome/applet/wireless-applet.glade.h:42
 msgid "Wireless _adapter:"
 msgstr "Wireless _adapter:"
 
-#: ../gnome/applet/wireless-applet.glade.h:42
+#: ../gnome/applet/wireless-applet.glade.h:43
 msgid "_Always Trust this Wireless Network"
 msgstr "_Always Trust this Wireless Network"
 
-#: ../gnome/applet/wireless-applet.glade.h:43
+#: ../gnome/applet/wireless-applet.glade.h:44
 msgid "_Don't remind me again"
 msgstr "_Do not remind me again"
 
-#: ../gnome/applet/wireless-applet.glade.h:44
+#: ../gnome/applet/wireless-applet.glade.h:45
 msgid "_Login to Network"
 msgstr "_Login to Network"
 
-#: ../gnome/applet/wireless-applet.glade.h:45
+#: ../gnome/applet/wireless-applet.glade.h:46
 msgid "_Network Name:"
 msgstr "_Network Name:"
 
-#: ../gnome/applet/wireless-applet.glade.h:46
+#: ../gnome/applet/wireless-applet.glade.h:47
 msgid "_Wireless Security:"
 msgstr "_Wireless Security:"
 
-#: ../gnome/applet/wireless-applet.glade.h:47
+#: ../gnome/applet/wireless-applet.glade.h:48
 msgid "leap_subwindow"
 msgstr "leap_subwindow"
 
-#: ../gnome/applet/wireless-applet.glade.h:48
+#: ../gnome/applet/wireless-applet.glade.h:49
 msgid "wep_key_subwindow"
 msgstr "wep_key_subwindow"
 
-#: ../gnome/applet/wireless-applet.glade.h:49
+#: ../gnome/applet/wireless-applet.glade.h:50
 msgid "wep_passphrase_subwindow"
 msgstr "wep_passphrase_subwindow"
 
-#: ../gnome/applet/wireless-applet.glade.h:50
+#: ../gnome/applet/wireless-applet.glade.h:51
 msgid "wpa_psk_subwindow"
 msgstr "wpa_psk_subwindow"
 
-#: ../gnome/applet/wso-wpa-psk.c:171
+#: ../gnome/applet/wso-wpa-psk.c:168
 msgid "WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: ../gnome/applet/wso-wpa-psk.c:173
+#: ../gnome/applet/wso-wpa-psk.c:170
 msgid "WPA Personal"
 msgstr "WPA Personal"
 
@@ -790,14 +810,22 @@ msgstr "WPA TKIP"
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:57
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA Automatic"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 Automatic"
+
 #: ../src/nm-ap-security.c:310
 msgid "none"
 msgstr "none"