[network-manager-applet] Assamese translation updated

[Nilamdyuti Goswami <ngoswami src gnome org>]

commit 1731353399347bdc4310afb92a20bad17466871c
Author: Nilamdyuti Goswami <nilamdyuti gmail com>
Date:   Fri Aug 10 13:58:46 2012 +0530

    Assamese translation updated

 po/as.po |  903 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 502 insertions(+), 401 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index 2b811d4..328081b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
 "cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-09 15:16+0000\n"
-"PO-Revision-Date: 2012-08-09 21:44+0530\n"
+"POT-Creation-Date: 2012-08-09 18:11+0000\n"
+"PO-Revision-Date: 2012-08-10 13:58+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: as_IN <kde-i18n-doc kde org>\n"
 "Language: \n"
@@ -73,11 +73,12 @@ msgid "Suppress networks available notifications"
 msgstr "àààààà ààààààààà àààààààà àààààààà àààààà à'à"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+#| msgid ""
+#| "Set this to true to disable notifications when wireless networks are "
+#| "available."
+msgid "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"àààààà àààààà àààààààààààà àààààà àààà àààààààààààà àààààààààà àààààà àààà àààààà "
+"àààààà Wi-Fi àààààààààààà àààààà àààà àààààààààààà àààààààààà àààààà àààà àààààà "
 "ààààà àààà"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
@@ -119,6 +120,16 @@ msgstr ""
 "EAP ààààààààààà àààà à à CA ààààààààààààààà ààààà ààààààààààààààà àààààààààà àààààà "
 "àààà àààààà ààààà àààà"
 
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#| msgid "Wired 802.1X authentication"
+msgid "802.1X authentication"
+msgstr "802.1X àààààààààà"
+
+#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "ààààààààà ààà (_N):"
+
 #: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "ààààà ààà/àààààà àààààà àààààà"
@@ -318,7 +329,7 @@ msgid "device not ready"
 msgstr "àààààà àààààààà ààà"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1508 ../src/applet-device-wired.c:232
+#: ../src/applet.c:1508 ../src/applet-device-ethernet.c:232
 msgid "disconnected"
 msgstr "ààààààààààà"
 
@@ -359,10 +370,11 @@ msgstr "àààààààààà àààààààààà"
 msgid "Enable _Networking"
 msgstr "àààààààààà ààààààààà ààà (_N)"
 
-#. 'Enable Wireless' item
+#. 'Enable Wi-Fi' item
 #: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "àààààà ààààààààà ààà (_W)"
+#| msgid "Enable _Wireless"
+msgid "Enable _Wi-Fi"
+msgstr "Wi-Fi ààààààààà ààà (_W)"
 
 #. 'Enable Mobile Broadband' item
 #: ../src/applet.c:2069
@@ -417,7 +429,7 @@ msgstr "àààààààà ààààà '%s' àààààààà 
 msgid "User authentication required for network connection '%s'..."
 msgstr "àààààààà ààààà '%s' à àààà ààààààààààà ààààààààààà ààààààà..."
 
-#: ../src/applet.c:2500 ../src/applet-device-bt.c:240
+#: ../src/applet.c:2500 ../src/applet-device-bt.c:239
 #: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
 #: ../src/applet-device-wimax.c:473
 #, c-format
@@ -457,48 +469,48 @@ msgstr "àààà àààààààà ààààà ààà"
 msgid "NetworkManager Applet"
 msgstr "NetworkManager àààààà"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-gsm.c:444 ../src/applet-device-wifi.c:862
-#: ../src/applet-device-wimax.c:279 ../src/applet-device-wired.c:240
+#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
+#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "àààààà"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-gsm.c:486 ../src/applet-device-wimax.c:423
-#: ../src/applet-device-wired.c:269
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
+#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
+#: ../src/applet-device-wimax.c:423
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "ààààà ààààà '%s' àà àààààààà"
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-gsm.c:490 ../src/applet-device-wifi.c:1264
-#: ../src/applet-device-wimax.c:427 ../src/applet-device-wired.c:273
+#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
+#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "ààààà ààààààà"
 
-#: ../src/applet-device-bt.c:205
+#: ../src/applet-device-bt.c:204
 msgid "You are now connected to the mobile broadband network."
 msgstr "ààààà ààààà à'àààà ààààààààà ààààààààà àààà àààààààà"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
 #: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "à'àààà ààà'àààààà ààààà '%s' àààààà ààà àààà..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
 #: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "à'àààà ààà'àààààà ààààà '%s' àààààà ààà àààà..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
 #: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "à'àààà ààà'àààààà ààààà '%s' à àààà àààààààààààà ààààààààààà ààààààà..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
+#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
 #: ../src/applet-device-gsm.c:553
 #, c-format
 msgid "Mobile broadband connection '%s' active"
@@ -516,7 +528,7 @@ msgid "Mobile Broadband (%s)"
 msgstr "à'àààà ààà'àààààà (%s)"
 
 #: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/new-connection.c:100
+#: ../src/connection-editor/new-connection.c:85
 #: ../src/connection-editor/page-mobile.c:379
 msgid "Mobile Broadband"
 msgstr "à'àààà ààà'àààààà"
@@ -553,6 +565,71 @@ msgstr "ààààà ààààà àà ààààààààà à
 msgid "You are now registered on a roaming network."
 msgstr "ààààà ààààà ààà à'ààà ààààààààà àààààààààààà"
 
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "àààààààà ààààààà"
+
+#: ../src/applet-device-ethernet.c:205
+#, c-format
+#| msgid "Wired Networks (%s)"
+msgid "Ethernet Networks (%s)"
+msgstr "ààààààà àààààààààààà (%s)"
+
+#: ../src/applet-device-ethernet.c:207
+#, c-format
+#| msgid "Wired Network (%s)"
+msgid "Ethernet Network (%s)"
+msgstr "ààààààà àààààààà (%s)"
+
+#: ../src/applet-device-ethernet.c:210
+#| msgid "Wired Networks"
+msgid "Ethernet Networks"
+msgstr "ààààààà àààààààààààà"
+
+#: ../src/applet-device-ethernet.c:212
+#| msgid "Wired Network"
+msgid "Ethernet Network"
+msgstr "ààààààà àààààààà"
+
+#: ../src/applet-device-ethernet.c:274
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the ethernet network."
+msgstr "ààààà ààààà ààààààà àààààààààà àààààààà"
+
+#: ../src/applet-device-ethernet.c:300
+#, c-format
+#| msgid "Preparing wired network connection '%s'..."
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "ààààààà àààààààà ààààà '%s' àààààààà ààà àààà..."
+
+#: ../src/applet-device-ethernet.c:303
+#, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "ààààààà àààààààà ààààà '%s' àààààà ààà àààà..."
+
+#: ../src/applet-device-ethernet.c:306
+#, c-format
+#| msgid "User authentication required for wired network connection '%s'..."
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr "ààààààà àààààààà ààààà '%s' à ààààà àààààààààààà ààààààààààà ààààààà..."
+
+#: ../src/applet-device-ethernet.c:309
+#, c-format
+#| msgid "Requesting a wired network address for '%s'..."
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr "'%s' à àààà ààà ààààààà àààààààà ààààà àààààà ààà àààà..."
+
+#: ../src/applet-device-ethernet.c:313
+#, c-format
+#| msgid "Wired network connection '%s' active"
+msgid "Ethernet network connection '%s' active"
+msgstr "ààààààà àààààààà ààààà '%s' àààààà"
+
+#: ../src/applet-device-ethernet.c:494
+msgid "DSL authentication"
+msgstr "DSL àààààààààà"
+
 #: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:702
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
@@ -660,12 +737,14 @@ msgid "GSM network."
 msgstr "GSM ààààààààà"
 
 #: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "àààààà àààààà àààààààààà ààààààà ààà (_C)..."
+#| msgid "_Connect to Hidden Wireless Network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "àààààà Wi-Fi àààààààààà ààààà ààà (_C)..."
 
 #: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
-msgstr "àààà àààààà àààààààà àààààà ààà (_N)..."
+#| msgid "Create _New Wireless Network..."
+msgid "Create _New Wi-Fi Network..."
+msgstr "àààà Wi-Fi àààààààà àààààà ààà (_N)..."
 
 #: ../src/applet-device-wifi.c:292
 msgid "(none)"
@@ -673,74 +752,88 @@ msgstr "(ààààà)"
 
 #: ../src/applet-device-wifi.c:790
 #, c-format
-msgid "Wireless Networks (%s)"
-msgstr "àààààà àààààààààààà (%s)"
+#| msgid "Wired Networks (%s)"
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wi-Fi àààààààààààà (%s)"
 
 #: ../src/applet-device-wifi.c:792
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "àààààà àààààààà (%s)"
+#| msgid "Wired Network (%s)"
+msgid "Wi-Fi Network (%s)"
+msgstr "Wi-Fi àààààààà (%s)"
 
 #: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "àààààà àààààààà"
-msgstr[1] "àààààà àààààààààààà"
+#| msgid "Wired Network"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Wi-Fi àààààààà"
+msgstr[1] "Wi-Fi àààààààààààà"
 
 #: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "àààààà àààààààààà"
+#| msgid "WiMAX is disabled"
+msgid "Wi-Fi is disabled"
+msgstr "Wi-Fi àààààààààà ààà"
 
 #: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "àààààà àààààààà àààà àààààà àààààààààà ààà ààà"
+#| msgid "WiMAX is disabled by hardware switch"
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "Wi-Fi àààààààà àààà àààààà àààààààààà ààà ààà"
 
 #: ../src/applet-device-wifi.c:889
 msgid "More networks"
 msgstr "àààààààà àààààààà"
 
 #: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
-msgstr "àààààà àààààààà ààààààà"
+#| msgid "Wireless Networks Available"
+msgid "Wi-Fi Networks Available"
+msgstr "Wi-Fi àààààààà àààààà"
 
 #: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
-msgstr "ààà àààààà àààààààààà ààààà àààààà àààààààà àààà ààààààà ààà"
+#| msgid "Use the network menu to connect to a wireless network"
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "ààà Wi-Fi àààààààààà ààààà àààààà àààààààà àààà ààààààà ààà"
 
 #: ../src/applet-device-wifi.c:1263
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "ààààà ààààà àààààà àààààààà '%s' àà àààààààà"
+#| msgid "You are now connected to the wireless network '%s'."
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "ààààà ààààà Wi-Fi àààààààà '%s' à àààà àààààààà"
 
 #: ../src/applet-device-wifi.c:1294
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "àààààà àààààààà ààààà '%s' àààààà ààà àààà..."
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Wi-Fi àààààààà ààààà '%s' àààààààà ààà àààà..."
 
 #: ../src/applet-device-wifi.c:1297
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "àààààà àààààààà '%s' àààààà ààà àààà..."
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Wi-Fi àààààààà ààààà '%s' àààààà ààà àààà..."
 
 #: ../src/applet-device-wifi.c:1300
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "àààààà àààààààà ààààà '%s' à ààààà àààààààààààà ààààààààààà ààààààà..."
+#| msgid "User authentication required for wireless network '%s'..."
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "Wi-Fi àààààààà ààààà '%s' à àààà àààààààààààà ààààààààààà ààààààà..."
 
 #: ../src/applet-device-wifi.c:1303
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s' à ààààà àààààà àààààààà ààààà àààààà ààà àààà..."
+#| msgid "Requesting a network address for '%s'..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s' à ààààà ààà Wi-Fi àààààààà ààààà àààààà ààà àààà..."
 
 #: ../src/applet-device-wifi.c:1324
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "àààààà àààààààà ààààà '%s' àààààà: %s (%d%%)"
+#| msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "Wi-Fi àààààààà ààààà '%s' àààààà: %s (%d%%)"
 
 #: ../src/applet-device-wifi.c:1329
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "àààààà àààààààà ààààà '%s' àààààà"
+#| msgid "Wired network connection '%s' active"
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Wi-Fi àààààààà ààààà '%s' àààààà"
 
 #: ../src/applet-device-wifi.c:1377
 msgid "Failed to activate connection"
@@ -771,68 +864,13 @@ msgstr "WiMAX àààààààà àààà àààààà ààà
 msgid "You are now connected to the WiMAX network."
 msgstr "ààààà ààààà WiMAX àààààààààà àààààààà"
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "àààààààà ààààààà"
-
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
-msgstr "ààààààààà àààààààà (%s)"
-
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "ààààààààà àààààààà (%s)"
-
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "ààààààààà àààààààààààà"
-
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "ààààààààà àààààààà"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "ààààà ààààà ààààààààà àààààààààà àààààààà"
-
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "ààààààààà àààààààà ààààà '%s' àààààà ààà àààà..."
-
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "ààààààààà àààààààà ààààà '%s' àààààà ààà àààà..."
-
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "ààààààààà àààààààà ààààà '%s' à ààààà àààààààààààà ààààààààààà ààààààà..."
-
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "'%s' à ààààà ààààààààà àààààààà ààààà àààààà ààà àààà..."
-
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
-msgstr "ààààààààà àààààààà ààààà '%s' àààààà"
-
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "DSL àààààààààà"
-
 #: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "àààà àààà àààààààààà àààààà:"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:929
+#: ../src/connection-editor/page-wifi-security.c:313
+#: ../src/libnm-gtk/nm-wifi-dialog.c:929
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -851,8 +889,7 @@ msgid "WEP"
 msgstr "WEP"
 
 #: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:886
+#: ../src/libnm-gtk/nm-wifi-dialog.c:886
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "àààà ààà"
@@ -1160,29 +1197,102 @@ msgstr "àààààààà àààààààà (_w)"
 msgid "_Password:"
 msgstr "àààààààà (_P):"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "àààààà àààààà (_T):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip6.c:142
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+msgid "Automatic"
+msgstr "àààààààà"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "àààààààà ààààà (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "ààààààààà ààà àààààààààà (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "àààààà ààààà àààààààààà (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "àààà (_P):"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "ààà (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "àààààààà ààààààààà (_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "ààààààà (_o)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
 #: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
 #: ../src/connection-editor/ce-page-wimax.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "_Device MAC address:"
 msgstr "àààààà MAC ààààà (_D):"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "àààààààà"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "ààààààà MAC ààààà (_l):"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgstr ""
+"àààà àààààà MAC àààààà àà ààààà àààààà ààà àààààààà ààààààà àààà àààààààà ààààà "
+"àààààà ààààààà ààà ààà àà àààààààà MAC ààààààà àààà ààààààà àààààà ààà àààà "
+"àààààà: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "_MTU:"
 msgstr "MTU (_M):"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "bytes"
+msgstr "àààààààà"
+
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr "àààààà àààààà (_T):"
+
 #. IP-over-InfiniBand "datagram mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
@@ -1193,15 +1303,6 @@ msgstr "ààààààààà"
 msgid "Connected"
 msgstr "ààààààà"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-msgid "Automatic"
-msgstr "àààààààà"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1419,136 +1520,70 @@ msgstr "Echo"
 msgid "Send PPP _echo packets"
 msgstr "PPP echo ààààààààà ààààà (_e)"
 
-#: ../src/connection-editor/ce-page-wimax.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-#: ../src/wired-8021x.ui.h:2
-msgid "_Network name:"
-msgstr "ààààààààà ààà (_N):"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "àààààààà ààààà (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "ààààààààà ààà àààààààààà (AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "àààààà ààààà àààààààààà (MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "àààà (_P):"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "ààà (_S):"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "àààààààà ààààààààà (_x)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "ààààààà (_o)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "ààààààà MAC ààààà (_l):"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid ""
-"The MAC address entered here will be used as hardware address for the "
-"network device this connection is activated on.  This feature is known as "
-"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
-msgstr ""
-"àààà àààààà MAC àààààà àà ààààà àààààà ààà àààààààà ààààààà àààà àààààààà ààààà "
-"àààààà ààààààà ààà ààà àà àààààààà MAC ààààààà àààà ààààààà àààààà ààà àààà "
-"àààààà: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
 msgstr "ààààààà (_e):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
 msgid "Infrastructure"
 msgstr "àààààààààà"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "àààààà ààààà (_w):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
 msgstr "ààà (_R):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#| msgid ""
+#| "This option locks this connection to the wireless access point (AP) "
+#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
 msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here.  Example: 00:11:22:33:44:55"
 msgstr ""
-"àà ààààààà àààà àààà BSSID àà ààààààààà àààà ààà àààààà ààààà ààààà (AP) à "
+"àà ààààààà àààà àààà BSSID à ààààààààà àààà ààà Wi-Fi ààààà ààààà (AP) à "
 "àààààà àà àààà àààà: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ààààà (_h):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "ààààà (_d):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "M_ode:"
 msgstr "àààààà (_o):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID (_I):"
 
@@ -1633,37 +1668,38 @@ msgstr "ààààààà"
 msgid "Prefix"
 msgstr "àààààà"
 
-#: ../src/connection-editor/new-connection.c:88
-#: ../src/connection-editor/page-wired.c:273
-msgid "Wired"
-msgstr "ààààààààà"
+#: ../src/connection-editor/new-connection.c:75
+#: ../src/connection-editor/page-ethernet.c:273
+#| msgid "Auto Ethernet"
+msgid "Ethernet"
+msgstr "ààààààà"
 
-#: ../src/connection-editor/new-connection.c:94
-#: ../src/connection-editor/page-wireless.c:462
-msgid "Wireless"
-msgstr "àààààà"
+#: ../src/connection-editor/new-connection.c:80
+#: ../src/connection-editor/page-wifi.c:462
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:106
+#: ../src/connection-editor/new-connection.c:90
 #: ../src/connection-editor/page-wimax.c:157 ../src/mb-menu-item.c:73
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../src/connection-editor/new-connection.c:112
+#: ../src/connection-editor/new-connection.c:95
 #: ../src/connection-editor/page-dsl.c:139
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:118
+#: ../src/connection-editor/new-connection.c:100
 #: ../src/connection-editor/page-infiniband.c:189
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/new-connection.c:112
 #: ../src/connection-editor/page-vpn.c:111
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:268
+#: ../src/connection-editor/new-connection.c:245
 msgid "Import a saved VPN configuration..."
 msgstr "ààà àààààààà VPN ààààà ààààààà ààà..."
 
@@ -1718,162 +1754,175 @@ msgstr "àààà àààààààààààà àààà ààà
 msgid "_Export..."
 msgstr "ààààààààà ààà (_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:177
+#: ../src/connection-editor/nm-connection-list.c:169
 msgid "never"
 msgstr "ààààààà ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:188
-#: ../src/connection-editor/nm-connection-list.c:199
+#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:191
 msgid "now"
 msgstr "ààààà"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:206
+#: ../src/connection-editor/nm-connection-list.c:198
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ààààà àààà"
 msgstr[1] "%d ààààà àààà"
 
-#: ../src/connection-editor/nm-connection-list.c:210
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ààààà àààà"
 msgstr[1] "%d ààààà àààà"
 
-#: ../src/connection-editor/nm-connection-list.c:222
+#: ../src/connection-editor/nm-connection-list.c:214
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ààà àààà"
 msgstr[1] "%d ààà àààà"
 
-#: ../src/connection-editor/nm-connection-list.c:228
+#: ../src/connection-editor/nm-connection-list.c:220
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ààà àààà"
 msgstr[1] "%d ààà àààà"
 
-#: ../src/connection-editor/nm-connection-list.c:232
+#: ../src/connection-editor/nm-connection-list.c:224
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ààà àààà"
 msgstr[1] "%d ààà àààà"
 
-#: ../src/connection-editor/nm-connection-list.c:451
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection add failed"
 msgstr "ààààà ààà àààààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:480
+#: ../src/connection-editor/nm-connection-list.c:472
 msgid "Error saving connection"
 msgstr "ààààà ààààààà ààààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:481
+#: ../src/connection-editor/nm-connection-list.c:473
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "ààààààà '%s' / '%s' àààà: %d"
 
-#: ../src/connection-editor/nm-connection-list.c:488
-#: ../src/connection-editor/nm-connection-list.c:606
+#: ../src/connection-editor/nm-connection-list.c:480
+#: ../src/connection-editor/nm-connection-list.c:598
 msgid "An unknown error occurred."
 msgstr "ààà àààààà àààààà ààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:493
-#: ../src/connection-editor/nm-connection-list.c:646
+#: ../src/connection-editor/nm-connection-list.c:485
+#: ../src/connection-editor/nm-connection-list.c:638
 msgid "Error initializing editor"
 msgstr "ààààààà àààààààà ààààà àààààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:511
-#: ../src/connection-editor/nm-connection-list.c:663
+#: ../src/connection-editor/nm-connection-list.c:503
+#: ../src/connection-editor/nm-connection-list.c:655
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "àààààà ààààà ààààà ààààààà ààààààààà àààààà ààààà ààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:520
+#: ../src/connection-editor/nm-connection-list.c:512
 msgid "Could not create new connection"
 msgstr "àààà ààààà àààààà ààà ààààà ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:532
+#: ../src/connection-editor/nm-connection-list.c:524
 msgid "Could not edit new connection"
 msgstr "àààà ààààà ààààààà ààà ààààà ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:677
+#: ../src/connection-editor/nm-connection-list.c:669
 msgid "Could not edit connection"
 msgstr "ààààà ààààààà ààà ààààà ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:707
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "Connection delete failed"
 msgstr "ààààà àààààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:739
+#: ../src/connection-editor/nm-connection-list.c:731
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ààààà ààààààààààà %s ààààà àààààà àààààà àà?"
 
-#: ../src/connection-editor/nm-connection-list.c:1000
+#: ../src/connection-editor/nm-connection-list.c:972
 msgid "Name"
 msgstr "ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
+#: ../src/connection-editor/nm-connection-list.c:985
 msgid "Last Used"
 msgstr "ààààààà ààààààà"
 
 #. Edit
-#: ../src/connection-editor/nm-connection-list.c:1062
+#: ../src/connection-editor/nm-connection-list.c:1026
 msgid "_Edit"
 msgstr "àààààààà ààà (_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1063
+#: ../src/connection-editor/nm-connection-list.c:1027
 msgid "Edit the selected connection"
 msgstr "ààààààààà ààààà ààààààà ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: ../src/connection-editor/nm-connection-list.c:1028
 msgid "_Edit..."
 msgstr "àààààààà ààà (_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:1065
+#: ../src/connection-editor/nm-connection-list.c:1029
 msgid "Authenticate to edit the selected connection"
 msgstr "ààààààààà ààààà ààààààà àààà àààà àààààààà àààà ààààààà"
 
 #. Delete
-#: ../src/connection-editor/nm-connection-list.c:1079
+#: ../src/connection-editor/nm-connection-list.c:1043
 msgid "_Delete"
 msgstr "ààà àààààà (_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1080
+#: ../src/connection-editor/nm-connection-list.c:1044
 msgid "Delete the selected connection"
 msgstr "ààààààààà ààààà ààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1081
+#: ../src/connection-editor/nm-connection-list.c:1045
 msgid "_Delete..."
 msgstr "ààà àààààà (_D)..."
 
-#: ../src/connection-editor/nm-connection-list.c:1082
+#: ../src/connection-editor/nm-connection-list.c:1046
 msgid "Authenticate to delete the selected connection"
 msgstr "ààààààààà ààààà ààà ààààààà àààà àààààààà àààà ààààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1321
+#: ../src/connection-editor/nm-connection-list.c:1285
 msgid "Error creating connection"
 msgstr "ààààà àààààà ààààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1322
+#: ../src/connection-editor/nm-connection-list.c:1286
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "'%s' ààààààààà ààààà àààààà ààà àà ààààà ààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1377
+#: ../src/connection-editor/nm-connection-list.c:1341
 msgid "Error editing connection"
 msgstr "ààààà ààààààà ààààà àààààà"
 
-#: ../src/connection-editor/nm-connection-list.c:1378
+#: ../src/connection-editor/nm-connection-list.c:1342
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' à àààà ààà ààààà àààà ààà"
 
+#: ../src/connection-editor/page-8021x-security.c:119
+msgid "802.1x Security"
+msgstr "802.1x ààààààà"
+
+#: ../src/connection-editor/page-8021x-security.c:121
+#| msgid "Could not load WiFi security user interface."
+msgid "Could not load 802.1x Security user interface."
+msgstr "802.1x àààààààà ààààààààààà àààààààààà à'à àààààà ààààààà"
+
+#: ../src/connection-editor/page-8021x-security.c:139
+msgid "Use 802.1_X security for this connection"
+msgstr "àà àààààà àààà 802.1X ààààààà ààààààà ààà (_X)"
+
 #: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr "DSL ààààààààààà àààààààààà à'à àààà ààà àààààà"
@@ -1883,10 +1932,10 @@ msgstr "DSL ààààààààààà àààààààààà à
 msgid "DSL connection %d"
 msgstr "DSL ààààà %d"
 
+#: ../src/connection-editor/page-ethernet.c:89
 #: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:94
 #: ../src/connection-editor/page-wimax.c:70
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
 msgid ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
@@ -1894,6 +1943,17 @@ msgstr ""
 "àà ààààààà àààààààà àààààà ààà àààà àààààà ààà àààààà MAC ààààààà ààààààà ààà àààà "
 "àààà àà àààààà àà àààà àààààààààààà: 00:11:22:33:44:55"
 
+#: ../src/connection-editor/page-ethernet.c:275
+#| msgid "Could not load wired user interface."
+msgid "Could not load ethernet user interface."
+msgstr "ààààààà àààààààààààà àààààààààà à'à àààààà ààààààà"
+
+#: ../src/connection-editor/page-ethernet.c:451
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Ethernet connection %d"
+msgstr "ààààààà ààààà %d"
+
 #: ../src/connection-editor/page-infiniband.c:192
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ààààààààààà àààààààààà à'à àààà ààà àààà"
@@ -2114,93 +2174,85 @@ msgstr ""
 "àààà àààààà àààà ààààààà àààà ààààà VPN à ààà ààààà ààà ààààà àààààà àààà ààààà "
 "VPN ààààà ààààààà àààààà, àààààà àààà àààà VPN ààààààà àààààà àààà"
 
-#: ../src/connection-editor/page-wimax.c:160
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX ààààààààààà àààààààààà à'à àààà ààà àààà"
-
-#: ../src/connection-editor/page-wimax.c:289
-#, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX ààààà %d"
-
-#: ../src/connection-editor/page-wired.c:275
-msgid "Could not load wired user interface."
-msgstr "ààààààààà àààààààààààà àààààààààà à'à àààààà ààààààà"
-
-#: ../src/connection-editor/page-wired.c:451
-#, c-format
-msgid "Wired connection %d"
-msgstr "ààààààààà ààààà %d"
-
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "802.1x ààààààà"
-
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "ààààààààà ààààààà ààààààà ààààààààààà àààààààààà à'à àààà ààààààà"
-
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "àà àààààà àààà 802.1X ààààààà ààààààà ààà (_X)"
-
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
+#: ../src/connection-editor/page-wifi.c:171
+#: ../src/connection-editor/page-wifi.c:175
+#: ../src/connection-editor/page-wifi.c:196
 #, c-format
 msgid "default"
 msgstr "ààààààààà"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:200
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:464
-msgid "Could not load WiFi user interface."
-msgstr "WiFi ààààààààààà àààààààààà à'à àààà ààà àààààà"
+#: ../src/connection-editor/page-wifi.c:464
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load Wi-Fi user interface."
+msgstr "Wi-Fi ààààààààààà àààààààààà à'à àààà ààà àààààà"
 
-#: ../src/connection-editor/page-wireless.c:669
+#: ../src/connection-editor/page-wifi.c:669
 #, c-format
-msgid "Wireless connection %d"
-msgstr "àààààà ààààà %d"
+#| msgid "WiMAX connection %d"
+msgid "Wi-Fi connection %d"
+msgstr "Wi-Fi ààààà %d"
+
+#: ../src/connection-editor/page-wifi-security.c:265
+#| msgctxt "Wifi/wired security"
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "àààà ààà"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:903
+#: ../src/connection-editor/page-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:903
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit àà (Hex àààà ASCII)"
 
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:912
+#: ../src/connection-editor/page-wifi-security.c:300
+#: ../src/libnm-gtk/nm-wifi-dialog.c:912
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ààà-ààà ààààààààààà"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:942
+#: ../src/connection-editor/page-wifi-security.c:326
+#: ../src/libnm-gtk/nm-wifi-dialog.c:942
 msgid "Dynamic WEP (802.1x)"
 msgstr "àààààààà WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:956
+#: ../src/connection-editor/page-wifi-security.c:340
+#: ../src/libnm-gtk/nm-wifi-dialog.c:956
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ààà WPA2 ààààààààà"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:970
+#: ../src/connection-editor/page-wifi-security.c:354
+#: ../src/libnm-gtk/nm-wifi-dialog.c:970
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ààà WPA2 àààààààààààà"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "WiFi àààààààà ààààààààààà àààààààààà à'à àààààà àààààà; WiFi ààààààààà àààààààààà"
+#: ../src/connection-editor/page-wifi-security.c:395
+#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+"Wi-Fi àààààààà ààààààààààà àààààààààà à'à àààààà àààààà; Wi-Fi ààààààààà àààààààààà"
+
+#: ../src/connection-editor/page-wifi-security.c:405
+#| msgid "Wireless Security"
+msgid "Wi-Fi Security"
+msgstr "Wi-Fi ààààààà"
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
-msgstr "àààààà ààààààà"
+#: ../src/connection-editor/page-wifi-security.c:407
+#| msgid "Could not load WiFi security user interface."
+msgid "Could not load Wi-Fi security user interface."
+msgstr "Wi-Fi àààààààà ààààààààààà àààààààààà à'à àààààà ààààààà"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
-msgstr "WiFi àààààààà ààààààààààà àààààààààà à'à àààààà ààààààà"
+#: ../src/connection-editor/page-wimax.c:160
+msgid "Could not load WiMAX user interface."
+msgstr "WiMAX ààààààààààà àààààààààà à'à àààà ààà àààà"
+
+#: ../src/connection-editor/page-wimax.c:289
+#, c-format
+msgid "WiMAX connection %d"
+msgstr "WiMAX ààààà %d"
 
 #: ../src/connection-editor/vpn-helpers.c:207
 msgid "Cannot import VPN connection"
@@ -2255,17 +2307,21 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "VPN ààààà ààààààààà ààà..."
 
+#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"NetworkManager ààààààà ààààààà ààààààààà ààààà àààààà ààààà (.ui ààààààà àààà "
+"ààà)à"
+
 #: ../src/gnome-bluetooth/bt-widget.c:321
 #, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
 msgstr "ààààààà ààààà ààààà ààà (D-Bus àà ààààà àààààà àààà: (%s) %s)à"
 
 #: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
 msgstr "ààààààà ààààà ààààà ààà (NetworkManager àààààà ààààà àààààà: (%s) %s)"
 
@@ -2515,66 +2571,79 @@ msgstr "à'àààà ààààààààà ààààà ààà
 msgid "New Mobile Broadband Connection"
 msgstr "àààà à'àààà ààààààààà ààààà"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:438
+#: ../src/libnm-gtk/nm-wifi-dialog.c:438
 msgid "New..."
 msgstr "àààà..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1057
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
 msgid "C_reate"
 msgstr "àààààà ààà (_r)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
 #, c-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the wireless network "
+#| "'%s'."
+msgid "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr "'%s' Wi-Fi àààààààà ààààààà àààà àààà àààààààà àà ààààààààà àà'à àààààààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
+#| msgid "Wireless Network Authentication Required"
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi àààààààà àààààààààà ààààààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#| msgid "Authentication required by wireless network"
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi ààààààààà àààààà ààààààààààà ààààààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#| msgid "Create New Wireless Network"
+msgid "Create New Wi-Fi Network"
+msgstr "àààà Wi-Fi àààààààà àààààà ààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#| msgid "New wireless network"
+msgid "New Wi-Fi network"
+msgstr "àààà Wi-Fi àààààààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#| msgid "Enter a name for the wireless network you wish to create."
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "àààààà àààà àààà ààààààà Wi-Fi ààààààààà ààà ààà àààààààà àààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
+#| msgid "Connect to Hidden Wireless Network"
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "àààààà Wi-Fi ààààààààà àààà ààààà ààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
+#| msgid "Hidden wireless network"
+msgid "Hidden Wi-Fi network"
+msgstr "àààààà Wi-Fi àààààààà"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
+#| msgid ""
+#| "Enter the name and security details of the hidden wireless network you "
+#| "wish to connect to."
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
-msgstr "'%s' àààààà àààààààà ààààààà àààà àààà àààààààà àà ààààààààà àà'à àààààààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1143
-msgid "Wireless Network Authentication Required"
-msgstr "àààààà àààààààà àààààààààà ààààààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1145
-msgid "Authentication required by wireless network"
-msgstr "àààààà ààààààààà àààààà ààààààààààà ààààààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1150
-msgid "Create New Wireless Network"
-msgstr "àààà àààààà àààààààà àààààà ààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1152
-msgid "New wireless network"
-msgstr "àààà àààààà àààààààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1153
-msgid "Enter a name for the wireless network you wish to create."
-msgstr "àààààà àààà àààà ààààààà àààààà ààààààààà ààà àààààààà àààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1155
-msgid "Connect to Hidden Wireless Network"
-msgstr "àààà àààààà ààààààààà àààà ààààà àààààà ààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1157
-msgid "Hidden wireless network"
-msgstr "àààà àààààà àààààààà"
-
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1158
-msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
-msgstr "ààààà àààà àààà ààààààà àààà àààààà ààààààààà ààà ààà ààààààà ààààà àààà ààààà"
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "ààààà àààà àààà ààààààà àààààà Wi-Fi ààààààààà ààà ààà ààààààà àààà ààààà"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
-msgstr "àààààà ààààààà (_s):"
+#| msgid "Wireless _security:"
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ààààààà (_s):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "ààààà (_o):"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
-msgstr "àààààà àààààààà (_a):"
+#| msgid "Wireless _adapter:"
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi àààààààà (_a):"
 
 #: ../src/main.c:73
 msgid "Usage:"
@@ -2677,33 +2746,24 @@ msgstr "ààààààààà"
 #. The %s is a mobile provider name, eg "T-Mobile"
 #: ../src/utils/utils.c:325
 #, c-format
-#| msgid "Base Connection:"
 msgid "%s connection"
 msgstr "%s ààààà"
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "ààààààààà 802.1X àààààààààà"
-
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"NetworkManager ààààààà ààààààà ààààààààà ààààà àààààà ààààà (.ui ààààààà àààà "
-"ààà)à"
-
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "àààà àààààààààà àààààààà àààààààààà àààààààà ààà ààà"
 
 #: ../src/wireless-security/eap-method.c:276
+#| msgid ""
+#| "Not using a Certificate Authority (CA) certificate can result in "
+#| "connections to insecure, rogue wireless networks.  Would you like to "
+#| "choose a Certificate Authority certificate?"
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
 msgstr ""
-"àààààààààà ààààààà (CA) àààààààààà ààààààà àààààà àààààààààààà ààà àààààààà ààààààààà "
+"àààààààààà ààààààà (CA) àààààààààà ààààààà àààààà àààààààààààà, ààààààà Wi-Fi ààààààààà "
 "àààà ààààà àààààà ààà à'à ààààà ààààà ààà àààààààààà ààààààà àààààààààà àààààààà àààà "
 "àààààà àààà?"
 
@@ -2913,6 +2973,47 @@ msgstr "àà' àààààààà (_w)"
 msgid "WEP inde_x:"
 msgstr "WEP àààà (_x):"
 
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "àààààà àààààààààààà (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "àààààà àààààààà (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "àààààà àààààààà"
+#~ msgstr[1] "àààààà àààààààààààà"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "àààààà àààààààààà"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "àààààà àààààààà àààà àààààà àààààààààà ààà ààà"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "àààààà àààààààà ààààà '%s' àààààà ààà àààà..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "àààààà àààààààà '%s' àààààà ààà àààà..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' à ààààà àààààà àààààààà ààààà àààààà ààà àààà..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "àààààà àààààààà ààààà '%s' àààààà"
+
+#~ msgid "Wired"
+#~ msgstr "ààààààààà"
+
+#~ msgid "Wireless"
+#~ msgstr "àààààà"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "ààààààààà ààààààà ààààààà ààààààààààà àààààààààà à'à àààà ààààààà"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "àààààà ààààà %d"
+
 #~ msgid ""
 #~ "failed to find Bluetooth device (unknown gnome-bluetooth proxy object "
 #~ "type)."