[network-manager-applet] Updated Serbian translation

[ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>]

commit ecf954fc2d855eb1ebd8d5647530dad6bbddef9d
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Fri Aug 17 18:32:45 2012 +0200

    Updated Serbian translation

 po/sr.po       | 1025 +++++++++++++++++++++++++++++++-------------------------
 po/sr latin po | 1025 +++++++++++++++++++++++++++++++-------------------------
 2 files changed, 1152 insertions(+), 898 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 257c4fd..1e5d41c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ";
 "kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-07 22:00+0000\n"
-"PO-Revision-Date: 2012-08-08 09:19+0200\n"
+"POT-Creation-Date: 2012-08-09 18:11+0000\n"
+"PO-Revision-Date: 2012-08-17 18:28+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -74,9 +74,11 @@ 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."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "ÐÐÑÑÑÐÑÐ ÐÐÑ ÐÐÑÐÑÑ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÑÑÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ ÐÑÐÐÐ."
 
@@ -96,8 +98,7 @@ msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"ÐÐÑÑÑÐÑÐ ÐÐÑ ÐÐÑÐÑÑ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐÐÐ "
-"ÐÑÐÐÐÐÐ."
+"ÐÐÑÑÑÐÑÐ ÐÐÑ ÐÐÑÐÑÑ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
 msgid "Ignore CA certificate"
@@ -119,6 +120,16 @@ msgstr ""
 "ÐÐÑÑÑÐÑÐ ÐÐÑ ÐÐÑÐÑÑ ÐÐ ÐÑÐÑÑÑÐÑÐ ÑÐÐÐÐÑÐÑÐ Ð ÐÐ ÑÐÐÑÐÑÐÐÐ Ñ ÐÑÑÐÐÑ ÑÐÐÐ ÐÐÐ "
 "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
+#: ../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 "_ÐÐÐ ÐÑÐÐÐ:"
+
 #: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ/ÐÐÑÐÐÐÑÐÐ ÐÐÐÑ"
@@ -320,7 +331,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 "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
 
@@ -361,9 +372,10 @@ msgstr "ÐÐÑÐÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÐ"
 msgid "Enable _Networking"
 msgstr "ÐÐÑÑÑÐ _ÐÑÐÐÐÐ ÑÑÐÑÐÐ"
 
-#. 'Enable Wireless' item
+#. 'Enable Wi-Fi' item
 #: ../src/applet.c:2060
-msgid "Enable _Wireless"
+#| msgid "Enable _Wireless"
+msgid "Enable _Wi-Fi"
 msgstr "ÐÐÑÑÑÐ _ÐÐÐÐÑÐÐ ÐÑÐÐÐÑÐ"
 
 #. 'Enable Mobile Broadband' item
@@ -419,8 +431,8 @@ msgstr "ÐÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐÐÑ â%sâ..."
 msgid "User authentication required for network connection '%s'..."
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐ â%sâ..."
 
-#: ../src/applet.c:2500 ../src/applet-device-bt.c:240
-#: ../src/applet-device-cdma.c:490 ../src/applet-device-gsm.c:537
+#: ../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
 msgid "Requesting a network address for '%s'..."
@@ -459,152 +471,217 @@ msgstr "ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐ"
 msgid "NetworkManager Applet"
 msgstr "ÐÑÐÐÑÐÐÑÐ ÑÐÑÐÐÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../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:441
-#: ../src/applet-device-gsm.c:488 ../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:445
-#: ../src/applet-device-gsm.c:492 ../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:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../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:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../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:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../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:508
-#: ../src/applet-device-gsm.c:555
+#: ../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"
 msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÐÐÐ â%sâ"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:699
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "ÐÐÐÐ"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
 #: ../src/applet-dialogs.c:424
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐ (%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/new-connection.c:100
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
+#: ../src/connection-editor/new-connection.c:85
 #: ../src/connection-editor/page-mobile.c:379
 msgid "Mobile Broadband"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:412
+#: ../src/applet-device-cdma.c:409
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ (ÐÐÐÐ) ÐÐÐÐ..."
 
-#: ../src/applet-device-cdma.c:446
+#: ../src/applet-device-cdma.c:443
 msgid "You are now connected to the CDMA network."
 msgstr "ÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÑÐÐÑ."
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
 #: ../src/applet-device-wimax.c:482
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ â%sâ: (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "ÑÐÐÐÐÐ"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
+#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
 msgid "CDMA network."
 msgstr "ÐÐÐÐ ÐÑÐÐÐ."
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
+#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
 msgid "You are now registered on the home network."
 msgstr "ÐÐÐÐ ÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÑÐÑ ÐÑÐÐÑ."
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
 msgid "You are now registered on a roaming network."
 msgstr "ÐÐÐÐ ÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÑÐ."
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:702
+#: ../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 "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÐ-Ð"
+
+#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:702
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "ÐÐÐ"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:459
+#: ../src/applet-device-gsm.c:457
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐ..."
 
-#: ../src/applet-device-gsm.c:493
+#: ../src/applet-device-gsm.c:491
 msgid "You are now connected to the GSM network."
 msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐ ÐÑÐÐÑ."
 
-#: ../src/applet-device-gsm.c:654
+#: ../src/applet-device-gsm.c:652
 msgid "PIN code required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐ ÐÃÐ"
 
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-gsm.c:660
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÑÑÐÑÐÑÐ"
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet-device-gsm.c:781
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "ÐÐÐ ÐÐÐ ÐÐ ÐÐÐ ÐÐÑÑÐÑÑ â%sâ ÐÐ â%sâ"
 
-#: ../src/applet-device-gsm.c:875
+#: ../src/applet-device-gsm.c:873
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐ, ÐÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐÐ ÐÑÐÐÐÑÐÐÑÐ."
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:896
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐ, ÐÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐÐ ÐÑÐÐÐÑÐÐÑÐ."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-gsm.c:923
 msgid "Sending unlock code..."
 msgstr "ÐÐÑÐÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐÐÑÐ..."
 
-#: ../src/applet-device-gsm.c:988
+#: ../src/applet-device-gsm.c:986
 msgid "SIM PIN unlock required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
 
-#: ../src/applet-device-gsm.c:989
+#: ../src/applet-device-gsm.c:987
 msgid "SIM PIN Unlock Required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
+#: ../src/applet-device-gsm.c:989
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -612,25 +689,25 @@ msgid ""
 msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ â%sâ ÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐ."
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
+#: ../src/applet-device-gsm.c:991
 msgid "PIN code:"
 msgstr "ÐÐÐ ÐÃÐ:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
+#: ../src/applet-device-gsm.c:995
 msgid "Show PIN code"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÐÃÐ"
 
-#: ../src/applet-device-gsm.c:1000
+#: ../src/applet-device-gsm.c:998
 msgid "SIM PUK unlock required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
 
-#: ../src/applet-device-gsm.c:1001
+#: ../src/applet-device-gsm.c:999
 msgid "SIM PUK Unlock Required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
+#: ../src/applet-device-gsm.c:1001
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -638,69 +715,73 @@ msgid ""
 msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ â%sâ ÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ ÐÃÐ."
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
+#: ../src/applet-device-gsm.c:1003
 msgid "PUK code:"
 msgstr "ÐÐÐ ÐÃÐ:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
+#: ../src/applet-device-gsm.c:1006
 msgid "New PIN code:"
 msgstr "ÐÐÐÐ ÐÐÐ ÐÃÐ:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
+#: ../src/applet-device-gsm.c:1008
 msgid "Re-enter new PIN code:"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐ ÐÃÐ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
+#: ../src/applet-device-gsm.c:1013
 msgid "Show PIN/PUK codes"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐ/ÐÐÐ ÐÃÐÐÐÐ"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
+#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
 msgid "GSM network."
 msgstr "ÐÐÐ ÐÑÐÐÐ."
 
 #: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "ÐÐ_ÐÐÐÐ ÑÐ ÐÐ ÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ..."
+#| msgid "_Connect to Hidden Wireless Network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐ _ÑÐÑÐÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ..."
 
 #: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
+#| msgid "Create _New Wireless Network..."
+msgid "Create _New Wi-Fi Network..."
 msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ..."
 
 #: ../src/applet-device-wifi.c:292
 msgid "(none)"
 msgstr "(ÐÐÑÑÐ)"
 
-# bug: no plural forms
 #: ../src/applet-device-wifi.c:790
 #, c-format
-msgid "Wireless Networks (%s)"
+#| msgid "Wired Networks (%s)"
+msgid "Wi-Fi Networks (%s)"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
 
-# bug: no plural forms
 #: ../src/applet-device-wifi.c:792
 #, c-format
-msgid "Wireless Network (%s)"
+#| msgid "Wired Network (%s)"
+msgid "Wi-Fi Network (%s)"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
 
-# bug: no plural forms
 #: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
+#| msgid "Wired Network"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
 msgstr[0] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
 msgstr[1] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
 msgstr[2] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-msgstr[3] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
+msgstr[3] "ÐÐÑÐÐÐ ÐÑÐÐÐ"
 
 #: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÑÑÐÐÐ"
+#| msgid "WiMAX is disabled"
+msgid "Wi-Fi is disabled"
+msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
 
 #: ../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 "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÑÐÐ"
 
 #: ../src/applet-device-wifi.c:889
 msgid "More networks"
@@ -708,46 +789,55 @@ msgstr "ÐÐÑ ÐÑÐÐÐ"
 
 # bug: no plural forms
 #: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
+#| msgid "Wireless Networks Available"
+msgid "Wi-Fi Networks Available"
 msgstr "ÐÐÑÑÑÐÐÐ ÑÑ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
 
 #: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
+#| msgid "Use the network menu to connect to a wireless network"
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
 
 #: ../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 "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ â%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 "ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÐÑ ÐÐÐÑ â%sâ..."
 
 #: ../src/applet-device-wifi.c:1297
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ â%sâ..."
 
 #: ../src/applet-device-wifi.c:1300
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
+#| msgid "User authentication required for wireless network '%s'..."
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%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â..."
 
 #: ../src/applet-device-wifi.c:1324
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#| msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%sâ : %s (%d%%)"
 
 #: ../src/applet-device-wifi.c:1329
 #, c-format
-msgid "Wireless network connection '%s' active"
+#| msgid "Wired network connection '%s' active"
+msgid "Wi-Fi network connection '%s' active"
 msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%sâ"
 
 #: ../src/applet-device-wifi.c:1377
@@ -779,68 +869,13 @@ msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÑÐ
 msgid "You are now connected to the WiMAX network."
 msgstr "ÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐÐÑ."
 
-#: ../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 "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÐ-Ð"
-
 #: ../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 "ÐÐÐÐ"
@@ -859,8 +894,7 @@ msgid "WEP"
 msgstr "ÐÐÐ"
 
 #: ../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 "ÐÐÑÑÐ"
@@ -1171,29 +1205,101 @@ msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÐÐÐÑ"
 msgid "_Password:"
 msgstr "_ÐÐÐÐÐÐÐ:"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ÐÐÐÐÐ _ÐÑÐÐÐÑÐ:"
+#: ../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 "ÐÐÐÐÑÐÐÐ ÐÐÑ (ÐÐ)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "ÐÑÑÐÑÐ ÑÐÐÐÐÐÑÐ ÐÑÐÐÐÑÐÑÐÑÐ (ÐÐÐ)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "ÐÐÐ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "ÐÑÑÐÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ (ÐÐÐ)"
+
+#: ../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 "_ÐÐÑÑ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_ÐÑÐÐÐÐ:"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "ÐÑÐÐ _ÐÑÐÐÐÐÑ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "_ÐÐÐÐÑÐÐÐÐÑÐÑÐ"
+
+#: ../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 "_ÐÐÐ ÐÐÑÐÑÐ ÑÑÐÑÐÑÐ:"
 
-#: ../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 "_ÐÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ:"
+
+#: ../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 ""
+"ÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐÐ ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÑÐ.  ÐÐÐ ÐÐÐÑÑÐÐÑÑ ÑÐ "
+"ÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐ.  ÐÑÐÐÐÑ: 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 "_ÐÐÐ:"
 
+#: ../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 "ÐÐÐÐÐ _ÐÑÐÐÐÑÐ:"
+
 #. IP-over-InfiniBand "datagram mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
@@ -1204,15 +1310,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"
@@ -1431,137 +1528,72 @@ msgstr "ÐÑÐ"
 msgid "Send PPP _echo packets"
 msgstr "ÐÐÑÐ ÐÐÐ _ÐÑÐ ÐÐÐÐÑÐ"
 
-#: ../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 "_ÐÐÐ ÐÑÐÐÐ:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑ (ÐÐ)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "ÐÑÑÐÑÐ ÑÐÐÐÐÐÑÐ ÐÑÐÐÐÑÐÑÐÑÐ (ÐÐÐ)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "ÐÐÐ"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "ÐÑÑÐÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ (ÐÐÐ)"
-
-#: ../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 "_ÐÐÑÑ:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_ÐÑÐÐÐÐ:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "ÐÑÐÐ _ÐÑÐÐÐÐÑ"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "_ÐÐÐÐÑÐÐÐÐÑÐÑÐ"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "_ÐÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ:"
-
-#: ../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 ""
-"ÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐÐ ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÑÐ.  ÐÐÐ ÐÐÐÑÑÐÐÑÑ ÑÐ "
-"ÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐ.  ÐÑÐÐÐÑ: 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 "Ð_ÐÐÐÐÐÐÐÑÑ:"
 
-#: ../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 "ÐÐ-ÑÐÐ"
 
-#: ../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 "_ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ:"
 
-#: ../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 "_ÐÑÐÑÐÐ:"
 
-#: ../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 ""
-"ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÑÐÑÑÑÐÐÐÑ ÑÐÑÐÐ (ÐÐ) ÐÐÑÐ ÑÐ ÐÐÑÐÑÐÐ "
-"ÐÐÐÐÐ-ÐÐ.  ÐÐÑ: 00:11:22:33:44:55"
+"ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÑÑÐ ÐÐÑ ÐÐÐÑ ÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÑÐÐ (ÐÐ) ÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÐ "
+"ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐ-ÐÐ.  ÐÐÑ: 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 "_ÐÐÐÐÐ:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_ÐÐÐÐÐ:"
 
 # ÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ, Ð?
 # ~ÐÐÐÐÑ
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_ÐÐÑÐÐ:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "M_ode:"
 msgstr "_ÐÐÐÐÐ:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "ÐÐ_ÐÐ:"
 
@@ -1648,37 +1680,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"
+#: ../src/connection-editor/new-connection.c:80
+#: ../src/connection-editor/page-wifi.c:462
+msgid "Wi-Fi"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../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 "ÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐ"
 
-#: ../src/connection-editor/new-connection.c:112
+#: ../src/connection-editor/new-connection.c:95
 #: ../src/connection-editor/page-dsl.c:139
 msgid "DSL"
 msgstr "ÐÐÐ"
 
-#: ../src/connection-editor/new-connection.c:118
+#: ../src/connection-editor/new-connection.c:100
 #: ../src/connection-editor/page-infiniband.c:189
 msgid "InfiniBand"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÐ"
 
-#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/new-connection.c:112
 #: ../src/connection-editor/page-vpn.c:111
 msgid "VPN"
 msgstr "ÐÐÐ"
 
-#: ../src/connection-editor/new-connection.c:268
+#: ../src/connection-editor/new-connection.c:245
 msgid "Import a saved VPN configuration..."
 msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ..."
 
@@ -1735,17 +1768,17 @@ msgstr "_ÐÐÑÑÑÐÐÐ ÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ"
 msgid "_Export..."
 msgstr "_ÐÐÐÐÐÐ..."
 
-#: ../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"
@@ -1754,7 +1787,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÑÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÑÑÐ"
 msgstr[3] "ÐÑÐ %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"
@@ -1763,7 +1796,7 @@ msgstr[1] "ÐÑÐ %d ÑÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÑÐÑÐ"
 msgstr[3] "ÐÑÐ %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"
@@ -1772,7 +1805,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÐ"
 msgstr[3] "ÐÑÐ %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"
@@ -1781,7 +1814,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÑÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÑÐÑÐ"
 msgstr[3] "ÐÑÐ %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"
@@ -1790,117 +1823,130 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐÐÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÐÐÐ"
 msgstr[3] "ÐÑÐ %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 "_ÐÑÐÑÐÐÐÑÐ"
 
-#: ../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 "_ÐÑÐÐÐ..."
 
-#: ../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 "_ÐÐÑÐÑÐ"
 
-#: ../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 "_ÐÐÑÐÑÐ..."
 
-#: ../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 "ÐÐÑÐÐ ÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐ ÐÐÐÐ â%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.1_X ÐÐÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑ ÐÐÐÑ"
+
 #: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ DSL."
@@ -1910,10 +1956,10 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ D
 msgid "DSL connection %d"
 msgstr "ÐÐÐ ÐÐÐÐ â%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"
@@ -1921,6 +1967,17 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÑÑÑÐÐÐ ÐÐÐÑ ÑÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÑÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÐÐ ÑÑÐÑÐÐÐ ÐÐÐ "
 "ÐÐÑÐÑÐÐ.  ÐÐÑ: 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 "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐÐ."
@@ -2138,96 +2195,87 @@ msgstr ""
 "ÐÑÑÑÐ ÐÐÐ ÐÐÐÐ ÐÐÑÑ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÐÑ, ÐÐÐÐÐ ÐÐÐÐÑÐ "
 "ÐÐÑÑÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐ ÐÑÐÐÑÑÑÐÐ."
 
-#: ../src/connection-editor/page-wimax.c:160
-msgid "Could not load WiMAX user interface."
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐ."
-
-#: ../src/connection-editor/page-wimax.c:289
-#, c-format
-msgid "WiMAX connection %d"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐ %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.1_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."
+#: ../src/connection-editor/page-wifi.c:464
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load Wi-Fi user interface."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ."
 
-#: ../src/connection-editor/page-wireless.c:669
+#: ../src/connection-editor/page-wifi.c:669
 #, c-format
-msgid "Wireless connection %d"
+#| msgid "WiMAX connection %d"
+msgid "Wi-Fi connection %d"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ %d"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:903
+#: ../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-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:903
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ÐÐÐ 40/128-ÐÐÑÐÐ ÐÑÑÑ"
 
-#: ../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 "ÐÐÐ 128-ÐÐÑÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../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 "ÐÐÐÐÐÐÑÐÐ ÐÐÐ (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 "ÐÐÑÐÐ ÐÐÐ & ÐÐÐ2"
 
-#: ../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 "ÐÐÑÐÐÐÐÐ ÐÐÐ & ÐÐÐ2"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../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 ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ; ÐÐÐÐÑÑÐÑÑ "
-"ÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ."
+"ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ."
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:405
+#| msgid "Wireless Security"
+msgid "Wi-Fi Security"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑ"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../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 "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ."
 
+#: ../src/connection-editor/page-wimax.c:160
+msgid "Could not load WiMAX user interface."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐ."
+
+#: ../src/connection-editor/page-wimax.c:289
+#, c-format
+msgid "WiMAX connection %d"
+msgstr "ÐÐÐÐÐÐ ÐÐÐÐ %d"
+
 #: ../src/connection-editor/vpn-helpers.c:207
 msgid "Cannot import VPN connection"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÐÑ"
@@ -2282,92 +2330,101 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "ÐÐÐÐÐÐ ÐÐÐ ÐÐÐÑ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ: %s"
+#: ../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 ""
+"ÐÑÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÑÑÑÑÐ (â.uiâ "
+"ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "ÐÐÑ ÑÐÐÐÑÐÐ ÑÐ ÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÑÐÐÑ!"
+#: ../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 ""
+"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÑÑÐ (ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ Ð-ÑÐÐÐÑÐÐÑÑ: (%"
+"s) %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
+#: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-msgid "%s Network"
-msgstr "%s ÐÑÐÐÐ"
+#| msgid ""
+#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr ""
+"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÑÑÐ (ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐ: (%s) %s)."
+
+#: ../src/gnome-bluetooth/bt-widget.c:445
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐ ÑÑÐÑÐÑ (ÐÐÐ/ÐÐÐ)"
+
+#: ../src/gnome-bluetooth/bt-widget.c:454
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "ÐÑÐÑÑÑÐÐÑÐ ÐÐÑÐÑÐÐÑÑ ÐÑÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐ (ÐÐÐ)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:318
 #, c-format
 msgid "Error: %s"
 msgstr "ÐÑÐÑÐÐ: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:425
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:427
+#: ../src/gnome-bluetooth/nma-bt-device.c:833
+msgid "Your phone is now ready to use!"
+msgstr "ÐÐÑ ÑÐÐÐÑÐÐ ÑÐ ÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÑÐÐÑ!"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:450
 msgid "Mobile wizard was canceled"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:459
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐ ÑÐÐÐÑÐÐÐ (ÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐ)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:567
+msgid "unknown modem type."
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÐ."
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:639
+#: ../src/gnome-bluetooth/nma-bt-device.c:645
 msgid "failed to connect to the phone."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:676
 msgid "unexpectedly disconnected from the phone."
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐÐ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:686
 msgid "timed out detecting phone details."
 msgstr "ÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÑÐÐÐÑÐÐÑ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:697
 msgid "Detecting phone configuration..."
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÐÐÑÐÐÑ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:829
-msgid ""
-"failed to find Bluetooth device (unknown gnome-bluetooth proxy object type)."
-msgstr ""
-"ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÑÑ ÑÑÐÑÐÑ (ÐÐÐÐÐÐÐÑÐ ÐÑÑÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ "
-"ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÑÐ)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1000
+#: ../src/gnome-bluetooth/nma-bt-device.c:794
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr ""
 "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÑÑÑ ÑÑÐÑÐÑ ÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ-ÐÐ ÐÐÐÐ."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1032
+#: ../src/gnome-bluetooth/nma-bt-device.c:831
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÑÑ ÐÐÐÐÑÐÐÐÑÐ (ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ Ð-ÐÐÑ: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1042
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÑÑ ÐÐÐÐÑÐÐÐÑÐ (ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÑÐÐ Ð-ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ)."
+msgid "Failed to create PAN connection: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1051
+#: ../src/gnome-bluetooth/nma-bt-device.c:852
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÑÑ ÐÐÐÐÑÐÐÐÑÐ (ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐ: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1118
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐ ÑÑÐÑÐÑ (ÐÐÐ/ÐÐÐ)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1127
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ÐÑÐÑÑÑÐÐÑÐ ÐÐÑÐÑÐÐÑÑ ÐÑÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐ (ÐÐÐ)"
+msgid "%s Network"
+msgstr "%s ÐÑÐÐÐ"
 
 #: ../src/gsm-unlock.ui.h:1
 msgid "Automatically unlock this device"
@@ -2549,60 +2606,73 @@ 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 "_ÐÐÐÑÐÐÐ"
 
-#: ../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 wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
-"ÐÐÑÑÐÐÐÐ ÑÑ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÑÑÐÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÐÐÐÑÐÐÑ ÐÑÐÐÐ â%sâ."
+"ÐÐÑÑÐÐÐÐ ÑÑ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÑÑÐÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÑÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÑÐÐÐ â%sâ."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1143
-msgid "Wireless Network Authentication Required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
+#| msgid "Wireless Network Authentication Required"
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1145
-msgid "Authentication required by wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#| msgid "Authentication required by wireless network"
+msgid "Authentication required by Wi-Fi network"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1150
-msgid "Create New Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#| msgid "Create New Wireless Network"
+msgid "Create New Wi-Fi Network"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1152
-msgid "New wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#| msgid "New wireless network"
+msgid "New Wi-Fi network"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1153
-msgid "Enter a name for the wireless network you wish to create."
+#: ../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 "ÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1155
-msgid "Connect to Hidden Wireless Network"
-msgstr "ÐÐÐÐÐÐ ÑÐ ÑÐ ÑÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
+#| msgid "Connect to Hidden Wireless Network"
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐ ÑÐÑÐÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1157
-msgid "Hidden wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
+#| msgid "Hidden wireless network"
+msgid "Hidden Wi-Fi network"
 msgstr "ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1158
+#: ../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 ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "ÐÐÐÑÐÑÐ ÐÐÐÐÐ Ð ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÐÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ ÐÐ ÐÐÑÑ ÐÐÐÐÑÐ "
 "ÐÐ ÑÐ ÐÐÐÐÐÐÑÐ."
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#| msgid "Wireless _security:"
+msgid "Wi-Fi _security:"
 msgstr "ÐÐÐÐÑÐÐ _ÐÐÐÐÐÐÐÐÑÑ:"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
@@ -2610,7 +2680,8 @@ msgid "C_onnection:"
 msgstr "_ÐÐÐÐ:"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#| msgid "Wireless _adapter:"
+msgid "Wi-Fi _adapter:"
 msgstr "ÐÐÐÐÑÐÐ _ÑÑÐÑÐÑ:"
 
 #: ../src/main.c:73
@@ -2711,27 +2782,26 @@ msgstr "ÐÑÐÐÐ Ñ ÑÐÐÐÐÐÑ"
 msgid "Default"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../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 ""
-"ÐÑÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÑÑÑÑÐ (â.uiâ "
-"ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ)."
+#. 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/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 ""
 "ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ (ÐÐ) ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐ "
 "ÐÐÑÐ ÐÐÑÐÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐ.  ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ?"
@@ -2942,3 +3012,60 @@ msgstr "Ð_ÑÐÐÐÐÐ ÐÑÑÑ"
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "ÐÐÐ Ð_ÐÐÐÐÑ:"
+
+# bug: no plural forms
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
+
+# bug: no plural forms
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
+
+# bug: no plural forms
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
+#~ msgstr[1] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
+#~ msgstr[2] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
+#~ msgstr[3] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
+
+#~ 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)."
+#~ msgstr ""
+#~ "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÑÑ ÑÑÐÑÐÑ (ÐÐÐÐÐÐÐÑÐ ÐÑÑÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ "
+#~ "ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÑÐ)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÑÑ ÐÐÐÐÑÐÐÐÑÐ (ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÑÐÐ Ð-ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ)."
diff --git a/po/sr latin po b/po/sr latin po
index 9cae088..489983e 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ";
 "kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-07 22:00+0000\n"
-"PO-Revision-Date: 2012-08-08 09:19+0200\n"
+"POT-Creation-Date: 2012-08-09 18:11+0000\n"
+"PO-Revision-Date: 2012-08-17 18:28+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -74,9 +74,11 @@ msgid "Suppress networks available notifications"
 msgstr "IskljuÄi obaveÅtavanja o dostupnim mreÅama"
 
 #: ../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."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "UkljuÄite ovu opciju da iskljuÄite obaveÅtenja o dostupnosti beÅiÄnih mreÅa."
 
@@ -96,8 +98,7 @@ msgstr "OnemoguÄi obrazovanje beÅiÄne mreÅe"
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"UkljuÄite ovu opciju da iskljuÄite obrazovanje adhok mreÅa iz Upravnika "
-"mreÅama."
+"UkljuÄite ovu opciju da iskljuÄite obrazovanje adhok mreÅa iz Upravnika mreÅama."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
 msgid "Ignore CA certificate"
@@ -119,6 +120,16 @@ msgstr ""
 "UkljuÄite ovu opciju da iskljuÄite upozorenja o CA uverenjima u drugoj fazi EAP "
 "potvrÄivanja identiteta."
 
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#| msgid "Wired 802.1X authentication"
+msgid "802.1X authentication"
+msgstr "PotvrÄivanje identiteta za 802.1X vezu"
+
+#: ../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 "_Ime mreÅe:"
+
 #: ../src/applet.c:488
 msgid "Failed to add/activate connection"
 msgstr "Nisam uspeo da dodam/aktiviram vezu"
@@ -320,7 +331,7 @@ msgid "device not ready"
 msgstr "ureÄaj nije spreman"
 
 #. 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 "veza je prekinuta"
 
@@ -361,9 +372,10 @@ msgstr "UmreÅavanje iskljuÄeno"
 msgid "Enable _Networking"
 msgstr "UkljuÄi _mreÅne usluge"
 
-#. 'Enable Wireless' item
+#. 'Enable Wi-Fi' item
 #: ../src/applet.c:2060
-msgid "Enable _Wireless"
+#| msgid "Enable _Wireless"
+msgid "Enable _Wi-Fi"
 msgstr "UkljuÄi _beÅiÄno mreÅenje"
 
 #. 'Enable Mobile Broadband' item
@@ -419,8 +431,8 @@ msgstr "Pripremam mreÅnu vezu â%sâ..."
 msgid "User authentication required for network connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje veze â%sâ..."
 
-#: ../src/applet.c:2500 ../src/applet-device-bt.c:240
-#: ../src/applet-device-cdma.c:490 ../src/applet-device-gsm.c:537
+#: ../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
 msgid "Requesting a network address for '%s'..."
@@ -459,152 +471,217 @@ msgstr "Nema mreÅne veze"
 msgid "NetworkManager Applet"
 msgstr "ProgramÄe upravnika mreÅe"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../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 "Dostupno"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../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 "Povezani ste na â%sâ."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../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 "Veza uspostavljena"
 
-#: ../src/applet-device-bt.c:205
+#: ../src/applet-device-bt.c:204
 msgid "You are now connected to the mobile broadband network."
 msgstr "Povezani ste mobilnom Åirokopojasnom mreÅom."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../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 "Pripremam mobilnu, Åirokopojasnu vezu â%sâ..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../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 "PodeÅavam mobilnu, Åirokopojasnu vezu â%sâ..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../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 "Potrebna je prijava korisnika za povezivanje u mobilnoj mreÅi â%sâ..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../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"
 msgstr "Povezani ste preko mobilne Åirokopojasne veze â%sâ"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:699
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
 #: ../src/applet-dialogs.c:424
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilna veza (%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/new-connection.c:100
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
+#: ../src/connection-editor/new-connection.c:85
 #: ../src/connection-editor/page-mobile.c:379
 msgid "Mobile Broadband"
 msgstr "Mobilna"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:412
+#: ../src/applet-device-cdma.c:409
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Nova mobilna Åirokopojasna (CDMA) veza..."
 
-#: ../src/applet-device-cdma.c:446
+#: ../src/applet-device-cdma.c:443
 msgid "You are now connected to the CDMA network."
 msgstr "Sada ste povezani na CDMA mreÅu."
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
 #: ../src/applet-device-wimax.c:482
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Povezani ste na mobilnu Åirokopojasnu vezu â%sâ: (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "roming"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
+#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
 msgid "CDMA network."
 msgstr "CDMA mreÅa."
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
+#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
 msgid "You are now registered on the home network."
 msgstr "Sada ste registrovani na kuÄnu mreÅu."
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
 msgid "You are now registered on a roaming network."
 msgstr "Sada ste registrovani na mreÅu prebacivanja."
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:702
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "Automatska ÅiÄana veza"
+
+#: ../src/applet-device-ethernet.c:205
+#, c-format
+#| msgid "Wired Networks (%s)"
+msgid "Ethernet Networks (%s)"
+msgstr "ÅiÄane mreÅe (%s)"
+
+#: ../src/applet-device-ethernet.c:207
+#, c-format
+#| msgid "Wired Network (%s)"
+msgid "Ethernet Network (%s)"
+msgstr "ÅiÄana mreÅa (%s)"
+
+#: ../src/applet-device-ethernet.c:210
+#| msgid "Wired Networks"
+msgid "Ethernet Networks"
+msgstr "ÅiÄane mreÅe"
+
+#: ../src/applet-device-ethernet.c:212
+#| msgid "Wired Network"
+msgid "Ethernet Network"
+msgstr "ÅiÄana mreÅa"
+
+#: ../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 "Povezani ste na ÅiÄanu mreÅu."
+
+#: ../src/applet-device-ethernet.c:300
+#, c-format
+#| msgid "Preparing wired network connection '%s'..."
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "Pripremam vezu preko ÅiÄane mreÅu â%sâ..."
+
+#: ../src/applet-device-ethernet.c:303
+#, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "PodeÅavam vezu preko ÅiÄane mreÅu â%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 "Potrebna je prijava korisnika za uspostavljanje ÅiÄane veze â%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 "Zahtevam adresu za ÅiÄanu mreÅu â%sâ..."
+
+#: ../src/applet-device-ethernet.c:313
+#, c-format
+#| msgid "Wired network connection '%s' active"
+msgid "Ethernet network connection '%s' active"
+msgstr "Povezani ste preko ÅiÄane veze â%sâ"
+
+#: ../src/applet-device-ethernet.c:494
+msgid "DSL authentication"
+msgstr "PotvrÄivanje identiteta DSL-a"
+
+#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:702
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:459
+#: ../src/applet-device-gsm.c:457
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Nova mobilna, Åirokopojasna mreÅa..."
 
-#: ../src/applet-device-gsm.c:493
+#: ../src/applet-device-gsm.c:491
 msgid "You are now connected to the GSM network."
 msgstr "Povezani ste na GSM mreÅu."
 
-#: ../src/applet-device-gsm.c:654
+#: ../src/applet-device-gsm.c:652
 msgid "PIN code required"
 msgstr "Potreban je PIN kÃd"
 
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-gsm.c:660
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Potreban je PIN kod za povezivanje mobilnog Åirokopojasnog ureÄaja"
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet-device-gsm.c:781
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN kod za SIM karticu â%sâ na â%sâ"
 
-#: ../src/applet-device-gsm.c:875
+#: ../src/applet-device-gsm.c:873
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PogreÅan PIN kod, kontaktirajte vaÅeg provajdera."
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:896
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PogreÅan PUK kod, kontaktirajte vaÅeg provajdera."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-gsm.c:923
 msgid "Sending unlock code..."
 msgstr "Åaljem kod za otkljuÄavanje..."
 
-#: ../src/applet-device-gsm.c:988
+#: ../src/applet-device-gsm.c:986
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otkljuÄati SIM PIN"
 
-#: ../src/applet-device-gsm.c:989
+#: ../src/applet-device-gsm.c:987
 msgid "SIM PIN Unlock Required"
 msgstr "Potrebno je otkljuÄati SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
+#: ../src/applet-device-gsm.c:989
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -612,25 +689,25 @@ msgid ""
 msgstr "Mobilni Åirokopojasni ureÄaj â%sâ zahteva SIM PIN kod."
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
+#: ../src/applet-device-gsm.c:991
 msgid "PIN code:"
 msgstr "PIN kÃd:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
+#: ../src/applet-device-gsm.c:995
 msgid "Show PIN code"
 msgstr "PrikaÅi PIN kÃd"
 
-#: ../src/applet-device-gsm.c:1000
+#: ../src/applet-device-gsm.c:998
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otkljuÄati SIM PUK"
 
-#: ../src/applet-device-gsm.c:1001
+#: ../src/applet-device-gsm.c:999
 msgid "SIM PUK Unlock Required"
 msgstr "Potrebno je otkljuÄati SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
+#: ../src/applet-device-gsm.c:1001
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -638,69 +715,73 @@ msgid ""
 msgstr "Mobilni Åirokopojasni ureÄaj â%sâ zahteva SIM PUK kÃd."
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
+#: ../src/applet-device-gsm.c:1003
 msgid "PUK code:"
 msgstr "PUK kÃd:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
+#: ../src/applet-device-gsm.c:1006
 msgid "New PIN code:"
 msgstr "Novi PIN kÃd:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
+#: ../src/applet-device-gsm.c:1008
 msgid "Re-enter new PIN code:"
 msgstr "Ponovo unesite PIN kÃd:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
+#: ../src/applet-device-gsm.c:1013
 msgid "Show PIN/PUK codes"
 msgstr "PrikaÅi PIN/PUK kÃdove"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
+#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
 msgid "GSM network."
 msgstr "GSM mreÅa."
 
 #: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "Po_veÅi se na skrivene beÅiÄne mreÅe..."
+#| msgid "_Connect to Hidden Wireless Network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "PoveÅi se na _skrivenu beÅiÄnu mreÅu..."
 
 #: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
+#| msgid "Create _New Wireless Network..."
+msgid "Create _New Wi-Fi Network..."
 msgstr "Napravi _novu beÅiÄnu mreÅu..."
 
 #: ../src/applet-device-wifi.c:292
 msgid "(none)"
 msgstr "(niÅta)"
 
-# bug: no plural forms
 #: ../src/applet-device-wifi.c:790
 #, c-format
-msgid "Wireless Networks (%s)"
+#| msgid "Wired Networks (%s)"
+msgid "Wi-Fi Networks (%s)"
 msgstr "BeÅiÄne mreÅe (%s)"
 
-# bug: no plural forms
 #: ../src/applet-device-wifi.c:792
 #, c-format
-msgid "Wireless Network (%s)"
+#| msgid "Wired Network (%s)"
+msgid "Wi-Fi Network (%s)"
 msgstr "BeÅiÄna mreÅa (%s)"
 
-# bug: no plural forms
 #: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
+#| msgid "Wired Network"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
 msgstr[0] "BeÅiÄna mreÅa"
 msgstr[1] "BeÅiÄne mreÅe"
 msgstr[2] "BeÅiÄne mreÅe"
-msgstr[3] "BeÅiÄna mreÅa"
+msgstr[3] "ÅiÄana mreÅa"
 
 #: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "beÅiÄna mreÅa je onemoguÄena"
+#| msgid "WiMAX is disabled"
+msgid "Wi-Fi is disabled"
+msgstr "BeÅiÄna mreÅa je iskljuÄena"
 
 #: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "beÅiÄna mreÅa je iskljuÄena fiziÄkim prekidaÄem"
+#| msgid "WiMAX is disabled by hardware switch"
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "BeÅiÄna mreÅa je iskljuÄena fiziÄkim prekidaÄem"
 
 #: ../src/applet-device-wifi.c:889
 msgid "More networks"
@@ -708,46 +789,55 @@ msgstr "JoÅ mreÅa"
 
 # bug: no plural forms
 #: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
+#| msgid "Wireless Networks Available"
+msgid "Wi-Fi Networks Available"
 msgstr "Dostupne su beÅiÄne mreÅe"
 
 #: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
+#| msgid "Use the network menu to connect to a wireless network"
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Koristite izbornik mreÅe da se poveÅete na beÅiÄnu mreÅu"
 
 #: ../src/applet-device-wifi.c:1263
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Povezani ste sa beÅiÄnom mreÅom â%sâ."
+#| msgid "You are now connected to the wireless network '%s'."
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "Povezani ste na beÅiÄnu mreÅu â%sâ."
 
 #: ../src/applet-device-wifi.c:1294
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Pripremam vezu preko beÅiÄne mreÅe â%sâ..."
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Pripremam beÅiÄnu mreÅnu vezu â%sâ..."
 
 #: ../src/applet-device-wifi.c:1297
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "PodeÅavam vezu preko beÅiÄne mreÅe â%sâ..."
 
 #: ../src/applet-device-wifi.c:1300
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
+#| msgid "User authentication required for wireless network '%s'..."
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje beÅiÄne veze â%sâ..."
 
 #: ../src/applet-device-wifi.c:1303
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Zahtevam adresu za beÅiÄnu mreÅu â%sâ..."
+#| msgid "Requesting a network address for '%s'..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Zahtevam adresu beÅiÄne mreÅe za â%sâ..."
 
 #: ../src/applet-device-wifi.c:1324
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#| msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Povezani ste preko beÅiÄne veze â%sâ : %s (%d%%)"
 
 #: ../src/applet-device-wifi.c:1329
 #, c-format
-msgid "Wireless network connection '%s' active"
+#| msgid "Wired network connection '%s' active"
+msgid "Wi-Fi network connection '%s' active"
 msgstr "Povezani ste preko beÅiÄne veze â%sâ"
 
 #: ../src/applet-device-wifi.c:1377
@@ -779,68 +869,13 @@ msgstr "ViMAKS je iskljuÄena fiziÄkim prekidaÄem"
 msgid "You are now connected to the WiMAX network."
 msgstr "Sada ste povezani na ViMAKS mreÅu."
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "Automatska ÅiÄana veza"
-
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
-msgstr "ÅiÄane mreÅe (%s)"
-
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "ÅiÄana mreÅa (%s)"
-
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "ÅiÄane mreÅe"
-
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "ÅiÄana mreÅa"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "Povezani ste na ÅiÄanu mreÅu."
-
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "Pripremam vezu preko ÅiÄane mreÅu â%sâ..."
-
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "PodeÅavam vezu preko ÅiÄane mreÅu â%sâ..."
-
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "Potrebna je prijava korisnika za uspostavljanje ÅiÄane veze â%sâ..."
-
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "Zahtevam adresu za ÅiÄanu mreÅu â%sâ..."
-
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
-msgstr "Povezani ste preko ÅiÄane veze â%sâ"
-
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "PotvrÄivanje identiteta DSL-a"
-
 #: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "GreÅka pri prikazivanju podataka o vezi:"
 
 #: ../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"
@@ -859,8 +894,7 @@ msgid "WEP"
 msgstr "VEP"
 
 #: ../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 "NiÅta"
@@ -1171,29 +1205,101 @@ msgstr "PrikaÅi _lozinku"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ReÅim _prenosa:"
+#: ../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 "Samostalno"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Upleteni par (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "SuÄelje jedinice prikaÄinjanja (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 "SuÄelje nezavisnog medija (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 "_Port:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Brzina:"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Puni _dupleks"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "_Samougovaranje"
+
+#: ../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 "_MAK adresa ureÄaja:"
 
-#: ../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 "bajta"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "_Klonirana MAK adresa:"
+
+#: ../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 ""
+"Uneta MAK adresa se koristi kao adresa mreÅnog ureÄaja.  Ova moguÄnost se "
+"naziva MAK kloniranje ili spufing.  Primer: 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:"
 
+#: ../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 "bajta"
+
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr "ReÅim _prenosa:"
+
 #. IP-over-InfiniBand "datagram mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
@@ -1204,15 +1310,6 @@ msgstr "Datagram"
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../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 "Samostalno"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1431,137 +1528,72 @@ msgstr "Eho"
 msgid "Send PPP _echo packets"
 msgstr "Åalji PPP _eho pakete"
 
-#: ../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 "_Ime mreÅe:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Upleteni par (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "SuÄelje jedinice prikaÄinjanja (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 "SuÄelje nezavisnog medija (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 "_Port:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_Brzina:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "Puni _dupleks"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "_Samougovaranje"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "_Klonirana MAK adresa:"
-
-#: ../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 ""
-"Uneta MAK adresa se koristi kao adresa mreÅnog ureÄaja.  Ova moguÄnost se "
-"naziva MAK kloniranje ili spufing.  Primer: 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 "B_ezbednost:"
 
-#: ../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 "Infrastrukturno"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
 msgstr "Ad-hok"
 
-#: ../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 "_JaÄina prenosa:"
 
-#: ../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 "_Protok:"
 
-#: ../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 ""
-"Ova opcija dodeljuje vezu beÅiÄnoj pristupnoj taÄki (AP) koja je odreÄen "
-"BSSID-om.  Npr: 00:11:22:33:44:55"
+"Ova opcija dodeljuje ovu vezu taÄki beÅiÄnog pristupa (AP) koja je navedena "
+"ovde unetim BSSID-om.  Npr: 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:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanal:"
 
 # Valjda se odnosi na opseg, a?
 # ~MiloÅ
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Opseg:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "M_ode:"
 msgstr "_ReÅim:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
@@ -1648,37 +1680,38 @@ msgstr "MetriÄki"
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/new-connection.c:88
-#: ../src/connection-editor/page-wired.c:273
-msgid "Wired"
-msgstr "ÅiÄana"
+#: ../src/connection-editor/new-connection.c:75
+#: ../src/connection-editor/page-ethernet.c:273
+#| msgid "Auto Ethernet"
+msgid "Ethernet"
+msgstr "ÅiÄana veza"
 
-#: ../src/connection-editor/new-connection.c:94
-#: ../src/connection-editor/page-wireless.c:462
-msgid "Wireless"
+#: ../src/connection-editor/new-connection.c:80
+#: ../src/connection-editor/page-wifi.c:462
+msgid "Wi-Fi"
 msgstr "BeÅiÄna"
 
-#: ../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 "ViMAH"
+msgstr "ViMAKS"
 
-#: ../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 "Infini band"
 
-#: ../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 "Uvezi saÄuvna VPN podeÅavanja..."
 
@@ -1735,17 +1768,17 @@ msgstr "_Dostupno svim korisnicima"
 msgid "_Export..."
 msgstr "_Izvezi..."
 
-#: ../src/connection-editor/nm-connection-list.c:177
+#: ../src/connection-editor/nm-connection-list.c:169
 msgid "never"
 msgstr "nikad"
 
-#: ../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 "sada"
 
 #. 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"
@@ -1754,7 +1787,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../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"
@@ -1763,7 +1796,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../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"
@@ -1772,7 +1805,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../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"
@@ -1781,7 +1814,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../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"
@@ -1790,117 +1823,130 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godine"
 
-#: ../src/connection-editor/nm-connection-list.c:451
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection add failed"
 msgstr "Nije uspelo dodavanje veze"
 
-#: ../src/connection-editor/nm-connection-list.c:480
+#: ../src/connection-editor/nm-connection-list.c:472
 msgid "Error saving connection"
 msgstr "GreÅka prilikom Äuvanja veze"
 
-#: ../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 "Svojstvo â%sâ/ â%sâ je nevaÅeÄe: â%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 "DoÅlo je do nepoznate greÅke."
 
-#: ../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 "GreÅka u pokretanju ureÄivaÄa"
 
-#: ../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 "Ne mogu da pokrenem prozorÄe za izmenu veze zbog nepoznate greÅke."
 
-#: ../src/connection-editor/nm-connection-list.c:520
+#: ../src/connection-editor/nm-connection-list.c:512
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:532
+#: ../src/connection-editor/nm-connection-list.c:524
 msgid "Could not edit new connection"
 msgstr "Ne mogu da uredim novu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:677
+#: ../src/connection-editor/nm-connection-list.c:669
 msgid "Could not edit connection"
 msgstr "Ne mogu da uredim vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:707
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "Connection delete failed"
 msgstr "Ne mogu da obriÅem vezu"
 
-#: ../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 "Da li da zaista obriÅem vezu %s?"
 
-#: ../src/connection-editor/nm-connection-list.c:1000
+#: ../src/connection-editor/nm-connection-list.c:972
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
+#: ../src/connection-editor/nm-connection-list.c:985
 msgid "Last Used"
 msgstr "Upotrbljena"
 
 #. Edit
-#: ../src/connection-editor/nm-connection-list.c:1062
+#: ../src/connection-editor/nm-connection-list.c:1026
 msgid "_Edit"
 msgstr "_UreÄivanje"
 
-#: ../src/connection-editor/nm-connection-list.c:1063
+#: ../src/connection-editor/nm-connection-list.c:1027
 msgid "Edit the selected connection"
 msgstr "UreÄuje podatke za izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: ../src/connection-editor/nm-connection-list.c:1028
 msgid "_Edit..."
 msgstr "_Uredi..."
 
-#: ../src/connection-editor/nm-connection-list.c:1065
+#: ../src/connection-editor/nm-connection-list.c:1029
 msgid "Authenticate to edit the selected connection"
 msgstr "Prijavite se kako bi izmenili izabranu vezu"
 
 #. Delete
-#: ../src/connection-editor/nm-connection-list.c:1079
+#: ../src/connection-editor/nm-connection-list.c:1043
 msgid "_Delete"
 msgstr "_ObriÅi"
 
-#: ../src/connection-editor/nm-connection-list.c:1080
+#: ../src/connection-editor/nm-connection-list.c:1044
 msgid "Delete the selected connection"
 msgstr "BriÅe izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1081
+#: ../src/connection-editor/nm-connection-list.c:1045
 msgid "_Delete..."
 msgstr "_ObriÅi..."
 
-#: ../src/connection-editor/nm-connection-list.c:1082
+#: ../src/connection-editor/nm-connection-list.c:1046
 msgid "Authenticate to delete the selected connection"
 msgstr "Prijavite se kako bi obrisali izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1321
+#: ../src/connection-editor/nm-connection-list.c:1285
 msgid "Error creating connection"
 msgstr "GreÅka prilikom stvaranja veze"
 
-#: ../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 "Ne znam kako da napravim â%sâ vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1377
+#: ../src/connection-editor/nm-connection-list.c:1341
 msgid "Error editing connection"
 msgstr "GreÅka prilikom ureÄivanja veze"
 
-#: ../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 "Nisam naÅao vezu koja ima UUID â%sâ"
 
+#: ../src/connection-editor/page-8021x-security.c:119
+msgid "802.1x Security"
+msgstr "Bezbednost 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 "Ne mogu da uÄitam bezbednosno korisniÄko suÄelje za 802.1x."
+
+#: ../src/connection-editor/page-8021x-security.c:139
+msgid "Use 802.1_X security for this connection"
+msgstr "Koristi 802.1_X bezbednost za ovu vezu"
+
 #: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr "Ne mogu da uÄitam korisniÄko suÄelje za DSL."
@@ -1910,10 +1956,10 @@ msgstr "Ne mogu da uÄitam korisniÄko suÄelje za DSL."
 msgid "DSL connection %d"
 msgstr "DSL veza â%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"
@@ -1921,6 +1967,17 @@ msgstr ""
 "Ova opcija zakljuÄava vezu sa mreÅnim ureÄajem koji je odreÄen trajnom MAK "
 "adresom.  Npr: 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 "Ne mogu da uÄitam korisniÄko suÄelje za ÅiÄanu mreÅu."
+
+#: ../src/connection-editor/page-ethernet.c:451
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Ethernet connection %d"
+msgstr "ÅiÄana veza %d"
+
 #: ../src/connection-editor/page-infiniband.c:192
 msgid "Could not load InfiniBand user interface."
 msgstr "Ne mogu da uÄitam korisniÄko suÄelje Infini banda."
@@ -2138,96 +2195,87 @@ msgstr ""
 "vrsta VPN veze koju Åelite da napravite ne pojavi na spisku, moÅda nemate "
 "instaliran ispravan VPN prikljuÄak."
 
-#: ../src/connection-editor/page-wimax.c:160
-msgid "Could not load WiMAX user interface."
-msgstr "Ne mogu da uÄitam korisniÄko suÄelje za ViMAKS."
-
-#: ../src/connection-editor/page-wimax.c:289
-#, c-format
-msgid "WiMAX connection %d"
-msgstr "ViMAKS veza %d"
-
-#: ../src/connection-editor/page-wired.c:275
-msgid "Could not load wired user interface."
-msgstr "Ne mogu da uÄitam korisniÄko suÄelje za ÅiÄanu mreÅu."
-
-#: ../src/connection-editor/page-wired.c:451
-#, c-format
-msgid "Wired connection %d"
-msgstr "ÅiÄana veza %d"
-
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "Bezbednost 802.1x"
-
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "Ne mogu da uÄitam bezbedno korisniÄko suÄelje ÅiÄane sigurnosti."
-
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "Koristi 802.1_X bezbednost za ovu vezu"
-
-#: ../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 "osnovno"
 
-#: ../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."
+#: ../src/connection-editor/page-wifi.c:464
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load Wi-Fi user interface."
 msgstr "Ne mogu da uÄitam korisniÄko suÄelje za beÅiÄnu mreÅu."
 
-#: ../src/connection-editor/page-wireless.c:669
+#: ../src/connection-editor/page-wifi.c:669
 #, c-format
-msgid "Wireless connection %d"
+#| msgid "WiMAX connection %d"
+msgid "Wi-Fi connection %d"
 msgstr "BeÅiÄna veza %d"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:903
+#: ../src/connection-editor/page-wifi-security.c:265
+#| msgctxt "Wifi/wired security"
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "NiÅta"
+
+#: ../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 "VEP 40/128-bitni kljuÄ"
 
-#: ../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 "VEP 128-bitna lozinka"
 
-#: ../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 "DinamiÄki VEP (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 "LiÄni VPA & VPA2"
 
-#: ../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 "Poslovni VPA & VPA2"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../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 ""
 "Ne mogu da uÄitam bezbednosno korisniÄko suÄelje za beÅiÄnu mreÅu; nedostaju "
-"ViFi podeÅavanja."
+"podeÅavanja beÅiÄne mreÅe."
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:405
+#| msgid "Wireless Security"
+msgid "Wi-Fi Security"
 msgstr "BeÅiÄna bezbednost"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../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 "Ne mogu da uÄitam bezbednosno korisniÄko suÄelje za beÅiÄnu mreÅu."
 
+#: ../src/connection-editor/page-wimax.c:160
+msgid "Could not load WiMAX user interface."
+msgstr "Ne mogu da uÄitam korisniÄko suÄelje za ViMAKS."
+
+#: ../src/connection-editor/page-wimax.c:289
+#, c-format
+msgid "WiMAX connection %d"
+msgstr "ViMAKS veza %d"
+
 #: ../src/connection-editor/vpn-helpers.c:207
 msgid "Cannot import VPN connection"
 msgstr "Ne mogu da uvezem VPN vezu"
@@ -2282,92 +2330,101 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "Izvezi VPN vezu..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Nisam uspeo da napravim PAN vezu: %s"
+#: ../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 ""
+"ProgramÄe Upravnik mreÅe ne moÅe da pronaÄe neke potrebne resurse (â.uiâ "
+"datoteka nije pronaÄena)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "VaÅ telefon je spreman za upotrebu!"
+#: ../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 ""
+"Nije moguÄe podeÅavanje Blututa (nisam uspeo da se poveÅem na D-sabirnicu: (%"
+"s) %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
+#: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-msgid "%s Network"
-msgstr "%s mreÅa"
+#| msgid ""
+#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr ""
+"Nije moguÄe podeÅavanje Blututa (ne mogu da naÄem Upravnika mreÅe: (%s) %s)."
+
+#: ../src/gnome-bluetooth/bt-widget.c:445
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "Upotrebite mobilni telefon kao mreÅni ureÄaj (PAN/NAP)"
+
+#: ../src/gnome-bluetooth/bt-widget.c:454
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "Pristupite Internetu preko mobilnog telefona (DUN)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:318
 #, c-format
 msgid "Error: %s"
 msgstr "GreÅka: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:425
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "Nisam uspeo da napravim DUN vezu: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:427
+#: ../src/gnome-bluetooth/nma-bt-device.c:833
+msgid "Your phone is now ready to use!"
+msgstr "VaÅ telefon je spreman za upotrebu!"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:450
 msgid "Mobile wizard was canceled"
 msgstr "Äarobnjak za mobilne ureÄaje je otkazan"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:459
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Nepoznat tip telefona (nije GSM ni CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:567
+msgid "unknown modem type."
+msgstr "nepoznat modem."
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:639
+#: ../src/gnome-bluetooth/nma-bt-device.c:645
 msgid "failed to connect to the phone."
 msgstr "ne mogu da se poveÅem na telefon."
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:676
 msgid "unexpectedly disconnected from the phone."
 msgstr "neoÄekivan prekid veze sa telefonom."
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:686
 msgid "timed out detecting phone details."
 msgstr "isteklo je vreme za nalaÅenje podataka o telefonu."
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:697
 msgid "Detecting phone configuration..."
 msgstr "TraÅim podatke o telefonu..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:829
-msgid ""
-"failed to find Bluetooth device (unknown gnome-bluetooth proxy object type)."
-msgstr ""
-"nisam uspeo da pronaÄem blutut ureÄaj (nepoznata vrsta objekta posrednika "
-"gnomovog blututa)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1000
+#: ../src/gnome-bluetooth/nma-bt-device.c:794
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr ""
 "Morate da omoguÄite podrazumevani Blutut ureÄaj pre podeÅavanja Dajl-ap veze."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1032
+#: ../src/gnome-bluetooth/nma-bt-device.c:831
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "Nije moguÄe Blutut podeÅavanje (ne mogu da se poveÅem na D-Bas: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1042
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Nije moguÄe Blutut podeÅavanje (ne mogu da obrazujem D-Bas posrednika)."
+msgid "Failed to create PAN connection: %s"
+msgstr "Nisam uspeo da napravim PAN vezu: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1051
+#: ../src/gnome-bluetooth/nma-bt-device.c:852
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Nije moguÄe Blutut podeÅavanje (ne mogu da naÄem Upravnika mreÅe: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1118
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Upotrebite mobilni telefon kao mreÅni ureÄaj (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1127
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Pristupite Internetu preko mobilnog telefona (DUN)"
+msgid "%s Network"
+msgstr "%s mreÅa"
 
 #: ../src/gsm-unlock.ui.h:1
 msgid "Automatically unlock this device"
@@ -2549,60 +2606,73 @@ msgstr "Podesi mobilnu, Åirokopojasnu vezu"
 msgid "New Mobile Broadband Connection"
 msgstr "Nova mobilna, Åirokopojasna veza"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:438
+#: ../src/libnm-gtk/nm-wifi-dialog.c:438
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1057
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../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 wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
-"Potrebne su lozinke ili kljuÄevi Åifrovanja za pristupanje beÅiÄnoj mreÅi â%sâ."
+"Potrebne su lozinke ili kljuÄevi Åifrovanja za pristup beÅiÄnoj mreÅi â%sâ."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1143
-msgid "Wireless Network Authentication Required"
-msgstr "Potrebna je prijava na beÅiÄnu mreÅu"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
+#| msgid "Wireless Network Authentication Required"
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Potrebno je potvrÄivanje identiteta za beÅiÄnu mreÅu"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1145
-msgid "Authentication required by wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#| msgid "Authentication required by wireless network"
+msgid "Authentication required by Wi-Fi network"
 msgstr "BeÅiÄna mreÅa zahteva potvrÄivanje identiteta"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1150
-msgid "Create New Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#| msgid "Create New Wireless Network"
+msgid "Create New Wi-Fi Network"
 msgstr "Napravi novu beÅiÄnu mreÅu"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1152
-msgid "New wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#| msgid "New wireless network"
+msgid "New Wi-Fi network"
 msgstr "Nova beÅiÄna mreÅa"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1153
-msgid "Enter a name for the wireless network you wish to create."
+#: ../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 "Unesite naziv za novu beÅiÄnu mreÅu."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1155
-msgid "Connect to Hidden Wireless Network"
-msgstr "PoveÅi se sa skrivenim beÅiÄnim mreÅama"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
+#| msgid "Connect to Hidden Wireless Network"
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "PoveÅi se na skrivenu beÅiÄnu mreÅu"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1157
-msgid "Hidden wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
+#| msgid "Hidden wireless network"
+msgid "Hidden Wi-Fi network"
 msgstr "Skrivena beÅiÄna mreÅa"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1158
+#: ../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 ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Unesite naziv i bezbednosne podatke za skrivenu beÅiÄnu mreÅu na koju Åelite "
 "da se poveÅete."
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#| msgid "Wireless _security:"
+msgid "Wi-Fi _security:"
 msgstr "BeÅiÄna _bezbednost:"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
@@ -2610,7 +2680,8 @@ msgid "C_onnection:"
 msgstr "_Veza:"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#| msgid "Wireless _adapter:"
+msgid "Wi-Fi _adapter:"
 msgstr "BeÅiÄni _ureÄaj:"
 
 #: ../src/main.c:73
@@ -2711,27 +2782,26 @@ msgstr "MreÅa u romingu"
 msgid "Default"
 msgstr "Podrazumevana"
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "PotvrÄivanje identiteta za ÅiÄanu 802.1X vezu"
-
-#: ../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 ""
-"ProgramÄe Upravnik mreÅe ne moÅe da pronaÄe neke potrebne resurse (â.uiâ "
-"datoteka nije pronaÄena)."
+#. 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 veza"
 
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "Nije izabrano uverenje izdavaÄa ovlaÅÄenja"
 
 #: ../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 ""
 "Ukoliko ne izaberete uverenje izdavaÄa ovlaÅÄenja (CA) vaÅa beÅiÄna veza moÅe "
 "biti nesigurna ili laÅna.  Da li Åelite da izaberete uverenje?"
@@ -2942,3 +3012,60 @@ msgstr "P_rikaÅi kljuÄ"
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "VEP i_ndeks:"
+
+# bug: no plural forms
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "BeÅiÄne mreÅe (%s)"
+
+# bug: no plural forms
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "BeÅiÄna mreÅa (%s)"
+
+# bug: no plural forms
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "BeÅiÄna mreÅa"
+#~ msgstr[1] "BeÅiÄne mreÅe"
+#~ msgstr[2] "BeÅiÄne mreÅe"
+#~ msgstr[3] "BeÅiÄna mreÅa"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "beÅiÄna mreÅa je onemoguÄena"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "beÅiÄna mreÅa je iskljuÄena fiziÄkim prekidaÄem"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Pripremam vezu preko beÅiÄne mreÅe â%sâ..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "PodeÅavam vezu preko beÅiÄne mreÅe â%sâ..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Zahtevam adresu za beÅiÄnu mreÅu â%sâ..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Povezani ste preko beÅiÄne veze â%sâ"
+
+#~ msgid "Wired"
+#~ msgstr "ÅiÄana"
+
+#~ msgid "Wireless"
+#~ msgstr "BeÅiÄna"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "Ne mogu da uÄitam bezbedno korisniÄko suÄelje ÅiÄane sigurnosti."
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "BeÅiÄna veza %d"
+
+#~ msgid ""
+#~ "failed to find Bluetooth device (unknown gnome-bluetooth proxy object "
+#~ "type)."
+#~ msgstr ""
+#~ "nisam uspeo da pronaÄem blutut ureÄaj (nepoznata vrsta objekta posrednika "
+#~ "gnomovog blututa)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "Nije moguÄe Blutut podeÅavanje (ne mogu da obrazujem D-Bas posrednika)."