[network-manager-applet] Updated Serbian translation

[Miloš Popović <mpopovic src gnome org>]

commit 9459adc5613f4136a728f8f6a098bbc632bd27d0
Author: Miroslav NikoliÄ? <miroslavnikolic rocketmail com>
Date:   Sat Mar 19 14:39:07 2011 +0100

    Updated Serbian translation

 po/sr.po       | 2234 +++++++++++++++++++++++++++++++-------------------------
 po/sr latin po | 2148 ++++++++++++++++++++++++++++++------------------------
 2 files changed, 2449 insertions(+), 1933 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index f6d9fa9..d5b1ecd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,25 +1,24 @@
 # Serbian translation of network-manager-applet
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2004 - 2009.
-#
 # This file is distributed under the same license as the totem package.
-#
 # Maintainer: Filip Miletic
 # Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>, 2010.
-#
+# Ð?иÑ?оÑ?лав Ð?иколиÑ? <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=NetworkManager&component=nm-applet\n"
-"POT-Creation-Date: 2010-08-12 12:12+0000\n"
-"PO-Revision-Date: 2010-08-20 15:48+0200\n"
-"Last-Translator: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>\n"
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2011-03-15 17:19+0000\n"
+"PO-Revision-Date: 2011-03-10 20:44+0200\n"
+"Last-Translator: Ð?иÑ?оÑ?лав Ð?иколиÑ? <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Control your network connections"
@@ -44,28 +43,27 @@ msgstr "Ð?Ñ?кÑ?Ñ?Ñ?иваÑ?е обавеÑ?Ñ?еÑ?а о пÑ?екидÑ? везе"
 #: ../nm-applet.schemas.in.h:4
 msgid "Set this to TRUE to disable notifications when connecting to a network."
 msgstr ""
-"Ð?оÑ?Ñ?авиÑ?е на â??TRUEâ?? како би онемогÑ?Ñ?или обавеÑ?Ñ?еÑ?е пÑ?и повезиваÑ?Ñ? на мÑ?ежÑ?."
+"УкÑ?Ñ?Ñ?иÑ?е овÑ? опÑ?иÑ?Ñ? како би онемогÑ?Ñ?или обавеÑ?Ñ?еÑ?е пÑ?и повезиваÑ?Ñ? на мÑ?ежÑ?."
 
 #: ../nm-applet.schemas.in.h:5
 msgid ""
 "Set this to TRUE to disable notifications when disconnecting from a network."
 msgstr ""
-"Ð?оÑ?Ñ?авиÑ?е на â??TRUEâ?? како би онемогÑ?Ñ?или обавеÑ?Ñ?еÑ?е пÑ?и пÑ?екидÑ? везе Ñ?а "
-"мÑ?ежом."
+"УкÑ?Ñ?Ñ?иÑ?е овÑ? опÑ?иÑ?Ñ? како би онемогÑ?Ñ?или обавеÑ?Ñ?еÑ?е пÑ?и пÑ?екидÑ? везе Ñ?а мÑ?ежом."
 
 #: ../nm-applet.schemas.in.h:6
 msgid ""
 "Set this to TRUE to disable notifications when wireless networks are "
 "available."
 msgstr ""
-"Ð?оÑ?Ñ?авиÑ?е на â??TRUEâ?? како би онемогÑ?Ñ?или обавеÑ?Ñ?еÑ?е о доÑ?Ñ?Ñ?пноÑ?Ñ?и бежиÑ?ниÑ? "
+"УкÑ?Ñ?Ñ?иÑ?е овÑ? опÑ?иÑ?Ñ? како би онемогÑ?Ñ?или обавеÑ?Ñ?еÑ?е о доÑ?Ñ?Ñ?пноÑ?Ñ?и бежиÑ?ниÑ? "
 "мÑ?ежа."
 
 #: ../nm-applet.schemas.in.h:7
 msgid ""
 "Set to TRUE to disable creation of adhoc networks when using the applet."
 msgstr ""
-"Ð?оÑ?Ñ?авиÑ?е на â??TRUEâ?? како би онемогÑ?Ñ?или обÑ?азоваÑ?е адÑ?ок мÑ?ежа из УпÑ?авника "
+"УкÑ?Ñ?Ñ?иÑ?е овÑ? опÑ?иÑ?Ñ? како би онемогÑ?Ñ?или обÑ?азоваÑ?е адÑ?ок мÑ?ежа из УпÑ?авника "
 "мÑ?ежама."
 
 #: ../nm-applet.schemas.in.h:8
@@ -85,35 +83,26 @@ msgid "Manage and change your network connection settings"
 msgstr "УпÑ?авÑ?аÑ?Ñ?е и измениÑ?е подеÑ?аваÑ?а ваÑ?иÑ? мÑ?ежниÑ? веза"
 
 #: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "Network Connections"
 msgstr "Ð?езе Ñ?а мÑ?ежом"
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "Ð?еÑ? Ñ?е покÑ?енÑ?Ñ?о пÑ?огÑ?амÑ?е УпÑ?авника мÑ?еже.\n"
-
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "Ð?е могÑ? да добиÑ?ем %s Ñ?еÑ?виÑ?. (%d)\n"
-
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:332
-#: ../src/applet-device-gsm.c:375 ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:817
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
+#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "Ð?оÑ?Ñ?Ñ?пно"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:374
-#: ../src/applet-device-gsm.c:417 ../src/applet-device-wired.c:270
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
+#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
+#: ../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:378
-#: ../src/applet-device-gsm.c:421 ../src/applet-device-wired.c:274
-#: ../src/applet-device-wifi.c:1258
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
+#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "Ð?еза Ñ?Ñ?поÑ?Ñ?авÑ?ена"
 
@@ -121,264 +110,258 @@ msgstr "Ð?еза Ñ?Ñ?поÑ?Ñ?авÑ?ена"
 msgid "You are now connected to the mobile broadband network."
 msgstr "Ð?овезани Ñ?Ñ?е мобилном Ñ?иÑ?окопоÑ?аÑ?ном мÑ?ежом."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
-#: ../src/applet-device-gsm.c:457
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
+#: ../src/applet-device-gsm.c:463 ../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:417
-#: ../src/applet-device-gsm.c:460
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
+#: ../src/applet-device-gsm.c:466 ../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:420
-#: ../src/applet-device-gsm.c:463
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
+#: ../src/applet-device-gsm.c:469 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е пÑ?иÑ?ава коÑ?иÑ?ника за повезиваÑ?е Ñ? мобилноÑ? мÑ?ежи â??%sâ??..."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:466 ../src/applet.c:2300
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
+#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2383
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Ð?аÑ?Ñ?евам мÑ?ежнÑ? адÑ?еÑ?Ñ? за â??%sâ??..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:484
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
+#: ../src/applet-device-gsm.c:490
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Ð?овезани Ñ?Ñ?е пÑ?еко мобилне Ñ?иÑ?окопоÑ?аÑ?не везе â??%sâ??"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:621
-#: ../src/mb-menu-item.c:55
+#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
+#: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "ЦÐ?Ð?Ð?"
 
-#: ../src/applet-device-cdma.c:281 ../src/applet-device-gsm.c:325
+#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/applet-dialogs.c:405
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Ð?обилна веза (%s)"
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/connection-editor/page-mobile.c:318
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1399
+#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
+#: ../src/connection-editor/page-mobile.c:372
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-list.c:1436
 msgid "Mobile Broadband"
 msgstr "Ð?обилна"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:345
+#: ../src/applet-device-cdma.c:350
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Ð?ова мобилна, Ñ?иÑ?окопоÑ?аÑ?на веза (ЦÐ?Ð?Ð?)..."
 
-#: ../src/applet-device-cdma.c:379
+#: ../src/applet-device-cdma.c:384
 msgid "You are now connected to the CDMA network."
 msgstr "Сада Ñ?Ñ?е повезани на ЦÐ?Ð?Ð? мÑ?ежÑ?."
 
-#: ../src/applet-device-cdma.c:436 ../src/applet-device-gsm.c:479
+#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
+#: ../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:439 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
+#: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "Ñ?оминг"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:624
-#: ../src/mb-menu-item.c:60
+#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
+#: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "Ð?СÐ?"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:388
+#: ../src/applet-device-gsm.c:394
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Ð?ова мобилна, Ñ?иÑ?окопоÑ?аÑ?на мÑ?ежа..."
 
-#: ../src/applet-device-gsm.c:422
+#: ../src/applet-device-gsm.c:428
 msgid "You are now connected to the GSM network."
 msgstr "Ð?овезани Ñ?Ñ?е на Ð?СÐ? мÑ?ежÑ?."
 
-#: ../src/applet-device-gsm.c:711
+#: ../src/applet-device-gsm.c:589
 msgid "PIN code required"
-msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?Ð?Ð? код"
-
-#: ../src/applet-device-gsm.c:713
-msgid "PUK code required"
-msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?УÐ? код"
+msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?Ð?Ð? кôд"
 
-#: ../src/applet-device-gsm.c:724
+#: ../src/applet-device-gsm.c:597
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?Ð?Ð? код за повезиваÑ?е мобилног, Ñ?иÑ?окопоÑ?аÑ?ног Ñ?Ñ?еÑ?аÑ?а"
 
-#: ../src/applet-device-gsm.c:726
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?УÐ? код за повезиваÑ?е мобилног, Ñ?иÑ?окопоÑ?аÑ?ног Ñ?Ñ?еÑ?аÑ?а"
-
-#: ../src/applet-device-gsm.c:859
+#: ../src/applet-device-gsm.c:718
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Ð?огÑ?еÑ?ан Ð?Ð?Ð? код, конÑ?акÑ?иÑ?аÑ?Ñ?е ваÑ?ег пÑ?оваÑ?деÑ?а."
 
-#: ../src/applet-device-gsm.c:882
+#: ../src/applet-device-gsm.c:741
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Ð?огÑ?еÑ?ан Ð?УÐ? код, конÑ?акÑ?иÑ?аÑ?Ñ?е ваÑ?ег пÑ?оваÑ?деÑ?а."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:909
+#: ../src/applet-device-gsm.c:768
 msgid "Sending unlock code..."
 msgstr "ШаÑ?ем код за оÑ?кÑ?Ñ?Ñ?аваÑ?е."
 
-#: ../src/applet-device-gsm.c:969
+#: ../src/applet-device-gsm.c:831
 msgid "SIM PIN unlock required"
 msgstr "Ð?оÑ?Ñ?ебно Ñ?е оÑ?кÑ?Ñ?Ñ?аÑ?и СÐ?Ð? Ð?Ð?Ð?"
 
-#: ../src/applet-device-gsm.c:970
+#: ../src/applet-device-gsm.c:832
 msgid "SIM PIN Unlock Required"
 msgstr "Ð?оÑ?Ñ?ебно Ñ?е оÑ?кÑ?Ñ?Ñ?аÑ?и СÐ?Ð? Ð?Ð?Ð?"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:972
+#: ../src/applet-device-gsm.c:834
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
 msgstr "Ð?обилни Ñ?иÑ?окопоÑ?аÑ?ни Ñ?Ñ?еÑ?аÑ? â??%sâ?? заÑ?Ñ?ева СÐ?Ð? Ð?Ð?Ð? код."
 
-#: ../src/applet-device-gsm.c:973
-#| msgid "PIN code:"
-msgctxt "PIN code entry label"
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:836
 msgid "PIN code:"
-msgstr "Ð?Ð?Ð? код:"
+msgstr "Ð?Ð?Ð? кôд:"
 
-#: ../src/applet-device-gsm.c:976
-#| msgid "New PIN code:"
-msgctxt "Show/obscure PIN checkbox label"
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:840
 msgid "Show PIN code"
-msgstr "Ð?Ñ?икажи Ð?Ð?Ð? код"
+msgstr "Ð?Ñ?икажи Ð?Ð?Ð? кôд"
 
-#: ../src/applet-device-gsm.c:979
+#: ../src/applet-device-gsm.c:843
 msgid "SIM PUK unlock required"
 msgstr "Ð?оÑ?Ñ?ебно Ñ?е оÑ?кÑ?Ñ?Ñ?аÑ?и СÐ?Ð? Ð?УÐ?"
 
-#: ../src/applet-device-gsm.c:980
+#: ../src/applet-device-gsm.c:844
 msgid "SIM PUK Unlock Required"
 msgstr "Ð?оÑ?Ñ?ебно Ñ?е оÑ?кÑ?Ñ?Ñ?аÑ?и СÐ?Ð? Ð?УÐ?"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:982
+#: ../src/applet-device-gsm.c:846
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
-msgstr "Ð?обилни Ñ?иÑ?окопоÑ?аÑ?ни Ñ?Ñ?еÑ?аÑ? â??%sâ?? заÑ?Ñ?ева СÐ?Ð? Ð?УÐ? код."
+msgstr "Ð?обилни Ñ?иÑ?окопоÑ?аÑ?ни Ñ?Ñ?еÑ?аÑ? â??%sâ?? заÑ?Ñ?ева СÐ?Ð? Ð?УÐ? кôд."
 
-#: ../src/applet-device-gsm.c:983
-#| msgid "PUK code:"
-msgctxt "PUK code entry label"
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:848
 msgid "PUK code:"
-msgstr "Ð?УÐ? код:"
+msgstr "Ð?УÐ? кôд:"
 
-#: ../src/applet-device-gsm.c:985
-#| msgid "New PIN code:"
-msgctxt "New PIN entry label"
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:851
 msgid "New PIN code:"
-msgstr "Ð?ови Ð?УÐ? код:"
+msgstr "Ð?ови Ð?Ð?Ð? кôд:"
 
-#: ../src/applet-device-gsm.c:986
-#| msgid "Re-enter new PIN code:"
-msgctxt "New PIN verification entry label"
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:853
 msgid "Re-enter new PIN code:"
-msgstr "Ð?оново Ñ?неÑ?иÑ?е Ð?УÐ? код:"
+msgstr "Ð?оново Ñ?неÑ?иÑ?е Ð?Ð?Ð? кôд:"
 
-#: ../src/applet-device-gsm.c:990
-#| msgid "New PIN code:"
-msgctxt "Show/obscure PIN/PUK checkbox label"
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:858
 msgid "Show PIN/PUK codes"
-msgstr "Ð?Ñ?икажи Ð?Ð?Ð?/Ð?УÐ? кодове"
+msgstr "Ð?Ñ?икажи Ð?Ð?Ð?/Ð?УÐ? кôдове"
 
-#: ../src/applet-device-wired.c:63
+#: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ка жиÑ?ана веза"
 
-#: ../src/applet-device-wired.c:206
+#: ../src/applet-device-wired.c:205
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "Ð?иÑ?ане мÑ?еже (%s)"
 
-#: ../src/applet-device-wired.c:208
+#: ../src/applet-device-wired.c:207
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Ð?иÑ?ана мÑ?ежа (%s)"
 
-#: ../src/applet-device-wired.c:211
+#: ../src/applet-device-wired.c:210
 msgid "Wired Networks"
-msgstr "Ð?иÑ?ана мÑ?ежа"
+msgstr "Ð?иÑ?ане мÑ?еже"
 
-#: ../src/applet-device-wired.c:213
+#: ../src/applet-device-wired.c:212
 msgid "Wired Network"
 msgstr "Ð?иÑ?ана мÑ?ежа"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1311
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
 msgid "disconnected"
 msgstr "веза Ñ?е пÑ?екинÑ?Ñ?а"
 
-#: ../src/applet-device-wired.c:275
+#: ../src/applet-device-wired.c:274
 msgid "You are now connected to the wired network."
-msgstr "Ð?овезани Ñ?Ñ?е Ñ?а жиÑ?аном мÑ?ежом."
+msgstr "Ð?овезани Ñ?Ñ?е на жиÑ?анÑ? мÑ?ежÑ?."
 
-#: ../src/applet-device-wired.c:301
+#: ../src/applet-device-wired.c:300
 #, c-format
 msgid "Preparing wired network connection '%s'..."
 msgstr "Ð?Ñ?ипÑ?емам везÑ? пÑ?еко жиÑ?ане мÑ?ежÑ? â??%sâ??..."
 
-#: ../src/applet-device-wired.c:304
+#: ../src/applet-device-wired.c:303
 #, c-format
 msgid "Configuring wired network connection '%s'..."
 msgstr "Ð?одеÑ?авам везÑ? пÑ?еко жиÑ?ане мÑ?ежÑ? â??%sâ??..."
 
-#: ../src/applet-device-wired.c:307
+#: ../src/applet-device-wired.c:306
 #, c-format
 msgid "User authentication required for wired network connection '%s'..."
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е пÑ?иÑ?ава коÑ?иÑ?ника за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е жиÑ?ане везе â??%sâ??..."
 
-#: ../src/applet-device-wired.c:310
+#: ../src/applet-device-wired.c:309
 #, c-format
 msgid "Requesting a wired network address for '%s'..."
 msgstr "Ð?аÑ?Ñ?евам адÑ?еÑ?Ñ? за жиÑ?анÑ? мÑ?ежÑ? â??%sâ??..."
 
-#: ../src/applet-device-wired.c:314
+#: ../src/applet-device-wired.c:313
 #, c-format
 msgid "Wired network connection '%s' active"
 msgstr "Ð?овезани Ñ?Ñ?е пÑ?еко жиÑ?ане везе â??%sâ??"
 
-#: ../src/applet-device-wired.c:565
+#: ../src/applet-device-wired.c:494
 msgid "DSL authentication"
-msgstr "DSL пÑ?иÑ?ава"
+msgstr "Ð?СÐ? пÑ?иÑ?ава"
 
-#: ../src/applet-device-wifi.c:88
+#: ../src/applet-device-wifi.c:89
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "Ð?о_вежи Ñ?е на Ñ?кÑ?ивене бежиÑ?не мÑ?еже..."
 
-#: ../src/applet-device-wifi.c:121
+#: ../src/applet-device-wifi.c:142
 msgid "Create _New Wireless Network..."
 msgstr "Ð?апÑ?ави _новÑ? бежиÑ?нÑ? мÑ?ежÑ?..."
 
+#: ../src/applet-device-wifi.c:226
+msgid "(none)"
+msgstr "(ниÑ?Ñ?а)"
+
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:749
+#: ../src/applet-device-wifi.c:795
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "Ð?ежиÑ?не мÑ?еже (%s)"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:751
+#: ../src/applet-device-wifi.c:797
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "Ð?ежиÑ?на мÑ?ежа (%s)"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:753
+#: ../src/applet-device-wifi.c:799
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Ð?ежиÑ?на мÑ?ежа"
@@ -386,230 +369,302 @@ msgstr[1] "Ð?ежиÑ?не мÑ?еже"
 msgstr[2] "Ð?ежиÑ?не мÑ?еже"
 msgstr[3] "Ð?ежиÑ?на мÑ?ежа"
 
-#: ../src/applet-device-wifi.c:783
+#: ../src/applet-device-wifi.c:832
 msgid "wireless is disabled"
 msgstr "Ð?ежиÑ?на мÑ?ежа Ñ?е онемогÑ?Ñ?ена"
 
-#: ../src/applet-device-wifi.c:844
+#: ../src/applet-device-wifi.c:833
+msgid "wireless is disabled by hardware switch"
+msgstr "бежиÑ?на мÑ?ежа Ñ?е иÑ?кÑ?Ñ?Ñ?ена Ñ?изиÑ?ким пÑ?екидаÑ?ем"
+
+#: ../src/applet-device-wifi.c:894
 msgid "More networks"
 msgstr "Ð?оÑ? мÑ?ежа"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:1048
+#: ../src/applet-device-wifi.c:1073
 msgid "Wireless Networks Available"
-msgstr "Ð?оÑ?Ñ?Ñ?пне бежиÑ?не мÑ?еже"
+msgstr "Ð?оÑ?Ñ?Ñ?пне Ñ?Ñ? бежиÑ?не мÑ?еже"
 
-#: ../src/applet-device-wifi.c:1049
+#: ../src/applet-device-wifi.c:1075
 msgid "Click on this icon to connect to a wireless network"
 msgstr "Ð?ликниÑ?е на овÑ? икониÑ?Ñ? Ñ?ади повезиваÑ?а на бежиÑ?нÑ? мÑ?ежÑ?"
 
-#: ../src/applet-device-wifi.c:1052 ../src/applet.c:679
+#: ../src/applet-device-wifi.c:1076
+msgid "Use the network menu to connect to a wireless network"
+msgstr "Ð?оÑ?иÑ?Ñ?иÑ?е мени мÑ?еже да Ñ?е повежеÑ?е на бежиÑ?нÑ? мÑ?ежÑ?"
+
+#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
 msgid "Don't show this message again"
 msgstr "Ð?е пÑ?иказÑ?Ñ? виÑ?е ово пÑ?озоÑ?Ñ?е"
 
-#: ../src/applet-device-wifi.c:1256
+#: ../src/applet-device-wifi.c:1271
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Ð?овезани Ñ?Ñ?е Ñ?а бежиÑ?ном мÑ?ежом â??%sâ??."
 
-#: ../src/applet-device-wifi.c:1257 ../src/applet-device-wifi.c:1288
-msgid "(none)"
-msgstr "(ниÑ?Ñ?а)"
-
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1302
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "Ð?Ñ?ипÑ?емам везÑ? пÑ?еко бежиÑ?не мÑ?еже â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "Ð?одеÑ?авам везÑ? пÑ?еко бежиÑ?не мÑ?еже â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1304
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е пÑ?иÑ?ава коÑ?иÑ?ника за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е бежиÑ?не везе â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "Ð?аÑ?Ñ?евам адÑ?еÑ?Ñ? за бежиÑ?нÑ? мÑ?ежÑ? â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1327
+#: ../src/applet-device-wifi.c:1332
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "Ð?овезани Ñ?Ñ?е пÑ?еко бежиÑ?не везе â??%sâ?? : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1337
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "Ð?овезани Ñ?Ñ?е пÑ?еко бежиÑ?не везе â??%sâ??"
 
+#: ../src/applet-device-wimax.c:231
+#, c-format
+msgid "WiMAX Mobile Broadband (%s)"
+msgstr "Ð?иÐ?Ð?Ð¥ Ð?обилна Ñ?иÑ?окопоÑ?аÑ?на (%s)"
+
+#: ../src/applet-device-wimax.c:233
+msgid "WiMAX Mobile Broadband"
+msgstr "Ð?иÐ?Ð?Ð¥ Ð?обилна Ñ?иÑ?окопоÑ?аÑ?на"
+
+#: ../src/applet-device-wimax.c:259
+msgid "WiMAX is disabled"
+msgstr "Ð?иÐ?Ð?Ð?С Ñ?е иÑ?кÑ?Ñ?Ñ?ена"
+
+#: ../src/applet-device-wimax.c:260
+msgid "WiMAX is disabled by hardware switch"
+msgstr "Ð?иÐ?Ð?Ð¥ Ñ?е иÑ?кÑ?Ñ?Ñ?ена Ñ?изиÑ?ким пÑ?екидаÑ?ем"
+
+#: ../src/applet-device-wimax.c:428
+msgid "You are now connected to the WiMAX network."
+msgstr "Сада Ñ?Ñ?е повезани на Ð?иÐ?Ð?Ð¥ мÑ?ежÑ?."
+
 #: ../src/applet-dialogs.c:56
 msgid "Error displaying connection information:"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?иказиваÑ?Ñ? подаÑ?ака о вези:"
 
-#: ../src/applet-dialogs.c:87
-#: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:962
-#: ../src/wireless-security/wireless-security.c:341
+#: ../src/applet-dialogs.c:108
+#: ../src/connection-editor/page-wireless-security.c:285
+#: ../src/wireless-dialog.c:946
+#: ../src/wireless-security/wireless-security.c:392
 msgid "LEAP"
 msgstr "Ð?Ð?Ð?Ð?"
 
-#: ../src/applet-dialogs.c:89
+#: ../src/applet-dialogs.c:110
 msgid "Dynamic WEP"
-msgstr "Ð?инамиÑ?ки WEP"
+msgstr "Ð?инамиÑ?ки Ð?Ð?Ð?"
 
-#: ../src/applet-dialogs.c:91 ../src/applet-dialogs.c:192
-#: ../src/applet-dialogs.c:194
+#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
+#: ../src/applet-dialogs.c:223
 msgid "WPA/WPA2"
-msgstr "WPA/WPA2"
+msgstr "Ð?Ð?Ð?/Ð?Ð?Ð?2"
 
-#: ../src/applet-dialogs.c:190
+#: ../src/applet-dialogs.c:219
 msgid "WEP"
-msgstr "WEP"
-
-#: ../src/applet-dialogs.c:198
-#: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:919
-msgctxt "No wifi security used"
-msgid "None"
-msgstr "Ð?иÑ?Ñ?а"
+msgstr "Ð?Ð?Ð?"
 
-#: ../src/applet-dialogs.c:207
-msgctxt "No wired security used"
+#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
+#: ../src/connection-editor/page-wireless-security.c:239
+#: ../src/wireless-dialog.c:903
+msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ð?иÑ?Ñ?а"
 
-#: ../src/applet-dialogs.c:210
-msgctxt "Unknown/unrecognized wired or wifi security"
-msgid "Unknown"
-msgstr "Ð?епознаÑ?о"
-
-#: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:282 ../src/applet-dialogs.c:384
-#: ../src/applet-dialogs.c:421 ../src/applet-dialogs.c:439
-#: ../src/applet-dialogs.c:450
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ð?епознаÑ?о"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:342
+#, c-format
+msgid "%d dB"
+msgstr "%d dB"
+
+#: ../src/applet-dialogs.c:344
+msgctxt "WiMAX CINR"
+msgid "unknown"
+msgstr "непознаÑ?о"
+
+#: ../src/applet-dialogs.c:356
+msgctxt "WiMAX Base Station ID"
+msgid "unknown"
+msgstr "непознаÑ?о"
+
+#: ../src/applet-dialogs.c:391
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ð?иÑ?ана мÑ?ежа (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:394
 #, c-format
 msgid "802.11 WiFi (%s)"
-msgstr "802.11 WiFi (%s)"
+msgstr "802.11 бежиÑ?на (%s)"
 
-#: ../src/applet-dialogs.c:317
+#: ../src/applet-dialogs.c:401
 #, c-format
 msgid "GSM (%s)"
 msgstr "Ð?СÐ? (%s)"
 
-#: ../src/applet-dialogs.c:319
+#: ../src/applet-dialogs.c:403
 #, c-format
 msgid "CDMA (%s)"
 msgstr "ЦÐ?Ð?Ð? (%s)"
 
-#: ../src/applet-dialogs.c:324
+#: ../src/applet-dialogs.c:407
+#, c-format
+msgid "WiMAX (%s)"
+msgstr "Ð?иÐ?Ð?Ð¥ (%s)"
+
+#. --- General ---
+#: ../src/applet-dialogs.c:413
+msgid "General"
+msgstr "Ð?пÑ?Ñ?е"
+
+#: ../src/applet-dialogs.c:417
 msgid "Interface:"
 msgstr "УÑ?еÑ?аÑ?:"
 
-#: ../src/applet-dialogs.c:340
+#: ../src/applet-dialogs.c:433
 msgid "Hardware Address:"
 msgstr "ХаÑ?двеÑ?Ñ?ка адÑ?еÑ?а:"
 
-#: ../src/applet-dialogs.c:350
+#. Driver
+#: ../src/applet-dialogs.c:441
 msgid "Driver:"
-msgstr "Ð?Ñ?аÑ?веÑ?"
+msgstr "Ð?Ñ?аÑ?веÑ?:"
 
-#: ../src/applet-dialogs.c:388
+#: ../src/applet-dialogs.c:470
 msgid "Speed:"
 msgstr "Ð?Ñ?зина:"
 
-#: ../src/applet-dialogs.c:397
+#: ../src/applet-dialogs.c:480
 msgid "Security:"
 msgstr "Ð?езбедноÑ?Ñ?:"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:493
+msgid "CINR:"
+msgstr "ЦÐ?Ð?Ð :"
+
+#: ../src/applet-dialogs.c:506
+msgid "BSID:"
+msgstr "Ð?СÐ?Ð?:"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:523
+msgid "IPv4"
+msgstr "Ð?Ð?в4"
+
+#. Address
+#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
 msgid "IP Address:"
 msgstr "Ð?Ð? адÑ?еÑ?а:"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Ð?епознаÑ?а"
+
+#: ../src/applet-dialogs.c:550
 msgid "Broadcast Address:"
 msgstr "Ð?дÑ?еÑ?а за емиÑ?оваÑ?е:"
 
-#: ../src/applet-dialogs.c:448
+#. Prefix
+#: ../src/applet-dialogs.c:559
 msgid "Subnet Mask:"
 msgstr "Ð?Ñ?ежна маÑ?ка:"
 
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:561
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Ð?епознаÑ?а"
+
+#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
 msgid "Default Route:"
 msgstr "Ð?одÑ?азÑ?мевана Ñ?Ñ?Ñ?а:"
 
-#: ../src/applet-dialogs.c:474
+#: ../src/applet-dialogs.c:581
 msgid "Primary DNS:"
 msgstr "Ð?Ñ?имаÑ?ни Ð?Ð?С:"
 
-#: ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:590
 msgid "Secondary DNS:"
 msgstr "СекÑ?ндаÑ?ни Ð?Ð?С:"
 
+#: ../src/applet-dialogs.c:600
+msgid "Ternary DNS:"
+msgstr "ТеÑ?Ñ?иÑ?аÑ?ни Ð?Ð?С:"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:615
+msgid "IPv6"
+msgstr "Ð?Ð?в6"
+
+#: ../src/applet-dialogs.c:624
+msgid "Ignored"
+msgstr "Ð?анемаÑ?ено"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:732
 msgid "No valid active connections found!"
 msgstr "Ð?ема иÑ?пÑ?авниÑ?, покÑ?енÑ?Ñ?иÑ? веза!"
 
-#: ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:785
 msgid ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
 msgstr ""
-"Сва пÑ?ава задÑ?жана © 2004â??2008 Red Hat, Inc.\n"
-"Сва пÑ?ава задÑ?жана © 2005â??2008 Novell, Inc."
+"Ð?Ñ?Ñ?оÑ?Ñ?ка пÑ?ава © 2004-2010 Red Hat, Inc.\n"
+"Ð?Ñ?Ñ?оÑ?Ñ?ка пÑ?ава © 2005-2008 Novell, Inc.\n"
+"и многи дÑ?Ñ?ги Ñ?аÑ?адниÑ?и заÑ?едниÑ?е и пÑ?еводиоÑ?и"
 
-#: ../src/applet-dialogs.c:677
+#: ../src/applet-dialogs.c:788
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "Ð?Ñ?огÑ?амÑ?е за обавеÑ?Ñ?аÑ?нÑ? зонÑ? за Ñ?пÑ?авÑ?аÑ?е мÑ?ежним Ñ?Ñ?еÑ?аÑ?има и везама."
+msgstr "Ð?Ñ?огÑ?амÑ?е обавеÑ?Ñ?аÑ?не зоне за Ñ?пÑ?авÑ?аÑ?е мÑ?ежним Ñ?Ñ?еÑ?аÑ?има и везама."
 
-#: ../src/applet-dialogs.c:679
+#: ../src/applet-dialogs.c:790
 msgid "NetworkManager Website"
 msgstr "Ð?еб Ñ?Ñ?Ñ?аниÑ?а УпÑ?авника мÑ?ежом"
 
-#: ../src/applet-dialogs.c:682
-msgid "translator-credits"
-msgstr ""
-"Филип Ð?илеÑ?иÑ?\n"
-"Ð?анило Шеган\n"
-"Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>\n"
-"Ð?Ñ?евод.оÑ?г â?? пÑ?евод на Ñ?Ñ?пÑ?ки Ñ?език."
-
-#: ../src/applet-dialogs.c:698
+#: ../src/applet-dialogs.c:805
 msgid "Missing resources"
 msgstr "Ð?едоÑ?Ñ?аÑ?Ñ? Ñ?еÑ?Ñ?Ñ?Ñ?и"
 
-#: ../src/applet-dialogs.c:725
+#: ../src/applet-dialogs.c:830
 msgid "Mobile broadband network password"
 msgstr "Ð?озинка мобилне, Ñ?иÑ?окопоÑ?аÑ?не мÑ?еже"
 
-#: ../src/applet-dialogs.c:734
+#: ../src/applet-dialogs.c:839
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е лозинка за повезиваÑ?е на â??%sâ??."
 
-#: ../src/applet-dialogs.c:755
+#: ../src/applet-dialogs.c:854
 msgid "Password:"
 msgstr "Ð?озинка:"
 
-#: ../src/applet.c:792
+#: ../src/applet.c:894
 #, c-format
 msgid ""
 "\n"
@@ -619,7 +674,7 @@ msgstr ""
 "\n"
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? због пÑ?екида везе Ñ? мÑ?ежи."
 
-#: ../src/applet.c:795
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -628,7 +683,7 @@ msgstr ""
 "\n"
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? због неоÑ?екиваног иÑ?кÑ?Ñ?Ñ?еÑ?а Ð?Ð?Ð? Ñ?еÑ?виÑ?а."
 
-#: ../src/applet.c:798
+#: ../src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -639,7 +694,7 @@ msgstr ""
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? Ñ?еÑ? Ñ?е Ð?Ð?Ð? Ñ?еÑ?виÑ? поÑ?лао неодговаÑ?аÑ?Ñ?Ñ?а "
 "подеÑ?аваÑ?а."
 
-#: ../src/applet.c:801
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -648,16 +703,16 @@ msgstr ""
 "\n"
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? Ñ?еÑ? Ñ?е иÑ?Ñ?екло вÑ?еме за повезиваÑ?е."
 
-#: ../src/applet.c:804
+#: ../src/applet.c:906
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
 "\n"
-"Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? jer Ð?Ð?Ð? Ñ?еÑ?виÑ? ниÑ?е покÑ?енÑ?Ñ? на вÑ?еме."
+"Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? Ñ?еÑ? Ð?Ð?Ð? Ñ?еÑ?виÑ? ниÑ?е покÑ?енÑ?Ñ? на вÑ?еме."
 
-#: ../src/applet.c:807
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -666,16 +721,16 @@ msgstr ""
 "\n"
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? заÑ?о Ñ?Ñ?о не могÑ? да покÑ?енем Ð?Ð?Ð? Ñ?еÑ?виÑ?."
 
-#: ../src/applet.c:810
+#: ../src/applet.c:912
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
-"Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? jer не поÑ?Ñ?оÑ?е иÑ?пÑ?авне Ð?Ð?Ð? лозинке."
+"Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? Ñ?еÑ? не поÑ?Ñ?оÑ?е иÑ?пÑ?авне Ð?Ð?Ð? лозинке."
 
-#: ../src/applet.c:813
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -684,7 +739,7 @@ msgstr ""
 "\n"
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ?? због неиÑ?пÑ?авниÑ? Ð?Ð?Ð? лозинки."
 
-#: ../src/applet.c:820
+#: ../src/applet.c:922
 #, c-format
 msgid ""
 "\n"
@@ -693,7 +748,7 @@ msgstr ""
 "\n"
 "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ??"
 
-#: ../src/applet.c:838
+#: ../src/applet.c:940
 #, c-format
 msgid ""
 "\n"
@@ -703,7 +758,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?екинÑ?Ñ?а Ñ?е Ð?Ð?Ð? веза â??%sâ?? због пÑ?екида везе Ñ? мÑ?ежи."
 
-#: ../src/applet.c:841
+#: ../src/applet.c:943
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +767,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?екинÑ?Ñ?а Ñ?е Ð?Ð?Ð? веза â??%sâ?? због иÑ?кÑ?Ñ?Ñ?иваÑ?а Ð?Ð?Ð? Ñ?еÑ?виÑ?а."
 
-#: ../src/applet.c:847
+#: ../src/applet.c:949
 #, c-format
 msgid ""
 "\n"
@@ -721,15 +776,15 @@ msgstr ""
 "\n"
 "Ð?Ð?Ð? веза â??%sâ?? Ñ?е пÑ?екинÑ?Ñ?а."
 
-#: ../src/applet.c:878
+#: ../src/applet.c:983
 msgid "VPN Login Message"
 msgstr "Ð?оÑ?Ñ?ка за Ð?Ð?Ð? пÑ?иÑ?авÑ?"
 
-#: ../src/applet.c:890 ../src/applet.c:898 ../src/applet.c:945
+#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
 msgid "VPN Connection Failed"
 msgstr "Ð?иÑ?е Ñ?Ñ?пело повезиваÑ?е на Ð?Ð?Ð?"
 
-#: ../src/applet.c:952
+#: ../src/applet.c:1054
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +798,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:955
+#: ../src/applet.c:1057
 #, c-format
 msgid ""
 "\n"
@@ -756,342 +811,262 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1299
+#: ../src/applet.c:1377
 msgid "device not ready (firmware missing)"
 msgstr "Ñ?Ñ?еÑ?аÑ? ниÑ?е Ñ?пÑ?еман (недоÑ?Ñ?аÑ?е Ñ?иÑ?мвеÑ?)"
 
-#: ../src/applet.c:1301
+#: ../src/applet.c:1379
 msgid "device not ready"
 msgstr "Ñ?Ñ?еÑ?аÑ? ниÑ?е Ñ?пÑ?еман"
 
-#: ../src/applet.c:1327
+#: ../src/applet.c:1405
 msgid "Disconnect"
 msgstr "Ð?Ñ?екини везÑ?"
 
-#: ../src/applet.c:1341
+#: ../src/applet.c:1419
 msgid "device not managed"
 msgstr "не могÑ? да Ñ?пÑ?авÑ?ам Ñ?Ñ?еÑ?аÑ?ем"
 
-#: ../src/applet.c:1387
+#: ../src/applet.c:1463
 msgid "No network devices available"
 msgstr "Ð?иÑ?е пÑ?онаÑ?ен ниÑ?едан мÑ?ежни Ñ?Ñ?еÑ?аÑ?"
 
-#: ../src/applet.c:1475
+#: ../src/applet.c:1551
 msgid "_VPN Connections"
 msgstr "_Ð?Ð?Ð? везе"
 
-#: ../src/applet.c:1528
+#: ../src/applet.c:1608
 msgid "_Configure VPN..."
 msgstr "Ð?о_деÑ?и Ð?Ð?Ð?..."
 
-#: ../src/applet.c:1532
+#: ../src/applet.c:1612
 msgid "_Disconnect VPN"
 msgstr "_Ð?Ñ?екини Ð?Ð?Ð? везÑ?"
 
-#: ../src/applet.c:1619
+#: ../src/applet.c:1710
 msgid "NetworkManager is not running..."
 msgstr "УпÑ?авÑ?аÑ? мÑ?ежом ниÑ?е покÑ?енÑ?Ñ?..."
 
-#: ../src/applet.c:1624 ../src/applet.c:2428
+#: ../src/applet.c:1715 ../src/applet.c:2508
 msgid "Networking disabled"
 msgstr "УмÑ?ежаваÑ?е иÑ?кÑ?Ñ?Ñ?ено"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1853
+#: ../src/applet.c:1936
 msgid "Enable _Networking"
 msgstr "УкÑ?Ñ?Ñ?и _мÑ?ежне Ñ?Ñ?лÑ?ге"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1862
+#: ../src/applet.c:1945
 msgid "Enable _Wireless"
 msgstr "УкÑ?Ñ?Ñ?и _бежиÑ?но мÑ?ежеÑ?е"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1871
+#: ../src/applet.c:1954
 msgid "Enable _Mobile Broadband"
 msgstr "Ð?могÑ?Ñ?и _мобилне везе"
 
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1963
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "Ð?могÑ?_Ñ?и Ð?иÐ?Ð?Ð¥ Ð?обилнÑ? Ñ?иÑ?окопоÑ?аÑ?нÑ?"
+
 #. Toggle notifications item
-#: ../src/applet.c:1882
+#: ../src/applet.c:1974
 msgid "Enable N_otifications"
 msgstr "_Ð?Ñ?икажи обавеÑ?Ñ?еÑ?а"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1893
+#: ../src/applet.c:1985
 msgid "Connection _Information"
 msgstr "Ð?ода_Ñ?и о вези"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1903
+#: ../src/applet.c:1995
 msgid "Edit Connections..."
 msgstr "УÑ?еди везе..."
 
 #. Help item
-#: ../src/applet.c:1917
+#: ../src/applet.c:2009
 msgid "_Help"
 msgstr "_Ð?омоÑ?"
 
 #. About item
-#: ../src/applet.c:1926
+#: ../src/applet.c:2018
 msgid "_About"
 msgstr "_Ð? пÑ?огÑ?амÑ?"
 
-#: ../src/applet.c:2117
+#: ../src/applet.c:2195
 msgid "Disconnected"
 msgstr "Ð?еза Ñ?е пÑ?екинÑ?Ñ?а"
 
-#: ../src/applet.c:2118
+#: ../src/applet.c:2196
 msgid "The network connection has been disconnected."
 msgstr "Ð?Ñ?ежна веза Ñ?е пÑ?екинÑ?Ñ?а."
 
-#: ../src/applet.c:2294
+#: ../src/applet.c:2377
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Ð?Ñ?ипÑ?емам мÑ?ежнÑ? везÑ? â??%sâ??..."
 
-#: ../src/applet.c:2297
+#: ../src/applet.c:2380
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е пÑ?иÑ?ава коÑ?иÑ?ника за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе â??%sâ??..."
 
-#: ../src/applet.c:2303
+#: ../src/applet.c:2386
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Ð?овезани Ñ?Ñ?е пÑ?еко везе â??%sâ??"
 
-#: ../src/applet.c:2384
+#: ../src/applet.c:2464
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "УÑ?поÑ?Ñ?авÑ?ам Ð?Ð?Ð? везÑ? â??%sâ??..."
 
-#: ../src/applet.c:2387
+#: ../src/applet.c:2467
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е пÑ?иÑ?ава коÑ?иÑ?ника за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е Ð?Ð?Ð? везе â??%sâ??..."
 
-#: ../src/applet.c:2390
+#: ../src/applet.c:2470
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ð?аÑ?Ñ?евам Ð?Ð?Ð? мÑ?ежнÑ? адÑ?еÑ?Ñ? за â??%sâ??..."
 
-#: ../src/applet.c:2393
+#: ../src/applet.c:2473
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Ð?овезани Ñ?Ñ?е пÑ?еко Ð?Ð?Ð? везе â??%sâ??"
 
-#: ../src/applet.c:2432
+#: ../src/applet.c:2512
 msgid "No network connection"
 msgstr "Ð?ема мÑ?ежниÑ? веза"
 
-#: ../src/applet.c:2996
+#: ../src/applet.c:3161
 msgid "NetworkManager Applet"
 msgstr "Ð?Ñ?огÑ?амÑ?е УпÑ?авник мÑ?еже"
 
-#: ../src/applet.c:3002 ../src/wired-dialog.c:128
+#: ../src/applet.c:3167 ../src/wired-dialog.c:127
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
+"The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
-"Ð?Ñ?огÑ?амÑ?е УпÑ?авник мÑ?еже ниÑ?е могао да пÑ?онаÑ?е неке од поÑ?Ñ?ебниÑ? Ñ?еÑ?Ñ?Ñ?Ñ?а "
-"(глеÑ?д даÑ?оÑ?ека ниÑ?е пÑ?онаÑ?ена)."
+"Ð?Ñ?огÑ?амÑ?е УпÑ?авник мÑ?еже не може да пÑ?онаÑ?е неке поÑ?Ñ?ебне Ñ?еÑ?Ñ?Ñ?Ñ?е (â??.uiâ?? "
+"даÑ?оÑ?ека ниÑ?е пÑ?онаÑ?ена)."
 
 # bug: translatable, really?
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-vpn-wizard.glade.h:1
+#: ../src/applet.ui.h:1 ../src/connection-editor/ce-vpn-wizard.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-msgid ""
-"1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr ""
-"1 (подÑ?азÑ?мевано)\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../src/applet.glade.h:6
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Ð?окÑ?енÑ?Ñ?е мÑ?ежне везе</span>"
+#: ../src/applet.ui.h:2
+msgid "Active Network Connections"
+msgstr "Ð?кÑ?ивне везе мÑ?еже"
 
-#: ../src/applet.glade.h:7
-msgid "Anony_mous identity:"
-msgstr "Ð?нонимни _иденÑ?иÑ?еÑ?:"
-
-#: ../src/applet.glade.h:8
-msgid "As_k for this password every time"
-msgstr "Увек ми заÑ?Ñ?ажи _лозинкÑ?"
-
-#: ../src/applet.glade.h:9
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr ""
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
-"Ð?здаÑ?е 0\n"
-"Ð?здаÑ?е 1"
-
-#: ../src/applet.glade.h:12
-msgid "C_A certificate:"
-msgstr "ЦÐ? _Ñ?еÑ?Ñ?иÑ?икаÑ?:"
-
-#: ../src/applet.glade.h:13
+#: ../src/applet.ui.h:3
 msgid "C_onnect"
 msgstr "Ð?_овежи Ñ?е"
 
-#: ../src/applet.glade.h:14
+#: ../src/applet.ui.h:4
 msgid "Co_nnection:"
 msgstr "_Ð?еза:"
 
-#: ../src/applet.glade.h:15
+#: ../src/applet.ui.h:5
 msgid "Connection Information"
 msgstr "Ð?одаÑ?и о вези"
 
-#: ../src/applet.glade.h:16
-msgid "Don't _warn me again"
-msgstr "Ð?е _Ñ?позоÑ?аваÑ? ме виÑ?е"
-
-#: ../src/applet.glade.h:17
-msgid "I_dentity:"
-msgstr "_Ð?денÑ?иÑ?еÑ?:"
-
-# ~Ð?илоÑ?
-#: ../src/applet.glade.h:18
-msgid "I_nner authentication:"
-msgstr "_УнÑ?Ñ?Ñ?аÑ?Ñ?а пÑ?иÑ?ава:"
-
-#: ../src/applet.glade.h:19
-msgid "No"
-msgstr "Ð?е"
-
-#: ../src/applet.glade.h:20
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"Ð?Ñ?воÑ?ени Ñ?иÑ?Ñ?ем\n"
-"Ð?еÑ?ени кÑ?Ñ?Ñ?"
-
-#: ../src/applet.glade.h:22
+#: ../src/applet.ui.h:6
 msgid "Other Wireless Network..."
 msgstr "Ð?Ñ?Ñ?але бежиÑ?не мÑ?еже..."
 
-#: ../src/applet.glade.h:23
-msgid "Private _key:"
-msgstr "Ð?Ñ?иваÑ?ни _кÑ?Ñ?Ñ?:"
-
-#: ../src/applet.glade.h:24
-msgid "Sho_w key"
-msgstr "Ð?_Ñ?икажи кÑ?Ñ?Ñ?"
-
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
-msgid "Sho_w password"
-msgstr "Ð?Ñ?икажи _лозинкÑ?"
-
-#: ../src/applet.glade.h:26
-msgid "WEP inde_x:"
-msgstr "WEP и_ндекÑ?:"
-
-#: ../src/applet.glade.h:27
+#: ../src/applet.ui.h:7
 msgid "Wireless _adapter:"
 msgstr "Ð?ежиÑ?ни _Ñ?Ñ?еÑ?аÑ?:"
 
-#: ../src/applet.glade.h:28
-msgid "Yes"
-msgstr "Ð?а"
-
-#: ../src/applet.glade.h:29
-msgid "_Authentication:"
-msgstr "_Ð?Ñ?иÑ?ава:"
-
-#: ../src/applet.glade.h:30
-msgid "_Key:"
-msgstr "_Ð?Ñ?Ñ?Ñ?:"
-
-#: ../src/applet.glade.h:31
+#: ../src/applet.ui.h:8
 msgid "_Network name:"
 msgstr "_Ð?ме мÑ?еже:"
 
-#: ../src/applet.glade.h:32
-msgid "_PEAP version:"
-msgstr "Ð?_здаÑ?е PEAP-а:"
-
-#: ../src/applet.glade.h:33 ../src/connection-editor/ce-page-dsl.glade.h:2
-#: ../src/connection-editor/ce-page-mobile.glade.h:15
-msgid "_Password:"
-msgstr "_Ð?озинка:"
-
-#: ../src/applet.glade.h:34
-msgid "_Private key password:"
-msgstr "Ð?_озинка пÑ?иваÑ?ног кÑ?Ñ?Ñ?а:"
-
-#: ../src/applet.glade.h:35 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "_Type:"
-msgstr "_Ð?Ñ?Ñ?Ñ?а:"
-
-#: ../src/applet.glade.h:36
+#: ../src/applet.ui.h:9
 msgid "_Unlock"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?аÑ?"
 
-#: ../src/applet.glade.h:37
-msgid "_User certificate:"
-msgstr "Ð?о_Ñ?иÑ?ников Ñ?еÑ?Ñ?иÑ?икаÑ?:"
-
-#: ../src/applet.glade.h:38 ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
-msgid "_Username:"
-msgstr "Ð?оÑ?и_Ñ?ниÑ?ко име:"
-
-#: ../src/applet.glade.h:39
+#: ../src/applet.ui.h:10
 msgid "_Wireless security:"
 msgstr "_Ð?ежиÑ?на безбедноÑ?Ñ?:"
 
-#: ../src/applet.glade.h:40
+#: ../src/applet.ui.h:11
 msgid "label"
 msgstr "наÑ?пиÑ?"
 
-#: ../src/connection-editor/ce-page.c:69
+#: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "аÑ?Ñ?омаÑ?Ñ?ки"
 
-#: ../src/connection-editor/ce-page.c:222
-#: ../src/connection-editor/nm-connection-editor.c:616
+#: ../src/connection-editor/ce-page.c:294
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Ð?е могÑ? да ажÑ?Ñ?Ñ?Ñ?ам лозинке везе због непознаÑ?е гÑ?еÑ?ке."
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/wireless-security/eap-method-leap.ui.h:1
+#: ../src/wireless-security/eap-method-simple.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:1
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+msgid "Sho_w password"
+msgstr "Ð?Ñ?икажи _лозинкÑ?"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:3
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Password:"
+msgstr "_Ð?озинка:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "С_еÑ?виÑ?:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-#: ../src/connection-editor/ce-page-ip6.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>Ð?дÑ?еÑ?е</b>"
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/wireless-security/eap-method-leap.ui.h:3
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:3
+msgid "_Username:"
+msgstr "Ð?оÑ?и_Ñ?ниÑ?ко име:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+msgid "Addresses"
+msgstr "Ð?дÑ?еÑ?е"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:2
-#: ../src/connection-editor/ce-page-ip6.glade.h:2
-msgid ""
-"Automatic\n"
-"Automatic with manual DNS settings\n"
-"Manual\n"
-"Link-Local\n"
-"Shared to other computers"
-msgstr ""
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?а Ñ?Ñ?Ñ?ним DNS подеÑ?аваÑ?ем\n"
-"Ð Ñ?Ñ?но\n"
-"Ð?ежи-локално\n"
-"Ð?одели Ñ?а дÑ?Ñ?гим Ñ?аÑ?Ñ?наÑ?има"
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/page-ip6.c:136
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Automatic"
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
+msgid "Automatic with manual DNS settings"
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?а Ñ?Ñ?Ñ?ним Ð?Ð?С подеÑ?аваÑ?ем"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
 msgid "D_HCP client ID:"
-msgstr "_Ð?Ð? DHCP клиÑ?енÑ?а:"
+msgstr "_Ð?Ð? Ð?ХЦÐ? клиÑ?енÑ?а:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-#: ../src/connection-editor/ce-page-ip6.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1099,8 +1074,8 @@ msgstr ""
 "Ð?омени за Ñ?азÑ?еÑ?еÑ?е имена домаÑ?ина. Ð?оÑ?иÑ?Ñ?иÑ?е Ñ?аÑ?ке да Ñ?аздвоÑ?иÑ?е виÑ?е "
 "домена."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-#: ../src/connection-editor/ce-page-ip6.glade.h:8
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1108,8 +1083,8 @@ msgstr ""
 "Ð?Ð? адÑ?еÑ?е за пÑ?епознаваÑ?е ваÑ?ег Ñ?аÑ?Ñ?наÑ?а Ñ?нÑ?Ñ?аÑ? мÑ?еже.  Ð?ликниÑ?е на дÑ?гме "
 "â??Ð?одаÑ?â?? за Ñ?ноÑ? Ð?Ð? адÑ?еÑ?е."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:10
-#: ../src/connection-editor/ce-page-ip6.glade.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1117,274 +1092,303 @@ msgstr ""
 "Ð?Ð? адÑ?еÑ?е Ñ?еÑ?веÑ?а домена за Ñ?азÑ?еÑ?еÑ?е имена домаÑ?ина. Ð?оÑ?иÑ?Ñ?иÑ?е Ñ?аÑ?ке да "
 "Ñ?аздвоÑ?иÑ?е виÑ?е адÑ?еÑ?а."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-#: ../src/connection-editor/ce-page-ip6.glade.h:10
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "Уколико Ñ?е Ñ?кÑ?Ñ?Ñ?ено, ова веза никада неÑ?е биÑ?и Ñ? коÑ?иÑ?Ñ?ена као подÑ?азÑ?мевана."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-#: ../src/connection-editor/ce-page-ip6.glade.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Ð?анемаÑ?и аÑ?Ñ?омаÑ?Ñ?ки добиÑ?ене Ñ?Ñ?Ñ?е"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "Link-Local"
+msgstr "Ð?ежи-локално"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:163
+#: ../src/connection-editor/page-ip6.c:185
+msgid "Manual"
+msgstr "Ð Ñ?Ñ?но"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
 msgid "Require IPv4 addressing for this connection to complete"
-msgstr "Ð?аÑ?Ñ?ева IPv4 адÑ?еÑ?иÑ?аÑ?е за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе"
+msgstr "Ð?аÑ?Ñ?ева Ð?Ð?в4 адÑ?еÑ?иÑ?аÑ?е за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:205
+msgid "Shared to other computers"
+msgstr "Ð?одеÑ?ено Ñ?а оÑ?Ñ?алим Ñ?аÑ?Ñ?наÑ?има"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
-"Ð?дÑ?еÑ?иваÑ?е DHCP пÑ?огÑ?ама вам дозвоÑ?ава да Ñ?пÑ?авÑ?аÑ?е мÑ?ежама и пÑ?илагодиÑ?е "
+"Ð?дÑ?еÑ?иваÑ?е Ð?ХЦÐ? пÑ?огÑ?ама вам дозвоÑ?ава да Ñ?пÑ?авÑ?аÑ?е мÑ?ежама и пÑ?илагодиÑ?е "
 "подеÑ?аваÑ?а ваÑ?ег Ñ?аÑ?Ñ?наÑ?а.  Уколико желиÑ?е да коÑ?иÑ?Ñ?иÑ?е овÑ? могÑ?Ñ?ноÑ?Ñ?, "
-"Ñ?неÑ?иÑ?е име DHCP пÑ?огÑ?ама."
+"Ñ?неÑ?иÑ?е име Ð?ХЦÐ? пÑ?огÑ?ама."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:15
-#: ../src/connection-editor/ce-page-ip6.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "Use this c_onnection only for resources on its network"
 msgstr "Ð?оÑ?иÑ?Ñ?и овÑ? везÑ? Ñ?амо за извоÑ?е Ñ? Ñ?опÑ?Ñ?веноÑ? мÑ?ежи"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"Ð?Ñ?и повезиваÑ?Ñ? на IPv6 кабловÑ?ке мÑ?еже дозвоÑ?ава Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе Ñ?колико "
-"не Ñ?аде IPv4 подеÑ?аваÑ?а, а Ñ?аде IPv6 подеÑ?аваÑ?а."
+"Ð?Ñ?и повезиваÑ?Ñ? на Ð?Ð?в6 кабловÑ?ке мÑ?еже дозвоÑ?ава Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе Ñ?колико "
+"не Ñ?аде Ð?Ð?в4 подеÑ?аваÑ?а, а Ñ?аде Ð?Ð?в6 подеÑ?аваÑ?а."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:17
-#: ../src/connection-editor/ce-page-ip6.glade.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid "_DNS servers:"
 msgstr "_Ð?Ð?С Ñ?еÑ?веÑ?и:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:18
-#: ../src/connection-editor/ce-page-ip6.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "_Method:"
-msgstr "_Ð?Ñ?Ñ?од:"
+msgstr "_Ð?еÑ?од:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:19
-#: ../src/connection-editor/ce-page-ip6.glade.h:17
-msgid "_Routes&#x2026;"
-msgstr "_Ð Ñ?Ñ?е&#x2026;"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+msgid "_Routesâ?¦"
+msgstr "_Ð Ñ?Ñ?еâ?¦"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:20
-#: ../src/connection-editor/ce-page-ip6.glade.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "_Search domains:"
 msgstr "Ð?омени _за Ñ?Ñ?ажеÑ?е:"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "Require IPv6 addressing for this connection to complete"
-msgstr "Ð?аÑ?Ñ?ева IPv6 адÑ?еÑ?иÑ?аÑ?е за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе"
+msgstr "Ð?аÑ?Ñ?ева Ð?Ð?в6 адÑ?еÑ?иÑ?аÑ?е за Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"Ð?Ñ?и повезиваÑ?Ñ? на IPv4 кабловÑ?ке мÑ?еже дозвоÑ?ава Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе Ñ?колико "
-"не Ñ?аде IPv6 подеÑ?аваÑ?а, а Ñ?аде IPv4 подеÑ?аваÑ?а."
+"Ð?Ñ?и повезиваÑ?Ñ? на Ð?Ð?в4 кабловÑ?ке мÑ?еже дозвоÑ?ава Ñ?Ñ?поÑ?Ñ?авÑ?аÑ?е везе Ñ?колико "
+"не Ñ?аде Ð?Ð?в6 подеÑ?аваÑ?а, а Ñ?аде Ð?Ð?в4 подеÑ?аваÑ?а."
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "2G (GPRS/EDGE)"
+msgstr "2Ð? (Ð?Ð?РС/Ð?Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Ð?апÑ?едно</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "3G (UMTS/HSPA)"
+msgstr "3Ð? (УÐ?ТС/ХСÐ?Ð?)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>Ð?Ñ?новно</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:3
+msgid "Advanced"
+msgstr "Ð?апÑ?едно"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:4
 msgid "Allow roaming if home network is not available"
 msgstr "Ð?озволи Ñ?оминг Ñ?колико нема домаÑ?е мÑ?еже"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:4
-msgid ""
-"Any\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Prefer 3G (UMTS/HSPA)\n"
-"Prefer 2G (GPRS/EDGE)"
-msgstr ""
-"Ð?ило коÑ?а\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Ð?аÑ?пÑ?е 3G (UMTS/HSPA)\n"
-"Ð?аÑ?пÑ?е 2G (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Any"
+msgstr "Ð?ило коÑ?а"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Basic"
+msgstr "Ð?Ñ?новнo"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Change..."
 msgstr "Ð?змени..."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "_Ð?Ñ?ежни Ð?Ð?:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "_Ð?Ñ?оÑ?:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "PI_N:"
 msgstr "_Ð?Ð?Ð?:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "Ð?аÑ?пÑ?е 2Ð? (Ð?Ð?РС/Ð?Ð?Ð?Ð?)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "Ð?аÑ?пÑ?е 3Ð? (УÐ?ТС/ХСÐ?Ð?)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "Ð?Ñ?ика_жи лозинке"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:1
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>Ð?озвоÑ?ени наÑ?ини пÑ?иÑ?аве</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:2
-msgid "<b>Authentication</b>"
-msgstr "<b>Ð?Ñ?иÑ?ава</b>"
+msgstr "_Ð?Ð?Ð?:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:3
-msgid "<b>Compression</b>"
-msgstr "<b>Ð?аковаÑ?е подаÑ?ака</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:4
-msgid "<b>Echo</b>"
-msgstr "<b>Ð?Ñ?о</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:5
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>У веÑ?ини Ñ?лÑ?Ñ?аÑ?ева PPP Ñ?еÑ?веÑ?и издаваÑ?а Ð?нÑ?еÑ?неÑ? Ñ?Ñ?лÑ?га подÑ?жаваÑ?Ñ? Ñ?ве "
-"наÑ?ине за пÑ?иÑ?авÑ?.  Уколико повезиваÑ?е не Ñ?Ñ?пе, покÑ?Ñ?аÑ?Ñ?е да иÑ?кÑ?Ñ?Ñ?иÑ?е "
-"подÑ?Ñ?кÑ? за неке наÑ?ине пÑ?иÑ?аве.</i>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "_Type:"
+msgstr "_Ð?Ñ?Ñ?Ñ?а:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:6
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
 msgid "Allow _BSD data compression"
-msgstr "Ð?озволи _BSD паковаÑ?е подаÑ?ака"
+msgstr "Ð?озволи _Ð?СÐ? паковаÑ?е подаÑ?ака"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allow _Deflate data compression"
-msgstr "Ð?озвволи _Deflate паковаÑ?е подаÑ?ака"
+msgstr "Ð?озвволи â??_Deflateâ?? паковаÑ?е подаÑ?ака"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Allowed Authentication Methods"
+msgstr "Ð?озвоÑ?ени наÑ?ини поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Allowed methods:"
 msgstr "Ð?озвоÑ?ени наÑ?ини:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "Authentication"
+msgstr "Ð?оÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "C_HAP"
-msgstr "C_HAP"
+msgstr "Ц_Ð¥Ð?Ð?"
 
 # РазлÑ?павам Ñ?е :)
 # ~Ð?илоÑ?
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Ð?Ñ?оÑ?окол за пÑ?иÑ?авÑ? изазовним Ñ?Ñ?коваÑ?ем"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Compression"
+msgstr "Ð?омпÑ?еÑ?иÑ?а"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
 msgid "Configure _Methodsâ?¦"
 msgstr "Ð?одеÑ?и _наÑ?инеâ?¦"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Echo"
+msgstr "Ð?Ñ?о"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "Extensible Authentication Protocol"
 msgstr "Ð?адогÑ?адив пÑ?оÑ?окол за пÑ?иÑ?авÑ?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"У веÑ?ини Ñ?лÑ?Ñ?аÑ?ева, Ð?Ð?Ð? Ñ?еÑ?веÑ?и добавÑ?аÑ?а Ñ?е подÑ?жаÑ?и Ñ?ве наÑ?ине поÑ?вÑ?Ñ?иваÑ?а "
+"иденÑ?иÑ?еÑ?а. Ð?ко веза не Ñ?Ñ?пе, покÑ?Ñ?аÑ?Ñ?е да иÑ?кÑ?Ñ?Ñ?иÑ?е подÑ?Ñ?кÑ? за неке наÑ?ине."
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:13
 msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+msgstr "Ð?СЦХÐ?Ð? в_2"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
+#: ../src/connection-editor/ce-page-ppp.ui.h:14
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Ð?аÑ?кÑ?оÑ?оÑ?Ñ?ов пÑ?оÑ?окол за пÑ?иÑ?авÑ? изазовним Ñ?Ñ?коваÑ?ем"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
+#: ../src/connection-editor/ce-page-ppp.ui.h:15
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Ð?аÑ?кÑ?оÑ?оÑ?Ñ?ов пÑ?оÑ?окол за пÑ?иÑ?авÑ? изазовним Ñ?Ñ?коваÑ?ем, 2. издаÑ?е"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
+#: ../src/connection-editor/ce-page-ppp.ui.h:16
 msgid "Password Authentication Protocol"
 msgstr "Ð?Ñ?оÑ?окол за пÑ?иÑ?авÑ? пÑ?Ñ?ем лозинке"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
+#: ../src/connection-editor/ce-page-ppp.ui.h:17
 msgid "Send PPP _echo packets"
-msgstr "ШаÑ?и PPP _еÑ?о пакеÑ?е"
+msgstr "ШаÑ?и Ð?Ð?Ð? _еÑ?о пакеÑ?е"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:18
 msgid "Use TCP _header compression"
-msgstr "Ð?оÑ?иÑ?Ñ?и _паковаÑ?е TCP заглавÑ?а"
+msgstr "Ð?оÑ?иÑ?Ñ?и _паковаÑ?е ТЦÐ? заглавÑ?а"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
+#: ../src/connection-editor/ce-page-ppp.ui.h:19
 msgid "Use _stateful MPPE"
-msgstr "Ð?оÑ?иÑ?Ñ?и _Ñ?еÑ?иÑ? MPPE"
+msgstr "Ð?оÑ?иÑ?Ñ?и _Ñ?еÑ?иÑ? Ð?Ð?Ð?Ð?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
+#: ../src/connection-editor/ce-page-ppp.ui.h:20
 msgid "_EAP"
-msgstr "_EAP"
+msgstr "_Ð?Ð?Ð?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
+#: ../src/connection-editor/ce-page-ppp.ui.h:21
 msgid "_MSCHAP"
-msgstr "_MSCHAP"
+msgstr "_Ð?СЦХÐ?Ð?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
+#: ../src/connection-editor/ce-page-ppp.ui.h:22
 msgid "_PAP"
-msgstr "_PAP"
+msgstr "_Ð?Ð?Ð?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
+#: ../src/connection-editor/ce-page-ppp.ui.h:23
 msgid "_Require 128-bit encryption"
 msgstr "_Ð?аÑ?Ñ?ева 128-биÑ?но Ñ?иÑ?Ñ?оваÑ?е"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
+#: ../src/connection-editor/ce-page-ppp.ui.h:24
 msgid "_Use point-to-point encryption (MPPE)"
-msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?иÑ?Ñ?оваÑ?е â??Ñ?аÑ?ка-до-Ñ?аÑ?кеâ?? (MPPE)"
+msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?иÑ?Ñ?оваÑ?е â??Ñ?аÑ?ка-до-Ñ?аÑ?кеâ?? (Ð?Ð?Ð?Ð?)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:1
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:2
+msgid "10 Gb/s"
+msgstr "10 GB/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:3
+msgid "10 Mb/s"
+msgstr "10 MB/s"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
+#: ../src/connection-editor/ce-page-wired.ui.h:4
+msgid "100 Mb/s"
+msgstr "100 MB/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:5
+msgid "Attachment Unit Interface (AUI)"
+msgstr "СÑ?Ñ?еÑ?е Ñ?единиÑ?е пÑ?икаÑ?иÑ?аÑ?а (Ð?УÐ?)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:6
 msgid "Aut_onegotiate"
 msgstr "_СамоÑ?говаÑ?аÑ?е"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-msgstr ""
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
-msgstr ""
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
-"Ð?бÑ?нÑ?Ñ?и Ð?аÑ? (TP)\n"
-"СÑ?Ñ?еÑ?е пÑ?икаÑ?иве Ñ?единиÑ?а (AUI)\n"
-"BNC\n"
-"СиÑ?еÑ?е незавиÑ?но од медиÑ?а (MII)"
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "Ð?Ð?Ц"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:9
 msgid "Full duple_x"
 msgstr "Ð?Ñ?ни _дÑ?плекÑ?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:13
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
+#: ../src/connection-editor/ce-page-wired.ui.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "MT_U:"
-msgstr "MT_U:"
+msgstr "Ð?Т_У:"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:11
+msgid "Media Independent Interface (MII)"
+msgstr "СÑ?Ñ?еÑ?е незавиÑ?ног медиÑ?а (Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wired.ui.h:12
+#: ../src/connection-editor/ce-page-wireless.ui.h:11
 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 "
@@ -1393,11 +1397,8 @@ msgstr ""
 "УнеÑ?а Ð?Ð?Ð? адÑ?еÑ?а Ñ?е коÑ?иÑ?Ñ?и као адÑ?еÑ?а мÑ?ежног Ñ?Ñ?еÑ?аÑ?а.  Ð?ва могÑ?Ñ?ноÑ?Ñ? Ñ?е "
 "назива Ð?Ð?Ð? клониÑ?аÑ?е или Ñ?пÑ?Ñ?инг.  Ð?Ñ?имеÑ?: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
-#| msgid ""
-#| "This option locks this connection to the network device specified by the "
-#| "MAC address entered here.  Example: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-wired.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 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"
@@ -1405,68 +1406,68 @@ msgstr ""
 "Ð?ва опÑ?иÑ?а закÑ?Ñ?Ñ?ава везÑ? Ñ?а мÑ?ежним Ñ?Ñ?еÑ?аÑ?ем коÑ?и Ñ?е одÑ?еÑ?ен Ñ?Ñ?аÑ?ном Ð?Ð?Ð? "
 "адÑ?еÑ?ом. Ð?пÑ?: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
-#| msgid "_MAC address:"
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+msgid "Twisted Pair (TP)"
+msgstr "УплеÑ?ени паÑ? (ТÐ?)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_Cloned MAC address:"
 msgstr "_Ð?лониÑ?ана Ð?Ð?Ð? адÑ?еÑ?а:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
-#| msgid "_MAC address:"
+#: ../src/connection-editor/ce-page-wired.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Device MAC address:"
 msgstr "_Ð?Ð?Ð? адÑ?еÑ?а Ñ?Ñ?еÑ?аÑ?а:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:18
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Port:"
 msgstr "_Ð?оÑ?Ñ?:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:19
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "_Ð?Ñ?зина:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:20
-#: ../src/connection-editor/ce-page-wireless.glade.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "bytes"
 msgstr "баÑ?Ñ?ова"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-wireless.ui.h:1
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:2
+msgid "Ad-hoc"
+msgstr "Ð?д-Ñ?ок"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:4
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
 
 # Ð?аÑ?да Ñ?е одноÑ?и на опÑ?ег, а?
 # ~Ð?илоÑ?
-#: ../src/connection-editor/ce-page-wireless.glade.h:4
+#: ../src/connection-editor/ce-page-wireless.ui.h:5
 msgid "Ban_d:"
 msgstr "_Ð?пÑ?ег:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "C_hannel:"
 msgstr "_Ð?анал:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
-msgid ""
-"Infrastructure\n"
-"Ad-hoc"
-msgstr ""
-"Ð?нÑ?Ñ?аÑ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?но\n"
-"Ð?д-Ñ?ок"
+#: ../src/connection-editor/ce-page-wireless.ui.h:7
+msgid "Infrastructure"
+msgstr "Ð?нÑ?Ñ?аÑ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?но"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
+#: ../src/connection-editor/ce-page-wireless.ui.h:9
 msgid "M_ode:"
 msgstr "_Режим:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:10
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 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"
@@ -1474,211 +1475,192 @@ msgstr ""
 "Ð?ва опÑ?иÑ?а додеÑ?Ñ?Ñ?е везÑ? бежиÑ?ноÑ? пÑ?иÑ?Ñ?Ñ?пноÑ? Ñ?аÑ?ки (Ð?Ð?) коÑ?а Ñ?е одÑ?еÑ?ен "
 "Ð?ССÐ?Ð?-ом. Ð?пÑ?: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "_Ð?аÑ?ина пÑ?еноÑ?а:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
-msgstr "_BSSID:"
+msgstr "_Ð?ССÐ?Ð?:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "_Ð?Ñ?оÑ?ок:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
-msgstr "_SSID:"
+msgstr "_ССÐ?Ð?:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:21
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "_Security:"
 msgstr "_Ð?езбедноÑ?Ñ?:"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+msgid "Choose a VPN Connection Type"
+msgstr "Ð?збоÑ? вÑ?Ñ?Ñ?е Ð?Ð?Ð? везе"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+msgid "Createâ?¦"
+msgstr "Ð?апÑ?авиâ?¦"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
-"\n"
 "Select the type of VPN you wish to use for the new connection.  If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ð?збоÑ? вÑ?Ñ?Ñ?е Ð?Ð?Ð? везе</span>\n"
-"\n"
-"Ð?забеÑ?иÑ?е вÑ?Ñ?Ñ?Ñ? Ð?Ð?Ð? везе коÑ?и желиÑ?е да коÑ?иÑ?Ñ?иÑ?е за нове везе.  Уколико Ñ?е "
-"изабÑ?ана вÑ?Ñ?Ñ?а Ð?Ð?Ð? везе не поÑ?ави Ñ? Ñ?пиÑ?кÑ?, можда немаÑ?е инÑ?Ñ?алиÑ?ан иÑ?пÑ?аван "
-"Ð?Ð?Ð? додаÑ?ак."
-
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-msgid "Createâ?¦"
-msgstr "Ð?апÑ?авиâ?¦"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/ip6-routes-dialog.c:459
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
+"Ð?забеÑ?иÑ?е вÑ?Ñ?Ñ?Ñ? Ð?Ð?Ð? везе коÑ?Ñ? желиÑ?е да коÑ?иÑ?Ñ?иÑ?е за нове везе. Уколико Ñ?е "
+"вÑ?Ñ?Ñ?а Ð?Ð?Ð? везе коÑ?Ñ? желиÑ?е да напÑ?авиÑ?е не поÑ?ави на Ñ?пиÑ?кÑ?, можда немаÑ?е "
+"инÑ?Ñ?алиÑ?ан иÑ?пÑ?аван Ð?Ð?Ð? додаÑ?ак."
+
+#: ../src/connection-editor/ip4-routes-dialog.c:506
+#: ../src/connection-editor/ip6-routes-dialog.c:464
+#: ../src/connection-editor/page-ip4.c:733
+#: ../src/connection-editor/page-ip6.c:718
 msgid "Address"
 msgstr "Ð?дÑ?еÑ?а"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:522
+#: ../src/connection-editor/page-ip4.c:750
 msgid "Netmask"
 msgstr "Ð?Ñ?ежна маÑ?ка"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/ip6-routes-dialog.c:491
-#: ../src/connection-editor/page-ip4.c:772
-#: ../src/connection-editor/page-ip6.c:757
+#: ../src/connection-editor/ip4-routes-dialog.c:538
+#: ../src/connection-editor/ip6-routes-dialog.c:496
+#: ../src/connection-editor/page-ip4.c:767
+#: ../src/connection-editor/page-ip6.c:752
 msgid "Gateway"
 msgstr "Ð?Ñ?ежни излаз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
-#: ../src/connection-editor/ip6-routes-dialog.c:507
+#: ../src/connection-editor/ip4-routes-dialog.c:554
+#: ../src/connection-editor/ip6-routes-dialog.c:512
 msgid "Metric"
 msgstr "Ð?еÑ?Ñ?иÑ?ки"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:740
+#: ../src/connection-editor/ip6-routes-dialog.c:480
+#: ../src/connection-editor/page-ip6.c:735
 msgid "Prefix"
 msgstr "Ð?Ñ?еÑ?икÑ?"
 
-#: ../src/connection-editor/page-dsl.c:140
-#: ../src/connection-editor/page-dsl.c:147
-msgid "Could not load DSL user interface."
-msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за DSL."
-
-#: ../src/connection-editor/page-dsl.c:153
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1407
+#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1444
 msgid "DSL"
 msgstr "Ð?СÐ?"
 
-#: ../src/connection-editor/page-dsl.c:241
+#: ../src/connection-editor/page-dsl.c:139
+msgid "Could not load DSL user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за DSL."
+
+#: ../src/connection-editor/page-dsl.c:229
 #, c-format
 msgid "DSL connection %d"
 msgstr "Ð?СÐ? веза â??%dâ??"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN)"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки (Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:127
 msgid "Automatic (VPN) addresses only"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ка адÑ?еÑ?а (Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP)"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки (Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (PPP) addresses only"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ка адÑ?еÑ?а (Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки (Ð?Ð?Ð?оÐ?)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ка адÑ?еÑ?а (Ð?Ð?Ð?оÐ?)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки (Ð?ХЦÐ?)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ка адÑ?еÑ?а (Ð?ХЦÐ?)"
 
-#: ../src/connection-editor/page-ip4.c:162
-#: ../src/connection-editor/page-ip6.c:184
-msgid "Manual"
-msgstr "Ð Ñ?Ñ?но"
-
-#: ../src/connection-editor/page-ip4.c:174
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:175
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Само вежи-локално"
 
-#: ../src/connection-editor/page-ip4.c:180
-#: ../src/connection-editor/page-ip6.c:204
-msgid "Shared to other computers"
-msgstr "Ð?одеÑ?ено Ñ?а оÑ?Ñ?алим Ñ?аÑ?Ñ?наÑ?има"
-
-#: ../src/connection-editor/page-ip4.c:190
+#: ../src/connection-editor/page-ip4.c:191
 msgid "Disabled"
 msgstr "Ð?немогÑ?Ñ?ено"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:699
 #, c-format
 msgid "Editing IPv4 routes for %s"
-msgstr "УÑ?еÑ?Ñ?Ñ?ем IPv4 Ñ?Ñ?Ñ?е за %s"
-
-#: ../src/connection-editor/page-ip4.c:819
-#: ../src/connection-editor/page-ip4.c:826
-msgid "Could not load IPv4 user interface."
-msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам IPv4 коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
+msgstr "УÑ?еÑ?Ñ?Ñ?ем Ð?Ð?в4 Ñ?Ñ?Ñ?е за %s"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:810
 msgid "IPv4 Settings"
-msgstr "Ð?одеÑ?аваÑ?а за IPv4"
+msgstr "Ð?одеÑ?аваÑ?а за Ð?Ð?в4"
 
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки"
+#: ../src/connection-editor/page-ip4.c:812
+msgid "Could not load IPv4 user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам Ð?Ð?в4 коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
 
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки, Ñ?амо адÑ?еÑ?е"
 
-#: ../src/connection-editor/page-ip6.c:148
-#: ../src/wireless-security/eap-method.c:233
+#: ../src/connection-editor/page-ip6.c:149
+#: ../src/wireless-security/eap-method.c:285
 msgid "Ignore"
 msgstr "Ð?анемаÑ?и"
 
-#: ../src/connection-editor/page-ip6.c:172
-#| msgid "Automatic (DHCP)"
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки, Ñ?амо Ð?ХЦÐ?"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:684
 #, c-format
 msgid "Editing IPv6 routes for %s"
-msgstr "УÑ?еÑ?Ñ?Ñ?ем IPv6 Ñ?Ñ?Ñ?е за %s"
-
-#: ../src/connection-editor/page-ip6.c:802
-#: ../src/connection-editor/page-ip6.c:809
-msgid "Could not load IPv6 user interface."
-msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам IPv6 коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
+msgstr "УÑ?еÑ?Ñ?Ñ?ем Ð?Ð?в6 Ñ?Ñ?Ñ?е за %s"
 
-#: ../src/connection-editor/page-ip6.c:815
+#: ../src/connection-editor/page-ip6.c:793
 msgid "IPv6 Settings"
-msgstr "IPv6 подеÑ?аваÑ?а"
+msgstr "Ð?Ð?в6 подеÑ?аваÑ?а"
 
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/connection-editor/page-mobile.c:312
+#: ../src/connection-editor/page-ip6.c:795
+msgid "Could not load IPv6 user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам Ð?Ð?в6 коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
+
+#: ../src/connection-editor/page-mobile.c:374
 msgid "Could not load mobile broadband user interface."
 msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за мобилнÑ?, Ñ?иÑ?окопоÑ?аÑ?нÑ? мÑ?ежÑ?."
 
-#: ../src/connection-editor/page-mobile.c:333
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Unsupported mobile broadband connection type."
 msgstr "Ð?иÑ?е подÑ?жана ова вÑ?Ñ?Ñ?а мобилне, Ñ?иÑ?окопоÑ?аÑ?не мÑ?еже."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:574
+#: ../src/connection-editor/page-mobile.c:632
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Ð?забеÑ?иÑ?е вÑ?Ñ?Ñ?Ñ? мобилног Ñ?иÑ?окопоÑ?аÑ?ног издаваÑ?а"
 
-#: ../src/connection-editor/page-mobile.c:601
+#: ../src/connection-editor/page-mobile.c:659
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1686,244 +1668,239 @@ msgstr ""
 "Ð?забеÑ?иÑ?е Ñ?еÑ?нологиÑ?Ñ? коÑ?Ñ? коÑ?иÑ?Ñ?и ваÑ? издаваÑ? мобилниÑ? Ñ?иÑ?окопоÑ?аÑ?ниÑ? "
 "Ñ?Ñ?лÑ?га.  Уколико ниÑ?Ñ?е Ñ?игÑ?Ñ?ни, пиÑ?аÑ?Ñ?е издаваÑ?а."
 
-#: ../src/connection-editor/page-mobile.c:606
+#: ../src/connection-editor/page-mobile.c:664
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и _GSM Ñ?еÑ?нологиÑ?е (нпÑ?. GPRS, EDGE, UMTS, HSDPA)"
+msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и _Ð?СÐ? Ñ?еÑ?нологиÑ?е (нпÑ?. Ð?Ð?РС, Ð?Ð?Ð?Ð?, УÐ?ТС, ХСÐ?Ð?Ð?)"
 
-#: ../src/connection-editor/page-mobile.c:611
+#: ../src/connection-editor/page-mobile.c:671
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и C_DMA Ñ?еÑ?нологиÑ?е (нпÑ?. 1xRTT, EVDO)"
+msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и Ц_Ð?Ð?Ð? Ñ?еÑ?нологиÑ?е (нпÑ?. 1xРТТ, Ð?Ð?Ð?Ð?)"
 
-#: ../src/connection-editor/page-ppp.c:132
+#: ../src/connection-editor/page-ppp.c:134
 msgid "EAP"
-msgstr "EAP"
+msgstr "Ð?Ð?Ð?"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:228
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-ttls.c:232
 msgid "PAP"
-msgstr "PAP"
+msgstr "Ð?Ð?Ð?"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:276
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
-msgstr "CHAP"
+msgstr "ЦХÐ?Ð?"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:245
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-peap.c:248
+#: ../src/wireless-security/eap-method-ttls.c:264
 msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
+msgstr "Ð?СЦХÐ?Ð?в2"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:244
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "MSCHAP"
-msgstr "MSCHAP"
+msgstr "Ð?СЦХÐ?Ð?"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:139
+#: ../src/connection-editor/page-ppp.c:141
 msgid "none"
 msgstr "ни Ñ?едан"
 
-#: ../src/connection-editor/page-ppp.c:199
+#: ../src/connection-editor/page-ppp.c:201
 #, c-format
 msgid "Editing PPP authentication methods for %s"
-msgstr "УÑ?еÑ?Ñ?Ñ?ем PPP наÑ?ине пÑ?иÑ?аве за %s"
+msgstr "УÑ?еÑ?Ñ?Ñ?ем Ð?Ð?Ð? наÑ?ине пÑ?иÑ?аве за %s"
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "PPP Settings"
+msgstr "Ð?Ð?Ð? подеÑ?аваÑ?а"
 
 #: ../src/connection-editor/page-ppp.c:283
-#: ../src/connection-editor/page-ppp.c:290
 msgid "Could not load PPP user interface."
-msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам PPP коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам Ð?Ð?Ð? коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
 
-#: ../src/connection-editor/page-ppp.c:296
-msgid "PPP Settings"
-msgstr "PPP подеÑ?аваÑ?а"
-
-#: ../src/connection-editor/page-vpn.c:108
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1403
+#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1440
 msgid "VPN"
 msgstr "Ð?Ð?Ð?"
 
-#: ../src/connection-editor/page-vpn.c:119
+#: ../src/connection-editor/page-vpn.c:109
+msgid "Could not load VPN user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам Ð?Ð?Ð? коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е."
+
+#: ../src/connection-editor/page-vpn.c:124
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ð?е могÑ? да наÑ?ем Ñ?Ñ?лÑ?гÑ? Ð?Ð?Ð? додаÑ?ка за â??%sâ??."
 
-#: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:988
+#: ../src/connection-editor/page-vpn.c:218
+#: ../src/connection-editor/nm-connection-list.c:881
 #, c-format
 msgid "VPN connection %d"
 msgstr "Ð?Ð?Ð? веза %d"
 
+#: ../src/connection-editor/page-wired.c:211
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-list.c:1428
+msgid "Wired"
+msgstr "Ð?иÑ?ана"
+
 #: ../src/connection-editor/page-wired.c:213
-#: ../src/connection-editor/page-wired.c:220
 msgid "Could not load wired user interface."
 msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за жиÑ?анÑ? мÑ?ежÑ?."
 
-#: ../src/connection-editor/page-wired.c:226
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1391
-msgid "Wired"
-msgstr "Ð?иÑ?ана"
-
-#: ../src/connection-editor/page-wired.c:359
+#: ../src/connection-editor/page-wired.c:348
 #, c-format
 msgid "Wired connection %d"
 msgstr "Ð?иÑ?ана веза %d"
 
-#: ../src/connection-editor/page-wired-security.c:115
+#: ../src/connection-editor/page-wired-security.c:114
 msgid "802.1x Security"
 msgstr "СигÑ?Ñ?ноÑ?ни 802.1x"
 
-#: ../src/connection-editor/page-wired-security.c:123
+#: ../src/connection-editor/page-wired-security.c:116
+msgid "Could not load Wired Security security user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам безбедно коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е Ð?иÑ?ане Ñ?игÑ?Ñ?ноÑ?Ñ?и."
+
+#: ../src/connection-editor/page-wired-security.c:130
 msgid "Use 802.1X security for this connection"
 msgstr "Ð?оÑ?иÑ?Ñ?и 802.1X Ñ?игÑ?Ñ?ноÑ?Ñ? за овÑ? везÑ?"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
+#: ../src/connection-editor/page-wireless.c:147
+#: ../src/connection-editor/page-wireless.c:151
+#: ../src/connection-editor/page-wireless.c:172
 #, c-format
 msgid "default"
 msgstr "подÑ?азÑ?мевано"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wireless.c:176
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:399
-#: ../src/connection-editor/page-wireless.c:406
-msgid "Could not load WiFi user interface."
-msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за бежиÑ?нÑ? мÑ?ежÑ?."
-
-#: ../src/connection-editor/page-wireless.c:412
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1395
+#: ../src/connection-editor/page-wireless.c:396
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-list.c:1432
 msgid "Wireless"
 msgstr "Ð?ежиÑ?на"
 
-#: ../src/connection-editor/page-wireless.c:574
+#: ../src/connection-editor/page-wireless.c:398
+msgid "Could not load WiFi user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за бежиÑ?нÑ? мÑ?ежÑ?."
+
+#: ../src/connection-editor/page-wireless.c:562
 #, c-format
 msgid "Wireless connection %d"
 msgstr "Ð?ежиÑ?на веза %d"
 
-#: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:936
-#| msgid "WEP 40/128-bit Key"
+#: ../src/connection-editor/page-wireless-security.c:263
+#: ../src/wireless-dialog.c:920
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128-биÑ?ни кÑ?Ñ?Ñ?"
+msgstr "Ð?Ð?Ð? 40/128-биÑ?ни кÑ?Ñ?Ñ?"
 
-#: ../src/connection-editor/page-wireless-security.c:271
-#: ../src/wireless-dialog.c:945
+#: ../src/connection-editor/page-wireless-security.c:272
+#: ../src/wireless-dialog.c:929
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-биÑ?на лозинка"
+msgstr "Ð?Ð?Ð? 128-биÑ?на лозинка"
 
-#: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:975
+#: ../src/connection-editor/page-wireless-security.c:298
+#: ../src/wireless-dialog.c:959
 msgid "Dynamic WEP (802.1x)"
-msgstr "Ð?инамиÑ?ки WEP (802.1x)"
+msgstr "Ð?инамиÑ?ки Ð?Ð?Ð? (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:989
+#: ../src/connection-editor/page-wireless-security.c:312
+#: ../src/wireless-dialog.c:973
 msgid "WPA & WPA2 Personal"
-msgstr "Ð?иÑ?ни WPA & WPA2"
+msgstr "Ð?иÑ?ни Ð?Ð?Ð? & Ð?Ð?Ð?2"
 
-#: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:1003
+#: ../src/connection-editor/page-wireless-security.c:326
+#: ../src/wireless-dialog.c:987
 msgid "WPA & WPA2 Enterprise"
-msgstr "Ð?оÑ?ловни WPA & WPA2"
+msgstr "Ð?оÑ?ловни Ð?Ð?Ð? & Ð?Ð?Ð?2"
 
-#: ../src/connection-editor/page-wireless-security.c:365
+#: ../src/connection-editor/page-wireless-security.c:359
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr ""
 "Ð?е могÑ? да Ñ?Ñ?иÑ?ам безбедноÑ?но коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за бежиÑ?нÑ? мÑ?ежÑ?; недоÑ?Ñ?аÑ?Ñ? "
-"WiFi подеÑ?аваÑ?а."
-
-#: ../src/connection-editor/page-wireless-security.c:372
-#: ../src/connection-editor/page-wireless-security.c:379
-msgid "Could not load WiFi security user interface."
-msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам безбедноÑ?но коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за бежиÑ?нÑ? мÑ?ежÑ?."
+"Ð?иФи подеÑ?аваÑ?а."
 
-#: ../src/connection-editor/page-wireless-security.c:385
+#: ../src/connection-editor/page-wireless-security.c:368
 msgid "Wireless Security"
 msgstr "Ð?ежиÑ?на безбедноÑ?Ñ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: ../src/connection-editor/page-wireless-security.c:370
+msgid "Could not load WiFi security user interface."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам безбедноÑ?но коÑ?иÑ?ниÑ?ко Ñ?Ñ?Ñ?еÑ?е за бежиÑ?нÑ? мÑ?ежÑ?."
+
+#: ../src/connection-editor/nm-connection-editor.c:101
 #, c-format
 msgid "Editing %s"
 msgstr "УÑ?еÑ?Ñ?Ñ?ем %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:105
 msgid "Editing un-named connection"
 msgstr "УÑ?еÑ?Ñ?Ñ?ем неименованÑ? везÑ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:292
 msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet glade file was not found)."
-msgstr ""
-"Ð?Ñ?огÑ?ам за Ñ?Ñ?еÑ?иваÑ?е веза не може да пÑ?онаÑ?е неке од поÑ?Ñ?ебниÑ? Ñ?еÑ?Ñ?Ñ?Ñ?а (ниÑ?е "
-"наÑ?ена глеÑ?д даÑ?оÑ?ека пÑ?огÑ?амÑ?еÑ?а â??УпÑ?авник везеâ??)."
-
-#: ../src/connection-editor/nm-connection-editor.c:300
-msgid ""
-"The connection editor could not find some required resources (the glade file "
+"The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "Ð?Ñ?огÑ?ам за Ñ?Ñ?еÑ?иваÑ?е веза не може да пÑ?онаÑ?е неке од поÑ?Ñ?ебниÑ? Ñ?еÑ?Ñ?Ñ?Ñ?а (ниÑ?е "
-"наÑ?ена глеÑ?д даÑ?оÑ?ека)."
+"наÑ?ена â??.uiâ?? даÑ?оÑ?ека)."
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:395
 msgid "Error creating connection editor dialog."
 msgstr "Ð?Ñ?еÑ?ка Ñ? обÑ?азоваÑ?Ñ? пÑ?озоÑ?Ñ?еÑ?а за Ñ?Ñ?еÑ?иваÑ?е веза."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
-msgid "Apply"
-msgstr "Ð?Ñ?имени"
+#: ../src/connection-editor/nm-connection-editor.c:407
+msgid "_Save"
+msgstr "Са_Ñ?Ñ?ваÑ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:408
 msgid "Save any changes made to this connection."
 msgstr "СаÑ?Ñ?ваÑ? Ñ?ве пÑ?омене Ñ? овоÑ? вези."
 
-#: ../src/connection-editor/nm-connection-editor.c:421
-msgid "Apply..."
-msgstr "Ð?Ñ?имени..."
+#: ../src/connection-editor/nm-connection-editor.c:409
+msgid "_Save..."
+msgstr "СаÑ?Ñ?_ваÑ?..."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Ð?Ñ?иÑ?авиÑ?е Ñ?е како би Ñ?аÑ?Ñ?вали овÑ? везÑ? за Ñ?ве коÑ?иÑ?нике Ñ?аÑ?Ñ?наÑ?а."
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Available to all users"
 msgstr "Ð?оÑ?Ñ?Ñ?пно Ñ?вим коÑ?иÑ?ниÑ?има"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connect _automatically"
 msgstr "_Сам Ñ?е повежи"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "Ð?ме _везе:"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "E_xport"
 msgstr "_Ð?звези"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:11
 msgid "_Import"
 msgstr "_Увези"
 
-#: ../src/connection-editor/nm-connection-list.c:217
+#: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
 msgstr "никад"
 
-#: ../src/connection-editor/nm-connection-list.c:228
-#: ../src/connection-editor/nm-connection-list.c:239
+#: ../src/connection-editor/nm-connection-list.c:227
+#: ../src/connection-editor/nm-connection-list.c:238
 msgid "now"
 msgstr "Ñ?ад"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:246
+#: ../src/connection-editor/nm-connection-list.c:245
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -1932,7 +1909,7 @@ msgstr[1] "пÑ?е %d минÑ?Ñ?а"
 msgstr[2] "пÑ?е %d минÑ?Ñ?а"
 msgstr[3] "пÑ?е %d минÑ?Ñ?"
 
-#: ../src/connection-editor/nm-connection-list.c:250
+#: ../src/connection-editor/nm-connection-list.c:249
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -1941,7 +1918,7 @@ msgstr[1] "пÑ?е %d Ñ?аÑ?а"
 msgstr[2] "пÑ?е %d Ñ?аÑ?и"
 msgstr[3] "пÑ?е %d Ñ?аÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:262
+#: ../src/connection-editor/nm-connection-list.c:261
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1950,7 +1927,7 @@ msgstr[1] "пÑ?е %d дана"
 msgstr[2] "пÑ?е %d дана"
 msgstr[3] "пÑ?е %d дан"
 
-#: ../src/connection-editor/nm-connection-list.c:268
+#: ../src/connection-editor/nm-connection-list.c:267
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -1959,7 +1936,7 @@ msgstr[1] "пÑ?е %d меÑ?еÑ?а"
 msgstr[2] "пÑ?е %d меÑ?еÑ?и"
 msgstr[3] "пÑ?е %d меÑ?еÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:272
+#: ../src/connection-editor/nm-connection-list.c:271
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -1968,60 +1945,64 @@ msgstr[1] "пÑ?е %d године"
 msgstr[2] "пÑ?е %d година"
 msgstr[3] "пÑ?е %d године"
 
-#: ../src/connection-editor/nm-connection-list.c:594
+#: ../src/connection-editor/nm-connection-list.c:486
 msgid "Connection add failed"
 msgstr "Ð?иÑ?е Ñ?Ñ?пело додаваÑ?е везе"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: ../src/connection-editor/nm-connection-list.c:515
+msgid "Error saving connection"
+msgstr "Ð?Ñ?еÑ?ка пÑ?иликом Ñ?Ñ?ваÑ?а везе"
+
+#: ../src/connection-editor/nm-connection-list.c:516
 #, c-format
-msgid "Error editing connection: property '%s' / '%s' invalid: %d"
-msgstr "Ð?Ñ?еÑ?ка пÑ?иликом измене везе: оÑ?обина â??%sâ?? / â??%sâ?? Ñ?е неиÑ?пÑ?авна: %d"
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "СвоÑ?Ñ?Ñ?во â??%sâ??/ â??%sâ?? Ñ?е неважеÑ?е: â??%dâ??"
 
-#: ../src/connection-editor/nm-connection-list.c:630
-#: ../src/connection-editor/nm-connection-list.c:745
+#: ../src/connection-editor/nm-connection-list.c:523
+#: ../src/connection-editor/nm-connection-list.c:642
 msgid "An unknown error occurred."
 msgstr "Ð?оÑ?ло Ñ?е до непознаÑ?е гÑ?еÑ?ке."
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/connection-editor/nm-connection-list.c:786
+#: ../src/connection-editor/nm-connection-list.c:528
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "Error initializing editor"
 msgstr "Ð?Ñ?еÑ?ка Ñ? покÑ?еÑ?аÑ?Ñ? Ñ?Ñ?еÑ?иваÑ?а"
 
-#: ../src/connection-editor/nm-connection-list.c:651
-#: ../src/connection-editor/nm-connection-list.c:803
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:546
+#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:867
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Ð?е могÑ? да покÑ?енем пÑ?озоÑ?Ñ?е за изменÑ? везе због непознаÑ?е гÑ?еÑ?ке."
 
-#: ../src/connection-editor/nm-connection-list.c:660
+#: ../src/connection-editor/nm-connection-list.c:557
 msgid "Could not create new connection"
 msgstr "Ð?е могÑ? да напÑ?авим новÑ? везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:671
+#: ../src/connection-editor/nm-connection-list.c:569
 msgid "Could not edit new connection"
 msgstr "Ð?е могÑ? да Ñ?Ñ?едим новÑ? везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:818
+#: ../src/connection-editor/nm-connection-list.c:714
 msgid "Could not edit connection"
 msgstr "Ð?е могÑ? да Ñ?Ñ?едим везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:744
 msgid "Connection delete failed"
 msgstr "Ð?е могÑ? да обÑ?иÑ?ем везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:875
+#: ../src/connection-editor/nm-connection-list.c:776
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ð?а ли да заиÑ?Ñ?а обÑ?иÑ?ем везÑ? %s?"
 
-#: ../src/connection-editor/nm-connection-list.c:1018
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/nm-connection-list.c:911
+#: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "Ð?е могÑ? да Ñ?везем Ð?Ð?Ð? везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
+#: ../src/connection-editor/nm-connection-list.c:913
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2031,51 +2012,87 @@ msgstr ""
 "\n"
 "Ð?Ñ?еÑ?ка: ниÑ?е изабÑ?ана вÑ?Ñ?Ñ?а Ð?Ð?Ð? Ñ?еÑ?виÑ?а."
 
-#: ../src/connection-editor/nm-connection-list.c:1033
+#: ../src/connection-editor/nm-connection-list.c:926
 msgid "Could not edit imported connection"
 msgstr "Ð?е могÑ? да изменим Ñ?везене везе"
 
-#: ../src/connection-editor/nm-connection-list.c:1167
+#: ../src/connection-editor/nm-connection-list.c:1069
 msgid "Name"
 msgstr "Ð?азив"
 
-#: ../src/connection-editor/nm-connection-list.c:1179
+#: ../src/connection-editor/nm-connection-list.c:1081
 msgid "Last Used"
 msgstr "УпоÑ?Ñ?бÑ?ена"
 
-#: ../src/connection-editor/nm-connection-list.c:1282
-msgid "Edit"
-msgstr "Ð?змени"
+#: ../src/connection-editor/nm-connection-list.c:1197
+msgid "No VPN plugin available. Please install one to enable this button."
+msgstr ""
+"Ð?ема доÑ?Ñ?Ñ?пниÑ? Ð?Ð?Ð? додаÑ?ака. Ð?олим инÑ?Ñ?алиÑ?аÑ?Ñ?е Ñ?едан да биÑ?Ñ?е омогÑ?Ñ?или ово "
+"дÑ?гме."
+
+#: ../src/connection-editor/nm-connection-list.c:1208
+msgid "_Edit"
+msgstr "УÑ?е_Ñ?иваÑ?е"
 
-#: ../src/connection-editor/nm-connection-list.c:1283
+#: ../src/connection-editor/nm-connection-list.c:1209
 msgid "Edit the selected connection"
 msgstr "УÑ?еÑ?Ñ?Ñ?е подаÑ?ке за изабÑ?анÑ? везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:1284
-msgid "Edit..."
-msgstr "Ð?змени..."
+#: ../src/connection-editor/nm-connection-list.c:1210
+msgid "_Edit..."
+msgstr "УÑ?е_ди..."
 
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:1211
 msgid "Authenticate to edit the selected connection"
 msgstr "Ð?Ñ?иÑ?авиÑ?е Ñ?е како би изменили изабÑ?анÑ? везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:1299
-msgid "Delete"
-msgstr "Ð?бÑ?иÑ?и"
+#: ../src/connection-editor/nm-connection-list.c:1226
+msgid "_Delete"
+msgstr "Ð?з_бÑ?иÑ?и"
 
-#: ../src/connection-editor/nm-connection-list.c:1300
+#: ../src/connection-editor/nm-connection-list.c:1227
 msgid "Delete the selected connection"
 msgstr "Ð?Ñ?иÑ?е изабÑ?анÑ? везÑ?"
 
-#: ../src/connection-editor/nm-connection-list.c:1301
-msgid "Delete..."
-msgstr "Ð?бÑ?иÑ?и..."
+#: ../src/connection-editor/nm-connection-list.c:1228
+msgid "_Delete..."
+msgstr "Ð?збÑ?и_Ñ?и..."
 
-#: ../src/connection-editor/nm-connection-list.c:1302
+#: ../src/connection-editor/nm-connection-list.c:1229
 msgid "Authenticate to delete the selected connection"
 msgstr "Ð?Ñ?иÑ?авиÑ?е Ñ?е како би обÑ?иÑ?али изабÑ?анÑ? везÑ?"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/nm-connection-list.c:1500
+#, fuzzy
+#| msgid "Error saving connection"
+msgid "Error creating connection"
+msgstr "Ð?Ñ?еÑ?ка пÑ?иликом Ñ?Ñ?ваÑ?а везе"
+
+#: ../src/connection-editor/nm-connection-list.c:1501
+#, fuzzy, c-format
+#| msgid "Could not create new connection"
+msgid "Don't know how to create '%s' connections"
+msgstr "Ð?е могÑ? да напÑ?авим новÑ? везÑ?"
+
+#: ../src/connection-editor/nm-connection-list.c:1555
+#: ../src/connection-editor/nm-connection-list.c:1567
+#, fuzzy
+#| msgid "Error saving connection"
+msgid "Error editing connection"
+msgstr "Ð?Ñ?еÑ?ка пÑ?иликом Ñ?Ñ?ваÑ?а везе"
+
+#: ../src/connection-editor/nm-connection-list.c:1556
+#, fuzzy, c-format
+#| msgid "Could not edit connection"
+msgid "Don't know how to edit '%s' connections"
+msgstr "Ð?е могÑ? да Ñ?Ñ?едим везÑ?"
+
+#: ../src/connection-editor/nm-connection-list.c:1568
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2088,29 +2105,29 @@ msgstr ""
 "\n"
 "Ð?Ñ?еÑ?ка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
+#: ../src/connection-editor/vpn-helpers.c:261
 msgid "Select file to import"
 msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ? за Ñ?воз"
 
-#: ../src/connection-editor/vpn-helpers.c:310
+#: ../src/connection-editor/vpn-helpers.c:309
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ð?еÑ? поÑ?Ñ?оÑ?и даÑ?оÑ?ека â??%sâ??."
 
-#: ../src/connection-editor/vpn-helpers.c:312
+#: ../src/connection-editor/vpn-helpers.c:311
 msgid "_Replace"
 msgstr "_Ð?амени"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:313
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ð?а ли желиÑ?е да замениÑ?е %s Ð?Ð?Ð? везом пÑ?е Ñ?Ñ?ваÑ?а?"
 
-#: ../src/connection-editor/vpn-helpers.c:350
+#: ../src/connection-editor/vpn-helpers.c:349
 msgid "Cannot export VPN connection"
 msgstr "Ð?е могÑ? да извезем Ð?Ð?Ð? везÑ?"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:351
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2121,84 +2138,91 @@ msgstr ""
 "\n"
 "Ð?Ñ?еÑ?ка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
 msgstr "Ð?звези Ð?Ð?Ð? везÑ?..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
+#: ../src/gnome-bluetooth/bt-widget.c:218
+#, c-format
+msgid "Failed to create PAN connection: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да напÑ?авим Ð?Ð?Ð? везÑ?: %s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:223
+#: ../src/gnome-bluetooth/bt-widget.c:491
+msgid "Your phone is now ready to use!"
+msgstr "Ð?аÑ? Ñ?елеÑ?он Ñ?е Ñ?пÑ?еман за Ñ?поÑ?Ñ?ебÑ?!"
+
+#: ../src/gnome-bluetooth/bt-widget.c:247
 #, c-format
 msgid "%s Network"
 msgstr "%s мÑ?ежа"
 
-#: ../src/gnome-bluetooth/bt-widget.c:322
+#: ../src/gnome-bluetooth/bt-widget.c:373
 #, c-format
 msgid "Error: %s"
 msgstr "Ð?Ñ?еÑ?ка: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:441
+#: ../src/gnome-bluetooth/bt-widget.c:486
+#, c-format
+msgid "Failed to create DUN connection: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да напÑ?авим Ð?УÐ? везÑ?: %s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:509
 msgid "Mobile wizard was canceled"
 msgstr "ЧаÑ?обÑ?ак за мобилне Ñ?Ñ?еÑ?аÑ?е Ñ?е оÑ?казан"
 
-#: ../src/gnome-bluetooth/bt-widget.c:450
+#: ../src/gnome-bluetooth/bt-widget.c:518
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Ð?епознаÑ? Ñ?ип Ñ?елеÑ?она (ниÑ?е Ð?СÐ? ни ЦÐ?Ð?Ð?)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "Ð?аÑ? Ñ?елеÑ?он Ñ?е Ñ?пÑ?еман за Ñ?поÑ?Ñ?ебÑ?!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
+#: ../src/gnome-bluetooth/bt-widget.c:712
+#: ../src/gnome-bluetooth/bt-widget.c:718
 msgid "failed to connect to the phone."
 msgstr "не могÑ? да Ñ?е повежем на Ñ?елеÑ?он."
 
-#: ../src/gnome-bluetooth/bt-widget.c:687
+#: ../src/gnome-bluetooth/bt-widget.c:751
 msgid "unexpectedly disconnected from the phone."
 msgstr "неоÑ?екиван пÑ?екид везе Ñ?а Ñ?елеÑ?оном."
 
-#: ../src/gnome-bluetooth/bt-widget.c:696
+#: ../src/gnome-bluetooth/bt-widget.c:760
 msgid "timed out detecting phone details."
 msgstr "иÑ?Ñ?екло Ñ?е вÑ?еме за налажеÑ?е подаÑ?ака о Ñ?елеÑ?онÑ?."
 
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "не могÑ? да Ñ?е повежем на Ñ?иÑ?Ñ?емÑ?кÑ? магиÑ?Ñ?Ñ?алÑ?."
-
-#: ../src/gnome-bluetooth/bt-widget.c:716
+#: ../src/gnome-bluetooth/bt-widget.c:772
 msgid "Detecting phone configuration..."
 msgstr "ТÑ?ажим подаÑ?ке о Ñ?елеÑ?онÑ?..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:782
+#: ../src/gnome-bluetooth/bt-widget.c:838
 msgid "could not find the Bluetooth device."
 msgstr "не могÑ? да наÑ?ем Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?."
 
-#: ../src/gnome-bluetooth/bt-widget.c:912
+#: ../src/gnome-bluetooth/bt-widget.c:971
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr ""
 "Ð?оÑ?аÑ?е да омогÑ?Ñ?иÑ?е подÑ?азÑ?мевани Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ? пÑ?е подеÑ?аваÑ?а Ð?аÑ?л-ап везе."
 
-#: ../src/gnome-bluetooth/bt-widget.c:944
+#: ../src/gnome-bluetooth/bt-widget.c:1003
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ð?лÑ?Ñ?Ñ?Ñ? подеÑ?аваÑ?е (не могÑ? да Ñ?е повежем на Ð?-Ð?аÑ?: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:954
+#: ../src/gnome-bluetooth/bt-widget.c:1013
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ð?лÑ?Ñ?Ñ?Ñ? подеÑ?аваÑ?е (не могÑ? да обÑ?азÑ?Ñ?ем Ð?-Ð?аÑ? поÑ?Ñ?едника)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:963
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ð?лÑ?Ñ?Ñ?Ñ? подеÑ?аваÑ?е (не могÑ? да наÑ?ем УпÑ?авника мÑ?еже: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1014
+#: ../src/gnome-bluetooth/bt-widget.c:1085
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "УпоÑ?Ñ?ебиÑ?е мобилни Ñ?елеÑ?он као мÑ?ежни Ñ?Ñ?еÑ?аÑ? (Ð?Ð?Ð?/Ð?Ð?Ð?)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1023
+#: ../src/gnome-bluetooth/bt-widget.c:1094
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Ð?Ñ?иÑ?Ñ?Ñ?пиÑ?е Ð?нÑ?еÑ?неÑ?Ñ? пÑ?еко мобилног Ñ?елеÑ?она (Ð?УÐ?)"
 
@@ -2222,76 +2246,80 @@ msgstr ""
 "Ð?ваÑ? пÑ?огÑ?ам ниÑ?е намеÑ?ен за Ñ?ад Ñ? командноÑ? линиÑ?и, веÑ? Ñ?е део Ð?ном Ñ?адног "
 "окÑ?Ñ?жеÑ?а."
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:57
 msgid "EVDO"
 msgstr "Ð?Ð?Ð?Ð?"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:61
 msgid "GPRS"
 msgstr "Ð?Ð?РС"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:63
 msgid "EDGE"
 msgstr "Ð?Ð?Ð?Ð?"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:65
 msgid "UMTS"
 msgstr "УÐ?ТС"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:67
 msgid "HSDPA"
 msgstr "ХСÐ?Ð?Ð?"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:69
 msgid "HSUPA"
 msgstr "ХСУÐ?Ð?"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:71
 msgid "HSPA"
 msgstr "ХСÐ?Ð?"
 
-#: ../src/mb-menu-item.c:104
+#: ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "Ð?иÐ?Ð?Ð¥"
+
+#: ../src/mb-menu-item.c:109
 msgid "not enabled"
 msgstr "ниÑ?е омогÑ?Ñ?ено"
 
-#: ../src/mb-menu-item.c:110
+#: ../src/mb-menu-item.c:115
 msgid "not registered"
 msgstr "ниÑ?е Ñ?егиÑ?Ñ?Ñ?ован"
 
-#: ../src/mb-menu-item.c:128
+#: ../src/mb-menu-item.c:133
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ð?Ñ?Ñ?на мÑ?ежа (%s)"
 
-#: ../src/mb-menu-item.c:130
+#: ../src/mb-menu-item.c:135
 #, c-format
 msgid "Home network"
 msgstr "Ð?Ñ?Ñ?на мÑ?ежа"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 msgid "searching"
 msgstr "пÑ?еÑ?Ñ?ажÑ?Ñ?ем"
 
-#: ../src/mb-menu-item.c:141
+#: ../src/mb-menu-item.c:146
 msgid "registration denied"
 msgstr "Ñ?егиÑ?Ñ?Ñ?аÑ?иÑ?а Ñ?е одбиÑ?ена"
 
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s Ñ?оминг)"
 
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
+#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (Ñ?оминг)"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:162
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ð?Ñ?ежа Ñ? Ñ?омингÑ? (%s)"
 
-#: ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:164
 #, c-format
 msgid "Roaming network"
 msgstr "Ð?Ñ?ежа Ñ? Ñ?омингÑ?"
@@ -2382,43 +2410,43 @@ msgstr "Ð?е могÑ? да наÑ?ем издаваÑ?а и желим да га 
 msgid "Provider:"
 msgstr "Ð?здаваÑ?:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../src/utils/mobile-wizard.c:761
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и Ð?СÐ? (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и Ð?СÐ? (Ð?Ð?РС, Ð?Ð?Ð?Ð?, УÐ?ТС, ХСÐ?Ð?)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../src/utils/mobile-wizard.c:767
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и ЦÐ?Ð?Ð? (1xRTT, EVDO)"
+msgstr "Ð?оÑ? издаваÑ? коÑ?иÑ?Ñ?и ЦÐ?Ð?Ð? (1xРТТ, Ð?Ð?Ð?Ð?)"
 
-#: ../src/utils/mobile-wizard.c:766
+#: ../src/utils/mobile-wizard.c:778
 msgid "Choose your Provider"
 msgstr "Ð?забеÑ?иÑ?е издаваÑ?а Ñ?Ñ?лÑ?га"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
-msgstr "СпиÑ?ак земаÑ?а:"
-
 #: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "Ð?емÑ?а"
+msgid "Country or Region List:"
+msgstr "СпиÑ?ак дÑ?жава или Ñ?егиона:"
+
+#: ../src/utils/mobile-wizard.c:1036
+msgid "Country or region"
+msgstr "Ð?Ñ?жава или Ñ?егион"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/utils/mobile-wizard.c:1043
 msgid "My country is not listed"
 msgstr "Ð?оÑ?а земÑ?а ниÑ?е на Ñ?пиÑ?кÑ?"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
-msgstr "Ð?забеÑ?иÑ?е земÑ?Ñ? даваоÑ?а Ð?нÑ?еÑ?неÑ? Ñ?Ñ?лÑ?га"
+#: ../src/utils/mobile-wizard.c:1089
+msgid "Choose your Provider's Country or Region"
+msgstr "Ð?забеÑ?иÑ?е дÑ?жавÑ? или Ñ?егион ваÑ?ег доÑ?Ñ?авÑ?аÑ?а Ñ?Ñ?лÑ?га"
 
-#: ../src/utils/mobile-wizard.c:1126
+#: ../src/utils/mobile-wizard.c:1143
 msgid "Installed GSM device"
 msgstr "Ð?нÑ?Ñ?алиÑ?ан Ð?СÐ? Ñ?Ñ?еÑ?аÑ?"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/utils/mobile-wizard.c:1146
 msgid "Installed CDMA device"
 msgstr "Ð?нÑ?Ñ?алиÑ?ан ЦÐ?Ð?С Ñ?Ñ?еÑ?аÑ?"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../src/utils/mobile-wizard.c:1314
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2426,121 +2454,98 @@ msgstr ""
 "Ð?ваÑ? Ñ?аÑ?обÑ?ак Ñ?е вам помоÑ?и да лако подеÑ?иÑ?е мобилнÑ? Ñ?иÑ?окопоÑ?аÑ?нÑ? вези Ñ?а "
 "3Ð? мÑ?ежом."
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/utils/mobile-wizard.c:1319
 msgid "You will need the following information:"
 msgstr "Ð?оÑ?Ñ?ебни Ñ?Ñ? вам Ñ?ледеÑ?и подаÑ?и:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/utils/mobile-wizard.c:1330
 msgid "Your broadband provider's name"
 msgstr "Ð?ме издаваÑ?а Ñ?иÑ?окопоÑ?аÑ?не Ñ?Ñ?лÑ?ге"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/utils/mobile-wizard.c:1336
 msgid "Your broadband billing plan name"
 msgstr "Ð?ме Ñ?иÑ?окопоÑ?аÑ?ног плана наплаÑ?е"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../src/utils/mobile-wizard.c:1342
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(Ñ? неким Ñ?лÑ?Ñ?аÑ?евима) Ð?аÑ? план Ñ?иÑ?окопоÑ?аÑ?не наплаÑ?е за Ð?Ð?Ð? (Access Point "
 "Name)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../src/utils/mobile-wizard.c:1369
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Ð?апÑ?ави везÑ? за _оваÑ? мобилни, Ñ?иÑ?окопоÑ?аÑ?ни Ñ?Ñ?еÑ?аÑ?:"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/utils/mobile-wizard.c:1384
 msgid "Any device"
 msgstr "Ð?ило коÑ?и Ñ?Ñ?еÑ?аÑ?"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/utils/mobile-wizard.c:1397
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Ð?одеÑ?и мобилнÑ?, Ñ?иÑ?окопоÑ?аÑ?нÑ? везÑ?"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/utils/mobile-wizard.c:1561
 msgid "New Mobile Broadband Connection"
 msgstr "Ð?ова мобилна, Ñ?иÑ?окопоÑ?аÑ?на веза"
 
-#: ../src/utils/nmn-mobile-providers.c:76
+#: ../src/utils/nmn-mobile-providers.c:78
 msgid "United Kingdom"
 msgstr "УÑ?едиÑ?ено Ð?Ñ?аÑ?евÑ?Ñ?во"
 
-#: ../src/utils/nmn-mobile-providers.c:508
+#: ../src/utils/nmn-mobile-providers.c:510
 msgid "Default"
 msgstr "Ð?одÑ?азÑ?мевана"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:255
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ??"
-
-#: ../src/vpn-password-dialog.c:140
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"Ð?е могÑ? да наÑ?ем пÑ?озоÑ?Ñ?е за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? за Ð?Ð?Ð? везе Ñ?ипа â??%sâ??. Ð?авиÑ?е "
-"Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ? ваÑ?ег Ñ?иÑ?Ñ?ема."
-
-#: ../src/vpn-password-dialog.c:258
-#, c-format
-msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
-msgstr ""
-"Ð?оÑ?ло Ñ?е до непÑ?илике пÑ?и покÑ?еÑ?аÑ?Ñ? пÑ?озоÑ?Ñ?еÑ?а за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? за Ð?Ð?Ð? "
-"везе Ñ?ипа â??%sâ??. Ð?авиÑ?е Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ? ваÑ?ег Ñ?иÑ?Ñ?ема."
-
-#: ../src/wired-dialog.c:99
+#: ../src/wired-dialog.c:97
 msgid "Wired 802.1X authentication"
 msgstr "Ð?иÑ?ана 802.1X пÑ?иÑ?ава"
 
-#: ../src/wireless-dialog.c:474
+#: ../src/wireless-dialog.c:454
 msgid "New..."
 msgstr "Ð?ова..."
 
-#: ../src/wireless-dialog.c:1094
+#: ../src/wireless-dialog.c:1074
 msgid "C_reate"
 msgstr "_Ð?апÑ?ави"
 
-#: ../src/wireless-dialog.c:1175
+#: ../src/wireless-dialog.c:1152
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr ""
 "Ð?оÑ?Ñ?ебни Ñ?Ñ? кÑ?Ñ?Ñ?еви за лозинке или Ñ?иÑ?Ñ?оваÑ?е како би пÑ?иÑ?Ñ?Ñ?пили бежиÑ?ноÑ? "
 "мÑ?ежи â??%sâ??."
 
-#: ../src/wireless-dialog.c:1177
+#: ../src/wireless-dialog.c:1154
 msgid "Wireless Network Authentication Required"
 msgstr "Ð?оÑ?Ñ?ебна Ñ?е пÑ?иÑ?ава на бежиÑ?нÑ? мÑ?ежÑ?"
 
-#: ../src/wireless-dialog.c:1179
+#: ../src/wireless-dialog.c:1156
 msgid "Authentication required by wireless network"
 msgstr "Ð?ежиÑ?нÑ? мÑ?ежÑ? заÑ?Ñ?ева пÑ?иÑ?авÑ?"
 
-#: ../src/wireless-dialog.c:1184
+#: ../src/wireless-dialog.c:1161
 msgid "Create New Wireless Network"
 msgstr "Ð?апÑ?ави новÑ? бежиÑ?нÑ? мÑ?ежÑ?"
 
-#: ../src/wireless-dialog.c:1186
+#: ../src/wireless-dialog.c:1163
 msgid "New wireless network"
 msgstr "Ð?ова бежиÑ?на мÑ?ежа"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/wireless-dialog.c:1164
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "УнеÑ?иÑ?е назив за новÑ? бежиÑ?нÑ? мÑ?ежÑ?."
 
-#: ../src/wireless-dialog.c:1189
+#: ../src/wireless-dialog.c:1166
 msgid "Connect to Hidden Wireless Network"
 msgstr "Ð?овежи Ñ?е Ñ?а Ñ?кÑ?ивеним бежиÑ?ним мÑ?ежама"
 
-#: ../src/wireless-dialog.c:1191
+#: ../src/wireless-dialog.c:1168
 msgid "Hidden wireless network"
 msgstr "СкÑ?ивена бежиÑ?на мÑ?ежа"
 
-#: ../src/wireless-dialog.c:1192
+#: ../src/wireless-dialog.c:1169
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
@@ -2548,11 +2553,11 @@ msgstr ""
 "УнеÑ?иÑ?е име и безбедноÑ?не подаÑ?ке за Ñ?кÑ?ивенÑ? бежиÑ?нÑ? мÑ?ежÑ? на коÑ?Ñ? желиÑ?е "
 "да Ñ?е повежеÑ?е."
 
-#: ../src/wireless-security/eap-method.c:227
+#: ../src/wireless-security/eap-method.c:279
 msgid "No Certificate Authority certificate chosen"
 msgstr "Ð?иÑ?е изабÑ?ан Ñ?еÑ?Ñ?иÑ?икаÑ? овлаÑ?Ñ?еÑ?а (ЦÐ?)"
 
-#: ../src/wireless-security/eap-method.c:228
+#: ../src/wireless-security/eap-method.c:280
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2561,37 +2566,71 @@ msgstr ""
 "Уколико не изабеÑ?еÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ? овлаÑ?Ñ?еÑ?а (ЦÐ?) ваÑ?а бежиÑ?на веза може биÑ?и "
 "неÑ?игÑ?Ñ?на или лажна.  Ð?а ли желиÑ?е да изабеÑ?еÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ??"
 
-#: ../src/wireless-security/eap-method.c:237
+#: ../src/wireless-security/eap-method.c:289
 msgid "Choose CA Certificate"
 msgstr "Ð?забеÑ?иÑ?е ЦÐ? Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
-#: ../src/wireless-security/eap-method.c:552
+#: ../src/wireless-security/eap-method.c:627
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, или PKCS#12 лиÑ?ни кÑ?Ñ?Ñ?еви (*.der, *.pem, *.p12)"
+msgstr "Ð?Ð?Ð , Ð?Ð?Ð?, или Ð?Ð?ЦС#12 лиÑ?ни кÑ?Ñ?Ñ?еви (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:555
+#: ../src/wireless-security/eap-method.c:630
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER или PEM Ñ?еÑ?Ñ?иÑ?икаÑ?и (*.der, *.pem, *.crt, *.cer)"
+msgstr "Ð?Ð?Ð  или Ð?Ð?Ð? Ñ?еÑ?Ñ?иÑ?икаÑ?и (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:261
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/wireless-security.c:368
 msgid "MD5"
 msgstr "Ð?Ð?5"
 
-#: ../src/wireless-security/eap-method-peap.c:277
+#: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "Ð?ТЦ"
 
-#: ../src/wireless-security/eap-method-peap.c:366
-#: ../src/wireless-security/eap-method-tls.c:457
-#: ../src/wireless-security/eap-method-ttls.c:365
+#: ../src/wireless-security/eap-method-peap.c:349
+#: ../src/wireless-security/eap-method-tls.c:419
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Ð?забеÑ?иÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ? овлаÑ?Ñ?еÑ?а (ЦÐ?)..."
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "Ð?нонимни _иденÑ?иÑ?еÑ?:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "ЦÐ? _Ñ?еÑ?Ñ?иÑ?икаÑ?:"
+
+# ~Ð?илоÑ?
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "_УнÑ?Ñ?Ñ?аÑ?Ñ?а пÑ?иÑ?ава:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+msgid "Version 0"
+msgstr "Ð?здаÑ?е 0"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "Ð?здаÑ?е 1"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "_Ð?Ð?Ð?Ð? издаÑ?е:"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:1
+msgid "As_k for this password every time"
+msgstr "Увек ми заÑ?Ñ?ажи _лозинкÑ?"
+
+#: ../src/wireless-security/eap-method-tls.c:250
 msgid "Unencrypted private keys are insecure"
 msgstr "Ð?еÑ?иÑ?Ñ?овани пÑ?иваÑ?ни кÑ?Ñ?Ñ?еви ниÑ?Ñ? Ñ?игÑ?Ñ?ни"
 
-#: ../src/wireless-security/eap-method-tls.c:266
+#: ../src/wireless-security/eap-method-tls.c:253
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -2603,28 +2642,250 @@ msgstr ""
 "ваÑ?е Ñ?игÑ?Ñ?ноÑ?не подаÑ?ке.  Ð?забеÑ?иÑ?е пÑ?иваÑ?ни кÑ?Ñ?Ñ? коÑ?и зе заÑ?Ñ?иÑ?ен "
 "лозинком.\n"
 "\n"
-"(Ð?ожеÑ?е заÑ?Ñ?иÑ?иÑ?и пÑ?иваÑ?не кÑ?Ñ?Ñ?еве коÑ?иÑ?Ñ?еÑ?и openssl)"
+"(Ð?ожеÑ?е заÑ?Ñ?иÑ?иÑ?и пÑ?иваÑ?не кÑ?Ñ?Ñ?еве коÑ?иÑ?Ñ?еÑ?и â??opensslâ??)"
 
-#: ../src/wireless-security/eap-method-tls.c:451
+#: ../src/wireless-security/eap-method-tls.c:413
 msgid "Choose your personal certificate..."
 msgstr "Ð?забеÑ?иÑ?е лиÑ?ни Ñ?еÑ?Ñ?иÑ?икаÑ?..."
 
-#: ../src/wireless-security/eap-method-tls.c:463
+#: ../src/wireless-security/eap-method-tls.c:425
 msgid "Choose your private key..."
 msgstr "Ð?забеÑ?иÑ?е лиÑ?ни кÑ?Ñ?Ñ?..."
 
-#: ../src/wireless-security/wireless-security.c:329
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "I_dentity:"
+msgstr "_Ð?денÑ?иÑ?еÑ?:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+msgid "Private _key:"
+msgstr "Ð?Ñ?иваÑ?ни _кÑ?Ñ?Ñ?:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password:"
+msgstr "Ð?_озинка пÑ?иваÑ?ног кÑ?Ñ?Ñ?а:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_User certificate:"
+msgstr "Ð?о_Ñ?иÑ?ников Ñ?еÑ?Ñ?иÑ?икаÑ?:"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "Ð?е _Ñ?позоÑ?аваÑ? ме виÑ?е"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "Ð?е"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "Ð?а"
+
+#: ../src/wireless-security/wireless-security.c:380
 msgid "TLS"
 msgstr "ТÐ?С"
 
-#: ../src/wireless-security/wireless-security.c:353
+#: ../src/wireless-security/wireless-security.c:404
 msgid "Tunneled TLS"
 msgstr "ТÐ?С кÑ?оз Ñ?Ñ?нел"
 
-#: ../src/wireless-security/wireless-security.c:364
+#: ../src/wireless-security/wireless-security.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Ð?аÑ?Ñ?иÑ?ени Ð?Ð?Ð? (Ð?Ð?Ð?Ð?)"
 
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+msgid "_Authentication:"
+msgstr "_Ð?Ñ?иÑ?ава:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (Ð?Ñ?новно)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Ð?Ñ?воÑ?ени Ñ?иÑ?Ñ?ем"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Ð?еÑ?ени кÑ?Ñ?Ñ?"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "Sho_w key"
+msgstr "Ð?_Ñ?икажи кÑ?Ñ?Ñ?"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "WEP inde_x:"
+msgstr "Ð?Ð?Ð? и_ндекÑ?:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "_Key:"
+msgstr "_Ð?Ñ?Ñ?Ñ?:"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "Ð?еÑ? Ñ?е покÑ?енÑ?Ñ?о пÑ?огÑ?амÑ?е УпÑ?авника мÑ?еже.\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "Ð?е могÑ? да добиÑ?ем %s Ñ?еÑ?виÑ?. (%d)\n"
+
+#~ msgid "PUK code required"
+#~ msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?УÐ? код"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "Ð?оÑ?Ñ?ебан Ñ?е Ð?УÐ? код за повезиваÑ?е мобилног, Ñ?иÑ?окопоÑ?аÑ?ног Ñ?Ñ?еÑ?аÑ?а"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "Ð?иÑ?Ñ?а"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "Ð?епознаÑ?о"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Филип Ð?илеÑ?иÑ?\n"
+#~ "Ð?анило Шеган\n"
+#~ "Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>\n"
+#~ "Ð?Ñ?евод.оÑ?г â?? пÑ?евод на Ñ?Ñ?пÑ?ки Ñ?език."
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">Ð?окÑ?енÑ?Ñ?е мÑ?ежне везе</span>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
+#~ "Ð?здаÑ?е 0\n"
+#~ "Ð?здаÑ?е 1"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>Ð?дÑ?еÑ?е</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+#~ msgstr ""
+#~ "Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
+#~ "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?а Ñ?Ñ?Ñ?ним DNS подеÑ?аваÑ?ем\n"
+#~ "Ð Ñ?Ñ?но\n"
+#~ "Ð?ежи-локално\n"
+#~ "Ð?одели Ñ?а дÑ?Ñ?гим Ñ?аÑ?Ñ?наÑ?има"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "_Ð Ñ?Ñ?е&#x2026;"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>Ð?Ñ?новно</b>"
+
+#~ msgid ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+#~ msgstr ""
+#~ "Ð?ило коÑ?а\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Ð?аÑ?пÑ?е 3G (UMTS/HSPA)\n"
+#~ "Ð?аÑ?пÑ?е 2G (GPRS/EDGE)"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Ð?Ñ?иÑ?ава</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>Ð?Ñ?о</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+#~ msgstr ""
+#~ "Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+#~ msgstr ""
+#~ "Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
+#~ "Ð?бÑ?нÑ?Ñ?и Ð?аÑ? (TP)\n"
+#~ "СÑ?Ñ?еÑ?е пÑ?икаÑ?иве Ñ?единиÑ?а (AUI)\n"
+#~ "BNC\n"
+#~ "СиÑ?еÑ?е незавиÑ?но од медиÑ?а (MII)"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "Ð?Ñ?Ñ?омаÑ?Ñ?ки\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "Ð?Ñ?огÑ?ам за Ñ?Ñ?еÑ?иваÑ?е веза не може да пÑ?онаÑ?е неке од поÑ?Ñ?ебниÑ? Ñ?еÑ?Ñ?Ñ?Ñ?а "
+#~ "(ниÑ?е наÑ?ена глеÑ?д даÑ?оÑ?ека пÑ?огÑ?амÑ?еÑ?а â??УпÑ?авник везеâ??)."
+
+#~ msgid "Apply"
+#~ msgstr "Ð?Ñ?имени"
+
+#~ msgid "Apply..."
+#~ msgstr "Ð?Ñ?имени..."
+
+#~ msgid "could not connect to the system bus."
+#~ msgstr "не могÑ? да Ñ?е повежем на Ñ?иÑ?Ñ?емÑ?кÑ? магиÑ?Ñ?Ñ?алÑ?."
+
+#~ msgid "Country"
+#~ msgstr "Ð?емÑ?а"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "Ð?е могÑ? да Ñ?Ñ?поÑ?Ñ?авим Ð?Ð?Ð? везÑ? â??%sâ??"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "Ð?е могÑ? да наÑ?ем пÑ?озоÑ?Ñ?е за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? за Ð?Ð?Ð? везе Ñ?ипа â??%sâ??. "
+#~ "Ð?авиÑ?е Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ? ваÑ?ег Ñ?иÑ?Ñ?ема."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "Ð?оÑ?ло Ñ?е до непÑ?илике пÑ?и покÑ?еÑ?аÑ?Ñ? пÑ?озоÑ?Ñ?еÑ?а за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? за Ð?Ð?Ð? "
+#~ "везе Ñ?ипа â??%sâ??. Ð?авиÑ?е Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ? ваÑ?ег Ñ?иÑ?Ñ?ема."
+
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue.\n"
@@ -2635,9 +2896,6 @@ msgstr "Ð?аÑ?Ñ?иÑ?ени Ð?Ð?Ð? (Ð?Ð?Ð?Ð?)"
 #~ msgid "Select A File"
 #~ msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ?"
 
-#~ msgid "_Routesâ?¦"
-#~ msgstr "_Ð Ñ?Ñ?еâ?¦"
-
 # Ð?е знам на Ñ?Ñ?а Ñ?е одноÑ?и
 # ~Ð?илоÑ?
 #~ msgid "_Band:"
diff --git a/po/sr latin po b/po/sr latin po
index c72c3a6..6cab30f 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,25 +1,24 @@
 # Serbian translation of network-manager-applet
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2004 - 2009.
-#
 # This file is distributed under the same license as the totem package.
-#
 # Maintainer: Filip Miletic
 # MiloÅ¡ PopoviÄ? <gpopac gmail com>, 2010.
-#
+# Miroslav NikoliÄ? <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=NetworkManager&component=nm-applet\n"
-"POT-Creation-Date: 2010-08-12 12:12+0000\n"
-"PO-Revision-Date: 2010-08-20 15:48+0200\n"
-"Last-Translator: MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2011-03-15 17:19+0000\n"
+"PO-Revision-Date: 2011-03-10 20:44+0200\n"
+"Last-Translator: Miroslav NikoliÄ? <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Control your network connections"
@@ -44,28 +43,27 @@ msgstr "IskljuÄ?ivanje obaveÅ¡tenja o prekidu veze"
 #: ../nm-applet.schemas.in.h:4
 msgid "Set this to TRUE to disable notifications when connecting to a network."
 msgstr ""
-"Postavite na â??TRUEâ?? kako bi onemoguÄ?ili obaveÅ¡tenje pri povezivanju na mrežu."
+"UkljuÄ?ite ovu opciju kako bi onemoguÄ?ili obaveÅ¡tenje pri povezivanju na mrežu."
 
 #: ../nm-applet.schemas.in.h:5
 msgid ""
 "Set this to TRUE to disable notifications when disconnecting from a network."
 msgstr ""
-"Postavite na â??TRUEâ?? kako bi onemoguÄ?ili obaveÅ¡tenje pri prekidu veze sa "
-"mrežom."
+"UkljuÄ?ite ovu opciju kako bi onemoguÄ?ili obaveÅ¡tenje pri prekidu veze sa mrežom."
 
 #: ../nm-applet.schemas.in.h:6
 msgid ""
 "Set this to TRUE to disable notifications when wireless networks are "
 "available."
 msgstr ""
-"Postavite na â??TRUEâ?? kako bi onemoguÄ?ili obaveÅ¡tenje o dostupnosti bežiÄ?nih "
+"UkljuÄ?ite ovu opciju kako bi onemoguÄ?ili obaveÅ¡tenje o dostupnosti bežiÄ?nih "
 "mreža."
 
 #: ../nm-applet.schemas.in.h:7
 msgid ""
 "Set to TRUE to disable creation of adhoc networks when using the applet."
 msgstr ""
-"Postavite na â??TRUEâ?? kako bi onemoguÄ?ili obrazovanje adhok mreža iz Upravnika "
+"UkljuÄ?ite ovu opciju kako bi onemoguÄ?ili obrazovanje adhok mreža iz Upravnika "
 "mrežama."
 
 #: ../nm-applet.schemas.in.h:8
@@ -85,35 +83,26 @@ msgid "Manage and change your network connection settings"
 msgstr "Upravljajte i izmenite podešavanja vaših mrežnih veza"
 
 #: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "Network Connections"
 msgstr "Veze sa mrežom"
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "VeÄ? je pokrenuto programÄ?e Upravnika mreže.\n"
-
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "Ne mogu da dobijem %s servis. (%d)\n"
-
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:332
-#: ../src/applet-device-gsm.c:375 ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:817
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
+#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "Dostupno"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:374
-#: ../src/applet-device-gsm.c:417 ../src/applet-device-wired.c:270
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
+#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
+#: ../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:378
-#: ../src/applet-device-gsm.c:421 ../src/applet-device-wired.c:274
-#: ../src/applet-device-wifi.c:1258
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
+#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "Veza uspostavljena"
 
@@ -121,264 +110,258 @@ msgstr "Veza uspostavljena"
 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:414
-#: ../src/applet-device-gsm.c:457
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
+#: ../src/applet-device-gsm.c:463 ../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:417
-#: ../src/applet-device-gsm.c:460
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
+#: ../src/applet-device-gsm.c:466 ../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:420
-#: ../src/applet-device-gsm.c:463
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
+#: ../src/applet-device-gsm.c:469 ../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:240 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:466 ../src/applet.c:2300
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
+#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2383
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Zahtevam mrežnu adresu za â??%sâ??..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:484
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
+#: ../src/applet-device-gsm.c:490
 #, 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:621
-#: ../src/mb-menu-item.c:55
+#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
+#: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:281 ../src/applet-device-gsm.c:325
+#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/applet-dialogs.c:405
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilna veza (%s)"
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/connection-editor/page-mobile.c:318
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1399
+#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
+#: ../src/connection-editor/page-mobile.c:372
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-list.c:1436
 msgid "Mobile Broadband"
 msgstr "Mobilna"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:345
+#: ../src/applet-device-cdma.c:350
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Nova mobilna, Å¡irokopojasna veza (CDMA)..."
 
-#: ../src/applet-device-cdma.c:379
+#: ../src/applet-device-cdma.c:384
 msgid "You are now connected to the CDMA network."
 msgstr "Sada ste povezani na CDMA mrežu."
 
-#: ../src/applet-device-cdma.c:436 ../src/applet-device-gsm.c:479
+#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
+#: ../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:439 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
+#: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "roming"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:624
-#: ../src/mb-menu-item.c:60
+#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
+#: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:388
+#: ../src/applet-device-gsm.c:394
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Nova mobilna, širokopojasna mreža..."
 
-#: ../src/applet-device-gsm.c:422
+#: ../src/applet-device-gsm.c:428
 msgid "You are now connected to the GSM network."
 msgstr "Povezani ste na GSM mrežu."
 
-#: ../src/applet-device-gsm.c:711
+#: ../src/applet-device-gsm.c:589
 msgid "PIN code required"
-msgstr "Potreban je PIN kod"
-
-#: ../src/applet-device-gsm.c:713
-msgid "PUK code required"
-msgstr "Potreban je PUK kod"
+msgstr "Potreban je PIN kôd"
 
-#: ../src/applet-device-gsm.c:724
+#: ../src/applet-device-gsm.c:597
 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:726
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "Potreban je PUK kod za povezivanje mobilnog, Å¡irokopojasnog ureÄ?aja"
-
-#: ../src/applet-device-gsm.c:859
+#: ../src/applet-device-gsm.c:718
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Pogrešan PIN kod, kontaktirajte vašeg provajdera."
 
-#: ../src/applet-device-gsm.c:882
+#: ../src/applet-device-gsm.c:741
 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:909
+#: ../src/applet-device-gsm.c:768
 msgid "Sending unlock code..."
 msgstr "Å aljem kod za otkljuÄ?avanje."
 
-#: ../src/applet-device-gsm.c:969
+#: ../src/applet-device-gsm.c:831
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otkljuÄ?ati SIM PIN"
 
-#: ../src/applet-device-gsm.c:970
+#: ../src/applet-device-gsm.c:832
 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:972
+#: ../src/applet-device-gsm.c:834
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
 msgstr "Mobilni Å¡irokopojasni ureÄ?aj â??%sâ?? zahteva SIM PIN kod."
 
-#: ../src/applet-device-gsm.c:973
-#| msgid "PIN code:"
-msgctxt "PIN code entry label"
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:836
 msgid "PIN code:"
-msgstr "PIN kod:"
+msgstr "PIN kôd:"
 
-#: ../src/applet-device-gsm.c:976
-#| msgid "New PIN code:"
-msgctxt "Show/obscure PIN checkbox label"
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:840
 msgid "Show PIN code"
-msgstr "Prikaži PIN kod"
+msgstr "Prikaži PIN kôd"
 
-#: ../src/applet-device-gsm.c:979
+#: ../src/applet-device-gsm.c:843
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otkljuÄ?ati SIM PUK"
 
-#: ../src/applet-device-gsm.c:980
+#: ../src/applet-device-gsm.c:844
 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:982
+#: ../src/applet-device-gsm.c:846
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
-msgstr "Mobilni Å¡irokopojasni ureÄ?aj â??%sâ?? zahteva SIM PUK kod."
+msgstr "Mobilni Å¡irokopojasni ureÄ?aj â??%sâ?? zahteva SIM PUK kôd."
 
-#: ../src/applet-device-gsm.c:983
-#| msgid "PUK code:"
-msgctxt "PUK code entry label"
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:848
 msgid "PUK code:"
-msgstr "PUK kod:"
+msgstr "PUK kôd:"
 
-#: ../src/applet-device-gsm.c:985
-#| msgid "New PIN code:"
-msgctxt "New PIN entry label"
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:851
 msgid "New PIN code:"
-msgstr "Novi PUK kod:"
+msgstr "Novi PIN kôd:"
 
-#: ../src/applet-device-gsm.c:986
-#| msgid "Re-enter new PIN code:"
-msgctxt "New PIN verification entry label"
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:853
 msgid "Re-enter new PIN code:"
-msgstr "Ponovo unesite PUK kod:"
+msgstr "Ponovo unesite PIN kôd:"
 
-#: ../src/applet-device-gsm.c:990
-#| msgid "New PIN code:"
-msgctxt "Show/obscure PIN/PUK checkbox label"
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:858
 msgid "Show PIN/PUK codes"
-msgstr "Prikaži PIN/PUK kodove"
+msgstr "Prikaži PIN/PUK kôdove"
 
-#: ../src/applet-device-wired.c:63
+#: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
 msgstr "Automatska žiÄ?ana veza"
 
-#: ../src/applet-device-wired.c:206
+#: ../src/applet-device-wired.c:205
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "ŽiÄ?ane mreže (%s)"
 
-#: ../src/applet-device-wired.c:208
+#: ../src/applet-device-wired.c:207
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "ŽiÄ?ana mreža (%s)"
 
-#: ../src/applet-device-wired.c:211
+#: ../src/applet-device-wired.c:210
 msgid "Wired Networks"
-msgstr "ŽiÄ?ana mreža"
+msgstr "ŽiÄ?ane mreže"
 
-#: ../src/applet-device-wired.c:213
+#: ../src/applet-device-wired.c:212
 msgid "Wired Network"
 msgstr "ŽiÄ?ana mreža"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1311
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
 msgid "disconnected"
 msgstr "veza je prekinuta"
 
-#: ../src/applet-device-wired.c:275
+#: ../src/applet-device-wired.c:274
 msgid "You are now connected to the wired network."
-msgstr "Povezani ste sa žiÄ?anom mrežom."
+msgstr "Povezani ste na žiÄ?anu mrežu."
 
-#: ../src/applet-device-wired.c:301
+#: ../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:304
+#: ../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:307
+#: ../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:310
+#: ../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:314
+#: ../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:565
+#: ../src/applet-device-wired.c:494
 msgid "DSL authentication"
 msgstr "DSL prijava"
 
-#: ../src/applet-device-wifi.c:88
+#: ../src/applet-device-wifi.c:89
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "Po_veži se na skrivene bežiÄ?ne mreže..."
 
-#: ../src/applet-device-wifi.c:121
+#: ../src/applet-device-wifi.c:142
 msgid "Create _New Wireless Network..."
 msgstr "Napravi _novu bežiÄ?nu mrežu..."
 
+#: ../src/applet-device-wifi.c:226
+msgid "(none)"
+msgstr "(ništa)"
+
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:749
+#: ../src/applet-device-wifi.c:795
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "BežiÄ?ne mreže (%s)"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:751
+#: ../src/applet-device-wifi.c:797
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "BežiÄ?na mreža (%s)"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:753
+#: ../src/applet-device-wifi.c:799
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "BežiÄ?na mreža"
@@ -386,230 +369,302 @@ msgstr[1] "BežiÄ?ne mreže"
 msgstr[2] "BežiÄ?ne mreže"
 msgstr[3] "BežiÄ?na mreža"
 
-#: ../src/applet-device-wifi.c:783
+#: ../src/applet-device-wifi.c:832
 msgid "wireless is disabled"
 msgstr "BežiÄ?na mreža je onemoguÄ?ena"
 
-#: ../src/applet-device-wifi.c:844
+#: ../src/applet-device-wifi.c:833
+msgid "wireless is disabled by hardware switch"
+msgstr "bežiÄ?na mreža je iskljuÄ?ena fiziÄ?kim prekidaÄ?em"
+
+#: ../src/applet-device-wifi.c:894
 msgid "More networks"
 msgstr "Još mreža"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:1048
+#: ../src/applet-device-wifi.c:1073
 msgid "Wireless Networks Available"
-msgstr "Dostupne bežiÄ?ne mreže"
+msgstr "Dostupne su bežiÄ?ne mreže"
 
-#: ../src/applet-device-wifi.c:1049
+#: ../src/applet-device-wifi.c:1075
 msgid "Click on this icon to connect to a wireless network"
 msgstr "Kliknite na ovu ikonicu radi povezivanja na bežiÄ?nu mrežu"
 
-#: ../src/applet-device-wifi.c:1052 ../src/applet.c:679
+#: ../src/applet-device-wifi.c:1076
+msgid "Use the network menu to connect to a wireless network"
+msgstr "Koristite meni mreže da se povežete na bežiÄ?nu mrežu"
+
+#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
 msgid "Don't show this message again"
 msgstr "Ne prikazuj viÅ¡e ovo prozorÄ?e"
 
-#: ../src/applet-device-wifi.c:1256
+#: ../src/applet-device-wifi.c:1271
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Povezani ste sa bežiÄ?nom mrežom â??%sâ??."
 
-#: ../src/applet-device-wifi.c:1257 ../src/applet-device-wifi.c:1288
-msgid "(none)"
-msgstr "(ništa)"
-
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1302
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "Pripremam vezu preko bežiÄ?ne mreže â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "PodeÅ¡avam vezu preko bežiÄ?ne mreže â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1304
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje bežiÄ?ne veze â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "Zahtevam adresu za bežiÄ?nu mrežu â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1327
+#: ../src/applet-device-wifi.c:1332
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "Povezani ste preko bežiÄ?ne veze â??%sâ?? : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1337
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "Povezani ste preko bežiÄ?ne veze â??%sâ??"
 
+#: ../src/applet-device-wimax.c:231
+#, c-format
+msgid "WiMAX Mobile Broadband (%s)"
+msgstr "ViMAH Mobilna Å¡irokopojasna (%s)"
+
+#: ../src/applet-device-wimax.c:233
+msgid "WiMAX Mobile Broadband"
+msgstr "ViMAH Mobilna Å¡irokopojasna"
+
+#: ../src/applet-device-wimax.c:259
+msgid "WiMAX is disabled"
+msgstr "ViMAKS je iskljuÄ?ena"
+
+#: ../src/applet-device-wimax.c:260
+msgid "WiMAX is disabled by hardware switch"
+msgstr "ViMAH je iskljuÄ?ena fiziÄ?kim prekidaÄ?em"
+
+#: ../src/applet-device-wimax.c:428
+msgid "You are now connected to the WiMAX network."
+msgstr "Sada ste povezani na ViMAH mrežu."
+
 #: ../src/applet-dialogs.c:56
 msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
-#: ../src/applet-dialogs.c:87
-#: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:962
-#: ../src/wireless-security/wireless-security.c:341
+#: ../src/applet-dialogs.c:108
+#: ../src/connection-editor/page-wireless-security.c:285
+#: ../src/wireless-dialog.c:946
+#: ../src/wireless-security/wireless-security.c:392
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:89
+#: ../src/applet-dialogs.c:110
 msgid "Dynamic WEP"
-msgstr "DinamiÄ?ki WEP"
+msgstr "DinamiÄ?ki VEP"
 
-#: ../src/applet-dialogs.c:91 ../src/applet-dialogs.c:192
-#: ../src/applet-dialogs.c:194
+#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
+#: ../src/applet-dialogs.c:223
 msgid "WPA/WPA2"
-msgstr "WPA/WPA2"
+msgstr "VPA/VPA2"
 
-#: ../src/applet-dialogs.c:190
+#: ../src/applet-dialogs.c:219
 msgid "WEP"
-msgstr "WEP"
-
-#: ../src/applet-dialogs.c:198
-#: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:919
-msgctxt "No wifi security used"
-msgid "None"
-msgstr "Ništa"
+msgstr "VEP"
 
-#: ../src/applet-dialogs.c:207
-msgctxt "No wired security used"
+#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
+#: ../src/connection-editor/page-wireless-security.c:239
+#: ../src/wireless-dialog.c:903
+msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/applet-dialogs.c:210
-msgctxt "Unknown/unrecognized wired or wifi security"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:282 ../src/applet-dialogs.c:384
-#: ../src/applet-dialogs.c:421 ../src/applet-dialogs.c:439
-#: ../src/applet-dialogs.c:450
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:342
+#, c-format
+msgid "%d dB"
+msgstr "%d dB"
+
+#: ../src/applet-dialogs.c:344
+msgctxt "WiMAX CINR"
+msgid "unknown"
+msgstr "nepoznato"
+
+#: ../src/applet-dialogs.c:356
+msgctxt "WiMAX Base Station ID"
+msgid "unknown"
+msgstr "nepoznato"
+
+#: ../src/applet-dialogs.c:391
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ŽiÄ?ana mreža (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:394
 #, c-format
 msgid "802.11 WiFi (%s)"
-msgstr "802.11 WiFi (%s)"
+msgstr "802.11 bežiÄ?na (%s)"
 
-#: ../src/applet-dialogs.c:317
+#: ../src/applet-dialogs.c:401
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:319
+#: ../src/applet-dialogs.c:403
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:324
+#: ../src/applet-dialogs.c:407
+#, c-format
+msgid "WiMAX (%s)"
+msgstr "ViMAH (%s)"
+
+#. --- General ---
+#: ../src/applet-dialogs.c:413
+msgid "General"
+msgstr "Opšte"
+
+#: ../src/applet-dialogs.c:417
 msgid "Interface:"
 msgstr "UreÄ?aj:"
 
-#: ../src/applet-dialogs.c:340
+#: ../src/applet-dialogs.c:433
 msgid "Hardware Address:"
 msgstr "Hardverska adresa:"
 
-#: ../src/applet-dialogs.c:350
+#. Driver
+#: ../src/applet-dialogs.c:441
 msgid "Driver:"
-msgstr "Drajver"
+msgstr "Drajver:"
 
-#: ../src/applet-dialogs.c:388
+#: ../src/applet-dialogs.c:470
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../src/applet-dialogs.c:397
+#: ../src/applet-dialogs.c:480
 msgid "Security:"
 msgstr "Bezbednost:"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:493
+msgid "CINR:"
+msgstr "CINR:"
+
+#: ../src/applet-dialogs.c:506
+msgid "BSID:"
+msgstr "BSID:"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:523
+msgid "IPv4"
+msgstr "IPv4"
+
+#. Address
+#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
 msgid "IP Address:"
 msgstr "IP adresa:"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Nepoznata"
+
+#: ../src/applet-dialogs.c:550
 msgid "Broadcast Address:"
 msgstr "Adresa za emitovanje:"
 
-#: ../src/applet-dialogs.c:448
+#. Prefix
+#: ../src/applet-dialogs.c:559
 msgid "Subnet Mask:"
 msgstr "Mrežna maska:"
 
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:561
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Nepoznata"
+
+#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
 msgid "Default Route:"
 msgstr "Podrazumevana ruta:"
 
-#: ../src/applet-dialogs.c:474
+#: ../src/applet-dialogs.c:581
 msgid "Primary DNS:"
 msgstr "Primarni DNS:"
 
-#: ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:590
 msgid "Secondary DNS:"
 msgstr "Sekundarni DNS:"
 
+#: ../src/applet-dialogs.c:600
+msgid "Ternary DNS:"
+msgstr "Tercijarni DNS:"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:615
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../src/applet-dialogs.c:624
+msgid "Ignored"
+msgstr "Zanemareno"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:732
 msgid "No valid active connections found!"
 msgstr "Nema ispravnih, pokrenutih veza!"
 
-#: ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:785
 msgid ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
 msgstr ""
-"Sva prava zadržana © 2004â??2008 Red Hat, Inc.\n"
-"Sva prava zadržana © 2005â??2008 Novell, Inc."
+"Autorska prava © 2004-2010 Red Hat, Inc.\n"
+"Autorska prava © 2005-2008 Novell, Inc.\n"
+"i mnogi drugi saradnici zajednice i prevodioci"
 
-#: ../src/applet-dialogs.c:677
+#: ../src/applet-dialogs.c:788
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "ProgramÄ?e za obaveÅ¡tajnu zonu za upravljanje mrežnim ureÄ?ajima i vezama."
+msgstr "ProgramÄ?e obaveÅ¡tajne zone za upravljanje mrežnim ureÄ?ajima i vezama."
 
-#: ../src/applet-dialogs.c:679
+#: ../src/applet-dialogs.c:790
 msgid "NetworkManager Website"
 msgstr "Veb stranica Upravnika mrežom"
 
-#: ../src/applet-dialogs.c:682
-msgid "translator-credits"
-msgstr ""
-"Filip MiletiÄ?\n"
-"Danilo Å egan\n"
-"MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
-"Prevod.org â?? prevod na srpski jezik."
-
-#: ../src/applet-dialogs.c:698
+#: ../src/applet-dialogs.c:805
 msgid "Missing resources"
 msgstr "Nedostaju resursi"
 
-#: ../src/applet-dialogs.c:725
+#: ../src/applet-dialogs.c:830
 msgid "Mobile broadband network password"
 msgstr "Lozinka mobilne, širokopojasne mreže"
 
-#: ../src/applet-dialogs.c:734
+#: ../src/applet-dialogs.c:839
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Potrebna je lozinka za povezivanje na â??%sâ??."
 
-#: ../src/applet-dialogs.c:755
+#: ../src/applet-dialogs.c:854
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/applet.c:792
+#: ../src/applet.c:894
 #, c-format
 msgid ""
 "\n"
@@ -619,7 +674,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? zbog prekida veze u mreži."
 
-#: ../src/applet.c:795
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -628,7 +683,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? zbog neoÄ?ekivanog iskljuÄ?enja VPN servisa."
 
-#: ../src/applet.c:798
+#: ../src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -639,7 +694,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu â??%sâ?? jer je VPN servis poslao neodgovarajuÄ?a "
 "podešavanja."
 
-#: ../src/applet.c:801
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +703,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? jer je isteklo vreme za povezivanje."
 
-#: ../src/applet.c:804
+#: ../src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +712,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? jer VPN servis nije pokrenut na vreme."
 
-#: ../src/applet.c:807
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -666,7 +721,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? zato Å¡to ne mogu da pokrenem VPN servis."
 
-#: ../src/applet.c:810
+#: ../src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -675,7 +730,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? jer ne postoje ispravne VPN lozinke."
 
-#: ../src/applet.c:813
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -684,7 +739,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ?? zbog neispravnih VPN lozinki."
 
-#: ../src/applet.c:820
+#: ../src/applet.c:922
 #, c-format
 msgid ""
 "\n"
@@ -693,7 +748,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu â??%sâ??"
 
-#: ../src/applet.c:838
+#: ../src/applet.c:940
 #, c-format
 msgid ""
 "\n"
@@ -703,7 +758,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza â??%sâ?? zbog prekida veze u mreži."
 
-#: ../src/applet.c:841
+#: ../src/applet.c:943
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +767,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza â??%sâ?? zbog iskljuÄ?ivanja VPN servisa."
 
-#: ../src/applet.c:847
+#: ../src/applet.c:949
 #, c-format
 msgid ""
 "\n"
@@ -721,15 +776,15 @@ msgstr ""
 "\n"
 "VPN veza â??%sâ?? je prekinuta."
 
-#: ../src/applet.c:878
+#: ../src/applet.c:983
 msgid "VPN Login Message"
 msgstr "Poruka za VPN prijavu"
 
-#: ../src/applet.c:890 ../src/applet.c:898 ../src/applet.c:945
+#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
 msgid "VPN Connection Failed"
 msgstr "Nije uspelo povezivanje na VPN"
 
-#: ../src/applet.c:952
+#: ../src/applet.c:1054
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +798,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:955
+#: ../src/applet.c:1057
 #, c-format
 msgid ""
 "\n"
@@ -756,342 +811,262 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1299
+#: ../src/applet.c:1377
 msgid "device not ready (firmware missing)"
 msgstr "ureÄ?aj nije spreman (nedostaje firmver)"
 
-#: ../src/applet.c:1301
+#: ../src/applet.c:1379
 msgid "device not ready"
 msgstr "ureÄ?aj nije spreman"
 
-#: ../src/applet.c:1327
+#: ../src/applet.c:1405
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../src/applet.c:1341
+#: ../src/applet.c:1419
 msgid "device not managed"
 msgstr "ne mogu da upravljam ureÄ?ajem"
 
-#: ../src/applet.c:1387
+#: ../src/applet.c:1463
 msgid "No network devices available"
 msgstr "Nije pronaÄ?en nijedan mrežni ureÄ?aj"
 
-#: ../src/applet.c:1475
+#: ../src/applet.c:1551
 msgid "_VPN Connections"
 msgstr "_VPN veze"
 
-#: ../src/applet.c:1528
+#: ../src/applet.c:1608
 msgid "_Configure VPN..."
 msgstr "Po_desi VPN..."
 
-#: ../src/applet.c:1532
+#: ../src/applet.c:1612
 msgid "_Disconnect VPN"
 msgstr "_Prekini VPN vezu"
 
-#: ../src/applet.c:1619
+#: ../src/applet.c:1710
 msgid "NetworkManager is not running..."
 msgstr "UpravljaÄ? mrežom nije pokrenut..."
 
-#: ../src/applet.c:1624 ../src/applet.c:2428
+#: ../src/applet.c:1715 ../src/applet.c:2508
 msgid "Networking disabled"
 msgstr "Umrežavanje iskljuÄ?eno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1853
+#: ../src/applet.c:1936
 msgid "Enable _Networking"
 msgstr "UkljuÄ?i _mrežne usluge"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1862
+#: ../src/applet.c:1945
 msgid "Enable _Wireless"
 msgstr "UkljuÄ?i _bežiÄ?no mreženje"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1871
+#: ../src/applet.c:1954
 msgid "Enable _Mobile Broadband"
 msgstr "OmoguÄ?i _mobilne veze"
 
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1963
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "Omogu_Ä?i ViMAH Mobilnu Å¡irokopojasnu"
+
 #. Toggle notifications item
-#: ../src/applet.c:1882
+#: ../src/applet.c:1974
 msgid "Enable N_otifications"
 msgstr "_Prikaži obaveštenja"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1893
+#: ../src/applet.c:1985
 msgid "Connection _Information"
 msgstr "Poda_ci o vezi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1903
+#: ../src/applet.c:1995
 msgid "Edit Connections..."
 msgstr "Uredi veze..."
 
 #. Help item
-#: ../src/applet.c:1917
+#: ../src/applet.c:2009
 msgid "_Help"
 msgstr "_PomoÄ?"
 
 #. About item
-#: ../src/applet.c:1926
+#: ../src/applet.c:2018
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/applet.c:2117
+#: ../src/applet.c:2195
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: ../src/applet.c:2118
+#: ../src/applet.c:2196
 msgid "The network connection has been disconnected."
 msgstr "Mrežna veza je prekinuta."
 
-#: ../src/applet.c:2294
+#: ../src/applet.c:2377
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Pripremam mrežnu vezu â??%sâ??..."
 
-#: ../src/applet.c:2297
+#: ../src/applet.c:2380
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje veze â??%sâ??..."
 
-#: ../src/applet.c:2303
+#: ../src/applet.c:2386
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Povezani ste preko veze â??%sâ??"
 
-#: ../src/applet.c:2384
+#: ../src/applet.c:2464
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Uspostavljam VPN vezu â??%sâ??..."
 
-#: ../src/applet.c:2387
+#: ../src/applet.c:2467
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje VPN veze â??%sâ??..."
 
-#: ../src/applet.c:2390
+#: ../src/applet.c:2470
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Zahtevam VPN mrežnu adresu za â??%sâ??..."
 
-#: ../src/applet.c:2393
+#: ../src/applet.c:2473
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Povezani ste preko VPN veze â??%sâ??"
 
-#: ../src/applet.c:2432
+#: ../src/applet.c:2512
 msgid "No network connection"
 msgstr "Nema mrežnih veza"
 
-#: ../src/applet.c:2996
+#: ../src/applet.c:3161
 msgid "NetworkManager Applet"
 msgstr "ProgramÄ?e Upravnik mreže"
 
-#: ../src/applet.c:3002 ../src/wired-dialog.c:128
+#: ../src/applet.c:3167 ../src/wired-dialog.c:127
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
+"The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
-"ProgramÄ?e Upravnik mreže nije mogao da pronaÄ?e neke od potrebnih resursa "
-"(glejd datoteka nije pronaÄ?ena)."
+"ProgramÄ?e Upravnik mreže ne može da pronaÄ?e neke potrebne resurse (â??.uiâ?? "
+"datoteka nije pronaÄ?ena)."
 
 # bug: translatable, really?
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-vpn-wizard.glade.h:1
+#: ../src/applet.ui.h:1 ../src/connection-editor/ce-vpn-wizard.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-msgid ""
-"1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr ""
-"1 (podrazumevano)\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../src/applet.glade.h:6
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Pokrenute mrežne veze</span>"
-
-#: ../src/applet.glade.h:7
-msgid "Anony_mous identity:"
-msgstr "Anonimni _identitet:"
-
-#: ../src/applet.glade.h:8
-msgid "As_k for this password every time"
-msgstr "Uvek mi zatraži _lozinku"
-
-#: ../src/applet.glade.h:9
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr ""
-"Automatski\n"
-"Izdanje 0\n"
-"Izdanje 1"
-
-#: ../src/applet.glade.h:12
-msgid "C_A certificate:"
-msgstr "CA _sertifikat:"
+#: ../src/applet.ui.h:2
+msgid "Active Network Connections"
+msgstr "Aktivne veze mreže"
 
-#: ../src/applet.glade.h:13
+#: ../src/applet.ui.h:3
 msgid "C_onnect"
 msgstr "P_oveži se"
 
-#: ../src/applet.glade.h:14
+#: ../src/applet.ui.h:4
 msgid "Co_nnection:"
 msgstr "_Veza:"
 
-#: ../src/applet.glade.h:15
+#: ../src/applet.ui.h:5
 msgid "Connection Information"
 msgstr "Podaci o vezi"
 
-#: ../src/applet.glade.h:16
-msgid "Don't _warn me again"
-msgstr "Ne _upozoravaj me više"
-
-#: ../src/applet.glade.h:17
-msgid "I_dentity:"
-msgstr "_Identitet:"
-
-# ~Miloš
-#: ../src/applet.glade.h:18
-msgid "I_nner authentication:"
-msgstr "_Unutrašnja prijava:"
-
-#: ../src/applet.glade.h:19
-msgid "No"
-msgstr "Ne"
-
-#: ../src/applet.glade.h:20
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"Otvoreni sistem\n"
-"Deljeni kljuÄ?"
-
-#: ../src/applet.glade.h:22
+#: ../src/applet.ui.h:6
 msgid "Other Wireless Network..."
 msgstr "Ostale bežiÄ?ne mreže..."
 
-#: ../src/applet.glade.h:23
-msgid "Private _key:"
-msgstr "Privatni _kljuÄ?:"
-
-#: ../src/applet.glade.h:24
-msgid "Sho_w key"
-msgstr "P_rikaži kljuÄ?"
-
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
-msgid "Sho_w password"
-msgstr "Prikaži _lozinku"
-
-#: ../src/applet.glade.h:26
-msgid "WEP inde_x:"
-msgstr "WEP i_ndeks:"
-
-#: ../src/applet.glade.h:27
+#: ../src/applet.ui.h:7
 msgid "Wireless _adapter:"
 msgstr "BežiÄ?ni _ureÄ?aj:"
 
-#: ../src/applet.glade.h:28
-msgid "Yes"
-msgstr "Da"
-
-#: ../src/applet.glade.h:29
-msgid "_Authentication:"
-msgstr "_Prijava:"
-
-#: ../src/applet.glade.h:30
-msgid "_Key:"
-msgstr "_KljuÄ?:"
-
-#: ../src/applet.glade.h:31
+#: ../src/applet.ui.h:8
 msgid "_Network name:"
 msgstr "_Ime mreže:"
 
-#: ../src/applet.glade.h:32
-msgid "_PEAP version:"
-msgstr "I_zdanje PEAP-a:"
-
-#: ../src/applet.glade.h:33 ../src/connection-editor/ce-page-dsl.glade.h:2
-#: ../src/connection-editor/ce-page-mobile.glade.h:15
-msgid "_Password:"
-msgstr "_Lozinka:"
-
-#: ../src/applet.glade.h:34
-msgid "_Private key password:"
-msgstr "L_ozinka privatnog kljuÄ?a:"
-
-#: ../src/applet.glade.h:35 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "_Type:"
-msgstr "_Vrsta:"
-
-#: ../src/applet.glade.h:36
+#: ../src/applet.ui.h:9
 msgid "_Unlock"
 msgstr "_OtkljuÄ?aj"
 
-#: ../src/applet.glade.h:37
-msgid "_User certificate:"
-msgstr "Ko_risnikov sertifikat:"
-
-#: ../src/applet.glade.h:38 ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
-msgid "_Username:"
-msgstr "Kori_sniÄ?ko ime:"
-
-#: ../src/applet.glade.h:39
+#: ../src/applet.ui.h:10
 msgid "_Wireless security:"
 msgstr "_BežiÄ?na bezbednost:"
 
-#: ../src/applet.glade.h:40
+#: ../src/applet.ui.h:11
 msgid "label"
 msgstr "natpis"
 
-#: ../src/connection-editor/ce-page.c:69
+#: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "automatski"
 
-#: ../src/connection-editor/ce-page.c:222
-#: ../src/connection-editor/nm-connection-editor.c:616
+#: ../src/connection-editor/ce-page.c:294
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Ne mogu da ažururam lozinke veze zbog nepoznate greške."
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/wireless-security/eap-method-leap.ui.h:1
+#: ../src/wireless-security/eap-method-simple.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:1
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+msgid "Sho_w password"
+msgstr "Prikaži _lozinku"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:3
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "S_ervis:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-#: ../src/connection-editor/ce-page-ip6.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>Adrese</b>"
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/wireless-security/eap-method-leap.ui.h:3
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:3
+msgid "_Username:"
+msgstr "Kori_sniÄ?ko ime:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:2
-#: ../src/connection-editor/ce-page-ip6.glade.h:2
-msgid ""
-"Automatic\n"
-"Automatic with manual DNS settings\n"
-"Manual\n"
-"Link-Local\n"
-"Shared to other computers"
-msgstr ""
-"Automatski\n"
-"Automatski sa ruÄ?nim DNS podeÅ¡avanjem\n"
-"RuÄ?no\n"
-"Veži-lokalno\n"
-"Podeli sa drugim raÄ?unarima"
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+msgid "Addresses"
+msgstr "Adrese"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/page-ip6.c:136
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Automatic"
+msgstr "Automatski"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
+msgid "Automatic with manual DNS settings"
+msgstr "Automatski sa ruÄ?nim DNS podeÅ¡avanjem"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
 msgid "D_HCP client ID:"
 msgstr "_IB DHCP klijenta:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-#: ../src/connection-editor/ce-page-ip6.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1099,8 +1074,8 @@ msgstr ""
 "Domeni za razreÅ¡enje imena domaÄ?ina. Koristite taÄ?ke da razdvojite viÅ¡e "
 "domena."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-#: ../src/connection-editor/ce-page-ip6.glade.h:8
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1108,8 +1083,8 @@ msgstr ""
 "IP adrese za prepoznavanje vaÅ¡eg raÄ?unara unutar mreže.  Kliknite na dugme "
 "â??Dodajâ?? za unos IP adrese."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:10
-#: ../src/connection-editor/ce-page-ip6.glade.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1117,24 +1092,43 @@ msgstr ""
 "IP adrese servera domena za razreÅ¡enje imena domaÄ?ina. Koristite taÄ?ke da "
 "razdvojite više adresa."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-#: ../src/connection-editor/ce-page-ip6.glade.h:10
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "Ukoliko je ukljuÄ?eno, ova veza nikada neÄ?e biti u koriÅ¡Ä?ena kao podrazumevana."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-#: ../src/connection-editor/ce-page-ip6.glade.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Zanemari automatski dobijene rute"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "Link-Local"
+msgstr "Veži-lokalno"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:163
+#: ../src/connection-editor/page-ip6.c:185
+msgid "Manual"
+msgstr "RuÄ?no"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
 msgid "Require IPv4 addressing for this connection to complete"
 msgstr "Zahteva IPv4 adresiranje za uspostavljanje veze"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:205
+msgid "Shared to other computers"
+msgstr "Podeljeno sa ostalim raÄ?unarima"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1144,12 +1138,12 @@ msgstr ""
 "podeÅ¡avanja vaÅ¡eg raÄ?unara.  Ukoliko želite da koristite ovu moguÄ?nost, "
 "unesite ime DHCP programa."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:15
-#: ../src/connection-editor/ce-page-ip6.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "Use this c_onnection only for resources on its network"
 msgstr "Koristi ovu vezu samo za izvore u sopstvenoj mreži"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1157,31 +1151,31 @@ msgstr ""
 "Pri povezivanju na IPv6 kablovske mreže dozvoljava uspostavljanje veze ukoliko "
 "ne rade IPv4 podešavanja, a rade IPv6 podešavanja."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:17
-#: ../src/connection-editor/ce-page-ip6.glade.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid "_DNS servers:"
 msgstr "_DNS serveri:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:18
-#: ../src/connection-editor/ce-page-ip6.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "_Method:"
-msgstr "_Mrtod:"
+msgstr "_Metod:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:19
-#: ../src/connection-editor/ce-page-ip6.glade.h:17
-msgid "_Routes&#x2026;"
-msgstr "_Rute&#x2026;"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+msgid "_Routesâ?¦"
+msgstr "_Ruteâ?¦"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:20
-#: ../src/connection-editor/ce-page-ip6.glade.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "_Search domains:"
 msgstr "Domeni _za traženje:"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "Require IPv6 addressing for this connection to complete"
 msgstr "Zahteva IPv6 adresiranje za uspostavljanje veze"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1189,202 +1183,212 @@ msgstr ""
 "Pri povezivanju na IPv4 kablovske mreže dozvoljava uspostavljanje veze ukoliko "
 "ne rade IPv6 podešavanja, a rade IPv4 podešavanja."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Napredno</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "2G (GPRS/EDGE)"
+msgstr "2G (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "3G (UMTS/HSPA)"
+msgstr "3G (UMTS/HSPA)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>Osnovno</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:3
+msgid "Advanced"
+msgstr "Napredno"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:4
 msgid "Allow roaming if home network is not available"
 msgstr "Dozvoli roming ukoliko nema domaÄ?e mreže"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:4
-msgid ""
-"Any\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Prefer 3G (UMTS/HSPA)\n"
-"Prefer 2G (GPRS/EDGE)"
-msgstr ""
-"Bilo koja\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Najpre 3G (UMTS/HSPA)\n"
-"Najpre 2G (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Any"
+msgstr "Bilo koja"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Basic"
+msgstr "Osnovno"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Change..."
 msgstr "Izmeni..."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "_Mrežni IB:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "_Broj:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "PI_N:"
 msgstr "_PIN:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "Najpre 2G (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "Najpre 3G (UMTS/HSPA)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "Prika_ži lozinke"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:1
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>Dozvoljeni naÄ?ini prijave</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:2
-msgid "<b>Authentication</b>"
-msgstr "<b>Prijava</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:3
-msgid "<b>Compression</b>"
-msgstr "<b>Pakovanje podataka</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:4
-msgid "<b>Echo</b>"
-msgstr "<b>Eho</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:5
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>U veÄ?ini sluÄ?ajeva PPP serveri izdavaÄ?a Internet usluga podržavaju sve "
-"naÄ?ine za prijavu.  Ukoliko povezivanje ne uspe, pokuÅ¡ajte da iskljuÄ?ite "
-"podrÅ¡ku za neke naÄ?ine prijave.</i>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "_Type:"
+msgstr "_Vrsta:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:6
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
 msgid "Allow _BSD data compression"
 msgstr "Dozvoli _BSD pakovanje podataka"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allow _Deflate data compression"
-msgstr "Dozvvoli _Deflate pakovanje podataka"
+msgstr "Dozvvoli â??_Deflateâ?? pakovanje podataka"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Allowed Authentication Methods"
+msgstr "Dozvoljeni naÄ?ini potvrÄ?ivanja identiteta:"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Allowed methods:"
 msgstr "Dozvoljeni naÄ?ini:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "Authentication"
+msgstr "PotvrÄ?ivanje identiteta"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "C_HAP"
 msgstr "C_HAP"
 
 # Razlupavam se :)
 # ~Miloš
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol za prijavu izazovnim rukovanjem"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Compression"
+msgstr "Kompresija"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
 msgid "Configure _Methodsâ?¦"
 msgstr "Podesi _naÄ?ineâ?¦"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Echo"
+msgstr "Eho"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "Extensible Authentication Protocol"
 msgstr "Nadogradiv protokol za prijavu"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"U veÄ?ini sluÄ?ajeva, PPP serveri dobavljaÄ?a Ä?e podržati sve naÄ?ine potvrÄ?ivanja "
+"identiteta. Ako veza ne uspe, pokuÅ¡ajte da iskljuÄ?ite podrÅ¡ku za neke naÄ?ine."
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:13
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
+#: ../src/connection-editor/ce-page-ppp.ui.h:14
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Majkrosoftov protokol za prijavu izazovnim rukovanjem"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
+#: ../src/connection-editor/ce-page-ppp.ui.h:15
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Majkrosoftov protokol za prijavu izazovnim rukovanjem, 2. izdanje"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
+#: ../src/connection-editor/ce-page-ppp.ui.h:16
 msgid "Password Authentication Protocol"
 msgstr "Protokol za prijavu putem lozinke"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
+#: ../src/connection-editor/ce-page-ppp.ui.h:17
 msgid "Send PPP _echo packets"
 msgstr "Å alji PPP _eho pakete"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:18
 msgid "Use TCP _header compression"
 msgstr "Koristi _pakovanje TCP zaglavlja"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
+#: ../src/connection-editor/ce-page-ppp.ui.h:19
 msgid "Use _stateful MPPE"
 msgstr "Koristi _reÄ?it MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
+#: ../src/connection-editor/ce-page-ppp.ui.h:20
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
+#: ../src/connection-editor/ce-page-ppp.ui.h:21
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
+#: ../src/connection-editor/ce-page-ppp.ui.h:22
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
+#: ../src/connection-editor/ce-page-ppp.ui.h:23
 msgid "_Require 128-bit encryption"
 msgstr "_Zahteva 128-bitno Å¡ifrovanje"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
+#: ../src/connection-editor/ce-page-ppp.ui.h:24
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Koristi Å¡ifrovanje â??taÄ?ka-do-taÄ?keâ?? (MPPE)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
+#: ../src/connection-editor/ce-page-wired.ui.h:1
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:2
+msgid "10 Gb/s"
+msgstr "10 GB/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:3
+msgid "10 Mb/s"
+msgstr "10 MB/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:4
+msgid "100 Mb/s"
+msgstr "100 MB/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:5
+msgid "Attachment Unit Interface (AUI)"
+msgstr "SuÄ?elje jedinice prikaÄ?injanja (AUI)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:6
 msgid "Aut_onegotiate"
 msgstr "_Samougovaranje"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-msgstr ""
-"Automatski\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
-msgstr ""
-"Automatski\n"
-"Obrnuti Par (TP)\n"
-"SuÄ?elje prikaÄ?ive jedinica (AUI)\n"
-"BNC\n"
-"SiÄ?elje nezavisno od medija (MII)"
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:9
 msgid "Full duple_x"
 msgstr "Puni _dupleks"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:13
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
+#: ../src/connection-editor/ce-page-wired.ui.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "MT_U:"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wired.ui.h:11
+msgid "Media Independent Interface (MII)"
+msgstr "SuÄ?elje nezavisnog medija (MII)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:12
+#: ../src/connection-editor/ce-page-wireless.ui.h:11
 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 "
@@ -1393,11 +1397,8 @@ 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-wired.glade.h:15
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
-#| msgid ""
-#| "This option locks this connection to the network device specified by the "
-#| "MAC address entered here.  Example: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-wired.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 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"
@@ -1405,68 +1406,68 @@ 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/ce-page-wired.glade.h:16
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
-#| msgid "_MAC address:"
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+msgid "Twisted Pair (TP)"
+msgstr "Upleteni par (TP)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_Cloned MAC address:"
 msgstr "_Klonirana MAK adresa:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
-#| msgid "_MAC address:"
+#: ../src/connection-editor/ce-page-wired.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Device MAC address:"
 msgstr "_MAK adresa ureÄ?aja:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:18
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:19
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "_Brzina:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:20
-#: ../src/connection-editor/ce-page-wireless.glade.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "bytes"
 msgstr "bajtova"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"Automatski\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-wireless.ui.h:1
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:2
+msgid "Ad-hoc"
+msgstr "Ad-hok"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:4
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
 
 # Valjda se odnosi na opseg, a?
 # ~Miloš
-#: ../src/connection-editor/ce-page-wireless.glade.h:4
+#: ../src/connection-editor/ce-page-wireless.ui.h:5
 msgid "Ban_d:"
 msgstr "_Opseg:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "C_hannel:"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
-msgid ""
-"Infrastructure\n"
-"Ad-hoc"
-msgstr ""
-"Infrastrukturno\n"
-"Ad-hok"
+#: ../src/connection-editor/ce-page-wireless.ui.h:7
+msgid "Infrastructure"
+msgstr "Infrastrukturno"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
+#: ../src/connection-editor/ce-page-wireless.ui.h:9
 msgid "M_ode:"
 msgstr "_Režim:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:10
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 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"
@@ -1474,211 +1475,192 @@ 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"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "_JaÄ?ina prenosa:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "_Protok:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:21
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "_Security:"
 msgstr "_Bezbednost:"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+msgid "Choose a VPN Connection Type"
+msgstr "Izbor vrste VPN veze"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+msgid "Createâ?¦"
+msgstr "Napraviâ?¦"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
-"\n"
 "Select the type of VPN you wish to use for the new connection.  If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Izbor vrste VPN veze</span>\n"
-"\n"
-"Izaberite vrstu VPN veze koji želite da koristite za nove veze.  Ukoliko se "
-"izabrana vrsta VPN veze ne pojavi u spisku, možda nemate instaliran ispravan "
-"VPN dodatak."
-
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-msgid "Createâ?¦"
-msgstr "Napraviâ?¦"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/ip6-routes-dialog.c:459
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
+"Izaberite vrstu VPN veze koju želite da koristite za nove veze. Ukoliko se "
+"vrsta VPN veze koju želite da napravite ne pojavi na spisku, možda nemate "
+"instaliran ispravan VPN dodatak."
+
+#: ../src/connection-editor/ip4-routes-dialog.c:506
+#: ../src/connection-editor/ip6-routes-dialog.c:464
+#: ../src/connection-editor/page-ip4.c:733
+#: ../src/connection-editor/page-ip6.c:718
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:522
+#: ../src/connection-editor/page-ip4.c:750
 msgid "Netmask"
 msgstr "Mrežna maska"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/ip6-routes-dialog.c:491
-#: ../src/connection-editor/page-ip4.c:772
-#: ../src/connection-editor/page-ip6.c:757
+#: ../src/connection-editor/ip4-routes-dialog.c:538
+#: ../src/connection-editor/ip6-routes-dialog.c:496
+#: ../src/connection-editor/page-ip4.c:767
+#: ../src/connection-editor/page-ip6.c:752
 msgid "Gateway"
 msgstr "Mrežni izlaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
-#: ../src/connection-editor/ip6-routes-dialog.c:507
+#: ../src/connection-editor/ip4-routes-dialog.c:554
+#: ../src/connection-editor/ip6-routes-dialog.c:512
 msgid "Metric"
 msgstr "MetriÄ?ki"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:740
+#: ../src/connection-editor/ip6-routes-dialog.c:480
+#: ../src/connection-editor/page-ip6.c:735
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/page-dsl.c:140
-#: ../src/connection-editor/page-dsl.c:147
-msgid "Could not load DSL user interface."
-msgstr "Ne mogu da uÄ?itam korisniÄ?ko suÄ?elje za DSL."
-
-#: ../src/connection-editor/page-dsl.c:153
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1407
+#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1444
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:241
+#: ../src/connection-editor/page-dsl.c:139
+msgid "Could not load DSL user interface."
+msgstr "Ne mogu da uÄ?itam korisniÄ?ko suÄ?elje za DSL."
+
+#: ../src/connection-editor/page-dsl.c:229
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL veza â??%dâ??"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN)"
 msgstr "Automatski (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:127
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatska adresa (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP)"
 msgstr "Automatski (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (PPP) addresses only"
 msgstr "Automatska adresa (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Automatski (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatska adresa (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Automatski (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatska adresa (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:162
-#: ../src/connection-editor/page-ip6.c:184
-msgid "Manual"
-msgstr "RuÄ?no"
-
-#: ../src/connection-editor/page-ip4.c:174
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:175
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Samo veži-lokalno"
 
-#: ../src/connection-editor/page-ip4.c:180
-#: ../src/connection-editor/page-ip6.c:204
-msgid "Shared to other computers"
-msgstr "Podeljeno sa ostalim raÄ?unarima"
-
-#: ../src/connection-editor/page-ip4.c:190
+#: ../src/connection-editor/page-ip4.c:191
 msgid "Disabled"
 msgstr "OnemoguÄ?eno"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:699
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "UreÄ?ujem IPv4 rute za %s"
 
-#: ../src/connection-editor/page-ip4.c:819
-#: ../src/connection-editor/page-ip4.c:826
-msgid "Could not load IPv4 user interface."
-msgstr "Ne mogu da uÄ?itam IPv4 korisniÄ?ko suÄ?elje."
-
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:810
 msgid "IPv4 Settings"
 msgstr "Podešavanja za IPv4"
 
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "Automatski"
+#: ../src/connection-editor/page-ip4.c:812
+msgid "Could not load IPv4 user interface."
+msgstr "Ne mogu da uÄ?itam IPv4 korisniÄ?ko suÄ?elje."
 
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Automatski, samo adrese"
 
-#: ../src/connection-editor/page-ip6.c:148
-#: ../src/wireless-security/eap-method.c:233
+#: ../src/connection-editor/page-ip6.c:149
+#: ../src/wireless-security/eap-method.c:285
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../src/connection-editor/page-ip6.c:172
-#| msgid "Automatic (DHCP)"
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Automatski, samo DHCP"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:684
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "UreÄ?ujem IPv6 rute za %s"
 
-#: ../src/connection-editor/page-ip6.c:802
-#: ../src/connection-editor/page-ip6.c:809
-msgid "Could not load IPv6 user interface."
-msgstr "Ne mogu da uÄ?itam IPv6 korisniÄ?ko suÄ?elje."
-
-#: ../src/connection-editor/page-ip6.c:815
+#: ../src/connection-editor/page-ip6.c:793
 msgid "IPv6 Settings"
 msgstr "IPv6 podešavanja"
 
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/connection-editor/page-mobile.c:312
+#: ../src/connection-editor/page-ip6.c:795
+msgid "Could not load IPv6 user interface."
+msgstr "Ne mogu da uÄ?itam IPv6 korisniÄ?ko suÄ?elje."
+
+#: ../src/connection-editor/page-mobile.c:374
 msgid "Could not load mobile broadband user interface."
 msgstr "Ne mogu da uÄ?itam korisniÄ?ko suÄ?elje za mobilnu, Å¡irokopojasnu mrežu."
 
-#: ../src/connection-editor/page-mobile.c:333
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nije podržana ova vrsta mobilne, širokopojasne mreže."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:574
+#: ../src/connection-editor/page-mobile.c:632
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izaberite vrstu mobilnog Å¡irokopojasnog izdavaÄ?a"
 
-#: ../src/connection-editor/page-mobile.c:601
+#: ../src/connection-editor/page-mobile.c:659
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1686,244 +1668,239 @@ msgstr ""
 "Izaberite tehnologiju koju koristi vaÅ¡ izdavaÄ? mobilnih Å¡irokopojasnih "
 "usluga.  Ukoliko niste sigurni, pitajte izdavaÄ?a."
 
-#: ../src/connection-editor/page-mobile.c:606
+#: ../src/connection-editor/page-mobile.c:664
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Moj izdavaÄ? koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:611
+#: ../src/connection-editor/page-mobile.c:671
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Moj izdavaÄ? koristi C_DMA tehnologije (npr. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:132
+#: ../src/connection-editor/page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:228
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-ttls.c:232
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:276
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:245
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-peap.c:248
+#: ../src/wireless-security/eap-method-ttls.c:264
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:244
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:139
+#: ../src/connection-editor/page-ppp.c:141
 msgid "none"
 msgstr "ni jedan"
 
-#: ../src/connection-editor/page-ppp.c:199
+#: ../src/connection-editor/page-ppp.c:201
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "UreÄ?ujem PPP naÄ?ine prijave za %s"
 
+#: ../src/connection-editor/page-ppp.c:281
+msgid "PPP Settings"
+msgstr "PPP podešavanja"
+
 #: ../src/connection-editor/page-ppp.c:283
-#: ../src/connection-editor/page-ppp.c:290
 msgid "Could not load PPP user interface."
 msgstr "Ne mogu da uÄ?itam PPP korisniÄ?ko suÄ?elje."
 
-#: ../src/connection-editor/page-ppp.c:296
-msgid "PPP Settings"
-msgstr "PPP podešavanja"
-
-#: ../src/connection-editor/page-vpn.c:108
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1403
+#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1440
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:119
+#: ../src/connection-editor/page-vpn.c:109
+msgid "Could not load VPN user interface."
+msgstr "Ne mogu da uÄ?itam VPN korisniÄ?ko suÄ?elje."
+
+#: ../src/connection-editor/page-vpn.c:124
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ne mogu da naÄ?em uslugu VPN dodatka za â??%sâ??."
 
-#: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:988
+#: ../src/connection-editor/page-vpn.c:218
+#: ../src/connection-editor/nm-connection-list.c:881
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN veza %d"
 
+#: ../src/connection-editor/page-wired.c:211
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-list.c:1428
+msgid "Wired"
+msgstr "ŽiÄ?ana"
+
 #: ../src/connection-editor/page-wired.c:213
-#: ../src/connection-editor/page-wired.c:220
 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:226
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1391
-msgid "Wired"
-msgstr "ŽiÄ?ana"
-
-#: ../src/connection-editor/page-wired.c:359
+#: ../src/connection-editor/page-wired.c:348
 #, c-format
 msgid "Wired connection %d"
 msgstr "ŽiÄ?ana veza %d"
 
-#: ../src/connection-editor/page-wired-security.c:115
+#: ../src/connection-editor/page-wired-security.c:114
 msgid "802.1x Security"
 msgstr "Sigurnosni 802.1x"
 
-#: ../src/connection-editor/page-wired-security.c:123
+#: ../src/connection-editor/page-wired-security.c:116
+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:130
 msgid "Use 802.1X security for this connection"
 msgstr "Koristi 802.1X sigurnost za ovu vezu"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
+#: ../src/connection-editor/page-wireless.c:147
+#: ../src/connection-editor/page-wireless.c:151
+#: ../src/connection-editor/page-wireless.c:172
 #, c-format
 msgid "default"
 msgstr "podrazumevano"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wireless.c:176
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:399
-#: ../src/connection-editor/page-wireless.c:406
-msgid "Could not load WiFi user interface."
-msgstr "Ne mogu da uÄ?itam korisniÄ?ko suÄ?elje za bežiÄ?nu mrežu."
-
-#: ../src/connection-editor/page-wireless.c:412
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1395
+#: ../src/connection-editor/page-wireless.c:396
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-list.c:1432
 msgid "Wireless"
 msgstr "BežiÄ?na"
 
-#: ../src/connection-editor/page-wireless.c:574
+#: ../src/connection-editor/page-wireless.c:398
+msgid "Could not load WiFi user interface."
+msgstr "Ne mogu da uÄ?itam korisniÄ?ko suÄ?elje za bežiÄ?nu mrežu."
+
+#: ../src/connection-editor/page-wireless.c:562
 #, c-format
 msgid "Wireless connection %d"
 msgstr "BežiÄ?na veza %d"
 
-#: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:936
-#| msgid "WEP 40/128-bit Key"
+#: ../src/connection-editor/page-wireless-security.c:263
+#: ../src/wireless-dialog.c:920
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128-bitni kljuÄ?"
+msgstr "VEP 40/128-bitni kljuÄ?"
 
-#: ../src/connection-editor/page-wireless-security.c:271
-#: ../src/wireless-dialog.c:945
+#: ../src/connection-editor/page-wireless-security.c:272
+#: ../src/wireless-dialog.c:929
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bitna lozinka"
+msgstr "VEP 128-bitna lozinka"
 
-#: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:975
+#: ../src/connection-editor/page-wireless-security.c:298
+#: ../src/wireless-dialog.c:959
 msgid "Dynamic WEP (802.1x)"
-msgstr "DinamiÄ?ki WEP (802.1x)"
+msgstr "DinamiÄ?ki VEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:989
+#: ../src/connection-editor/page-wireless-security.c:312
+#: ../src/wireless-dialog.c:973
 msgid "WPA & WPA2 Personal"
-msgstr "LiÄ?ni WPA & WPA2"
+msgstr "LiÄ?ni VPA & VPA2"
 
-#: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:1003
+#: ../src/connection-editor/page-wireless-security.c:326
+#: ../src/wireless-dialog.c:987
 msgid "WPA & WPA2 Enterprise"
-msgstr "Poslovni WPA & WPA2"
+msgstr "Poslovni VPA & VPA2"
 
-#: ../src/connection-editor/page-wireless-security.c:365
+#: ../src/connection-editor/page-wireless-security.c:359
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr ""
 "Ne mogu da uÄ?itam bezbednosno korisniÄ?ko suÄ?elje za bežiÄ?nu mrežu; nedostaju "
-"WiFi podešavanja."
+"ViFi podešavanja."
 
-#: ../src/connection-editor/page-wireless-security.c:372
-#: ../src/connection-editor/page-wireless-security.c:379
-msgid "Could not load WiFi security user interface."
-msgstr "Ne mogu da uÄ?itam bezbednosno korisniÄ?ko suÄ?elje za bežiÄ?nu mrežu."
-
-#: ../src/connection-editor/page-wireless-security.c:385
+#: ../src/connection-editor/page-wireless-security.c:368
 msgid "Wireless Security"
 msgstr "BežiÄ?na bezbednost"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: ../src/connection-editor/page-wireless-security.c:370
+msgid "Could not load WiFi security user interface."
+msgstr "Ne mogu da uÄ?itam bezbednosno korisniÄ?ko suÄ?elje za bežiÄ?nu mrežu."
+
+#: ../src/connection-editor/nm-connection-editor.c:101
 #, c-format
 msgid "Editing %s"
 msgstr "UreÄ?ujem %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:105
 msgid "Editing un-named connection"
 msgstr "UreÄ?ujem neimenovanu vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:292
 msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet glade file was not found)."
-msgstr ""
-"Program za ureÄ?ivanje veza ne može da pronaÄ?e neke od potrebnih resursa (nije "
-"naÄ?ena glejd datoteka programÄ?eta â??Upravnik vezeâ??)."
-
-#: ../src/connection-editor/nm-connection-editor.c:300
-msgid ""
-"The connection editor could not find some required resources (the glade file "
+"The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "Program za ureÄ?ivanje veza ne može da pronaÄ?e neke od potrebnih resursa (nije "
-"naÄ?ena glejd datoteka)."
+"naÄ?ena â??.uiâ?? datoteka)."
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:395
 msgid "Error creating connection editor dialog."
 msgstr "GreÅ¡ka u obrazovanju prozorÄ?eta za ureÄ?ivanje veza."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
-msgid "Apply"
-msgstr "Primeni"
+#: ../src/connection-editor/nm-connection-editor.c:407
+msgid "_Save"
+msgstr "Sa_Ä?uvaj"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:408
 msgid "Save any changes made to this connection."
 msgstr "SaÄ?uvaj sve promene u ovoj vezi."
 
-#: ../src/connection-editor/nm-connection-editor.c:421
-msgid "Apply..."
-msgstr "Primeni..."
+#: ../src/connection-editor/nm-connection-editor.c:409
+msgid "_Save..."
+msgstr "SaÄ?u_vaj..."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Prijavite se kako bi saÄ?uvali ovu vezu za sve korisnike raÄ?unara."
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Available to all users"
 msgstr "Dostupno svim korisnicima"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connect _automatically"
 msgstr "_Sam se poveži"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "Ime _veze:"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "E_xport"
 msgstr "_Izvezi"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:11
 msgid "_Import"
 msgstr "_Uvezi"
 
-#: ../src/connection-editor/nm-connection-list.c:217
+#: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
 msgstr "nikad"
 
-#: ../src/connection-editor/nm-connection-list.c:228
-#: ../src/connection-editor/nm-connection-list.c:239
+#: ../src/connection-editor/nm-connection-list.c:227
+#: ../src/connection-editor/nm-connection-list.c:238
 msgid "now"
 msgstr "sad"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:246
+#: ../src/connection-editor/nm-connection-list.c:245
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -1932,7 +1909,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../src/connection-editor/nm-connection-list.c:250
+#: ../src/connection-editor/nm-connection-list.c:249
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -1941,7 +1918,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../src/connection-editor/nm-connection-list.c:262
+#: ../src/connection-editor/nm-connection-list.c:261
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1950,7 +1927,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../src/connection-editor/nm-connection-list.c:268
+#: ../src/connection-editor/nm-connection-list.c:267
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -1959,7 +1936,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../src/connection-editor/nm-connection-list.c:272
+#: ../src/connection-editor/nm-connection-list.c:271
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -1968,60 +1945,64 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godine"
 
-#: ../src/connection-editor/nm-connection-list.c:594
+#: ../src/connection-editor/nm-connection-list.c:486
 msgid "Connection add failed"
 msgstr "Nije uspelo dodavanje veze"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: ../src/connection-editor/nm-connection-list.c:515
+msgid "Error saving connection"
+msgstr "GreÅ¡ka prilikom Ä?uvanja veze"
+
+#: ../src/connection-editor/nm-connection-list.c:516
 #, c-format
-msgid "Error editing connection: property '%s' / '%s' invalid: %d"
-msgstr "GreÅ¡ka prilikom izmene veze: osobina â??%sâ?? / â??%sâ?? je neispravna: %d"
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "Svojstvo â??%sâ??/ â??%sâ?? je nevažeÄ?e: â??%dâ??"
 
-#: ../src/connection-editor/nm-connection-list.c:630
-#: ../src/connection-editor/nm-connection-list.c:745
+#: ../src/connection-editor/nm-connection-list.c:523
+#: ../src/connection-editor/nm-connection-list.c:642
 msgid "An unknown error occurred."
 msgstr "Došlo je do nepoznate greške."
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/connection-editor/nm-connection-list.c:786
+#: ../src/connection-editor/nm-connection-list.c:528
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "Error initializing editor"
 msgstr "GreÅ¡ka u pokretanju ureÄ?ivaÄ?a"
 
-#: ../src/connection-editor/nm-connection-list.c:651
-#: ../src/connection-editor/nm-connection-list.c:803
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:546
+#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:867
 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:660
+#: ../src/connection-editor/nm-connection-list.c:557
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:671
+#: ../src/connection-editor/nm-connection-list.c:569
 msgid "Could not edit new connection"
 msgstr "Ne mogu da uredim novu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:818
+#: ../src/connection-editor/nm-connection-list.c:714
 msgid "Could not edit connection"
 msgstr "Ne mogu da uredim vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:744
 msgid "Connection delete failed"
 msgstr "Ne mogu da obrišem vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:875
+#: ../src/connection-editor/nm-connection-list.c:776
 #, 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:1018
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/nm-connection-list.c:911
+#: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "Ne mogu da uvezem VPN vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
+#: ../src/connection-editor/nm-connection-list.c:913
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2031,51 +2012,87 @@ msgstr ""
 "\n"
 "Greška: nije izabrana vrsta VPN servisa."
 
-#: ../src/connection-editor/nm-connection-list.c:1033
+#: ../src/connection-editor/nm-connection-list.c:926
 msgid "Could not edit imported connection"
 msgstr "Ne mogu da izmenim uvezene veze"
 
-#: ../src/connection-editor/nm-connection-list.c:1167
+#: ../src/connection-editor/nm-connection-list.c:1069
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/connection-editor/nm-connection-list.c:1179
+#: ../src/connection-editor/nm-connection-list.c:1081
 msgid "Last Used"
 msgstr "Upotrbljena"
 
-#: ../src/connection-editor/nm-connection-list.c:1282
-msgid "Edit"
-msgstr "Izmeni"
+#: ../src/connection-editor/nm-connection-list.c:1197
+msgid "No VPN plugin available. Please install one to enable this button."
+msgstr ""
+"Nema dostupnih VPN dodataka. Molim instalirajte jedan da biste omoguÄ?ili ovo "
+"dugme."
+
+#: ../src/connection-editor/nm-connection-list.c:1208
+msgid "_Edit"
+msgstr "Ure_Ä?ivanje"
 
-#: ../src/connection-editor/nm-connection-list.c:1283
+#: ../src/connection-editor/nm-connection-list.c:1209
 msgid "Edit the selected connection"
 msgstr "UreÄ?uje podatke za izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1284
-msgid "Edit..."
-msgstr "Izmeni..."
+#: ../src/connection-editor/nm-connection-list.c:1210
+msgid "_Edit..."
+msgstr "Ure_di..."
 
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:1211
 msgid "Authenticate to edit the selected connection"
 msgstr "Prijavite se kako bi izmenili izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1299
-msgid "Delete"
-msgstr "Obriši"
+#: ../src/connection-editor/nm-connection-list.c:1226
+msgid "_Delete"
+msgstr "Iz_briši"
 
-#: ../src/connection-editor/nm-connection-list.c:1300
+#: ../src/connection-editor/nm-connection-list.c:1227
 msgid "Delete the selected connection"
 msgstr "Briše izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1301
-msgid "Delete..."
-msgstr "Obriši..."
+#: ../src/connection-editor/nm-connection-list.c:1228
+msgid "_Delete..."
+msgstr "Izbri_Å¡i..."
 
-#: ../src/connection-editor/nm-connection-list.c:1302
+#: ../src/connection-editor/nm-connection-list.c:1229
 msgid "Authenticate to delete the selected connection"
 msgstr "Prijavite se kako bi obrisali izabranu vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/nm-connection-list.c:1500
+#, fuzzy
+#| msgid "Error saving connection"
+msgid "Error creating connection"
+msgstr "GreÅ¡ka prilikom Ä?uvanja veze"
+
+#: ../src/connection-editor/nm-connection-list.c:1501
+#, fuzzy, c-format
+#| msgid "Could not create new connection"
+msgid "Don't know how to create '%s' connections"
+msgstr "Ne mogu da napravim novu vezu"
+
+#: ../src/connection-editor/nm-connection-list.c:1555
+#: ../src/connection-editor/nm-connection-list.c:1567
+#, fuzzy
+#| msgid "Error saving connection"
+msgid "Error editing connection"
+msgstr "GreÅ¡ka prilikom Ä?uvanja veze"
+
+#: ../src/connection-editor/nm-connection-list.c:1556
+#, fuzzy, c-format
+#| msgid "Could not edit connection"
+msgid "Don't know how to edit '%s' connections"
+msgstr "Ne mogu da uredim vezu"
+
+#: ../src/connection-editor/nm-connection-list.c:1568
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2088,29 +2105,29 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
+#: ../src/connection-editor/vpn-helpers.c:261
 msgid "Select file to import"
 msgstr "Izaberite datoteku za uvoz"
 
-#: ../src/connection-editor/vpn-helpers.c:310
+#: ../src/connection-editor/vpn-helpers.c:309
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "VeÄ? postoji datoteka â??%sâ??."
 
-#: ../src/connection-editor/vpn-helpers.c:312
+#: ../src/connection-editor/vpn-helpers.c:311
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:313
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Da li želite da zamenite %s VPN vezom pre Ä?uvanja?"
 
-#: ../src/connection-editor/vpn-helpers.c:350
+#: ../src/connection-editor/vpn-helpers.c:349
 msgid "Cannot export VPN connection"
 msgstr "Ne mogu da izvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:351
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2121,84 +2138,91 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
 msgstr "Izvezi VPN vezu..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
+#: ../src/gnome-bluetooth/bt-widget.c:218
+#, c-format
+msgid "Failed to create PAN connection: %s"
+msgstr "Nisam uspeo da napravim PAN vezu: %s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:223
+#: ../src/gnome-bluetooth/bt-widget.c:491
+msgid "Your phone is now ready to use!"
+msgstr "Vaš telefon je spreman za upotrebu!"
+
+#: ../src/gnome-bluetooth/bt-widget.c:247
 #, c-format
 msgid "%s Network"
 msgstr "%s mreža"
 
-#: ../src/gnome-bluetooth/bt-widget.c:322
+#: ../src/gnome-bluetooth/bt-widget.c:373
 #, c-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:441
+#: ../src/gnome-bluetooth/bt-widget.c:486
+#, c-format
+msgid "Failed to create DUN connection: %s"
+msgstr "Nisam uspeo da napravim DUN vezu: %s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:509
 msgid "Mobile wizard was canceled"
 msgstr "Ä?arobnjak za mobilne ureÄ?aje je otkazan"
 
-#: ../src/gnome-bluetooth/bt-widget.c:450
+#: ../src/gnome-bluetooth/bt-widget.c:518
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Nepoznat tip telefona (nije GSM ni CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "Vaš telefon je spreman za upotrebu!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
+#: ../src/gnome-bluetooth/bt-widget.c:712
+#: ../src/gnome-bluetooth/bt-widget.c:718
 msgid "failed to connect to the phone."
 msgstr "ne mogu da se povežem na telefon."
 
-#: ../src/gnome-bluetooth/bt-widget.c:687
+#: ../src/gnome-bluetooth/bt-widget.c:751
 msgid "unexpectedly disconnected from the phone."
 msgstr "neoÄ?ekivan prekid veze sa telefonom."
 
-#: ../src/gnome-bluetooth/bt-widget.c:696
+#: ../src/gnome-bluetooth/bt-widget.c:760
 msgid "timed out detecting phone details."
 msgstr "isteklo je vreme za nalaženje podataka o telefonu."
 
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "ne mogu da se povežem na sistemsku magistralu."
-
-#: ../src/gnome-bluetooth/bt-widget.c:716
+#: ../src/gnome-bluetooth/bt-widget.c:772
 msgid "Detecting phone configuration..."
 msgstr "Tražim podatke o telefonu..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:782
+#: ../src/gnome-bluetooth/bt-widget.c:838
 msgid "could not find the Bluetooth device."
 msgstr "ne mogu da naÄ?em Blutut ureÄ?aj."
 
-#: ../src/gnome-bluetooth/bt-widget.c:912
+#: ../src/gnome-bluetooth/bt-widget.c:971
 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:944
+#: ../src/gnome-bluetooth/bt-widget.c:1003
 #, 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:954
+#: ../src/gnome-bluetooth/bt-widget.c:1013
 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)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:963
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 #, 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:1014
+#: ../src/gnome-bluetooth/bt-widget.c:1085
 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:1023
+#: ../src/gnome-bluetooth/bt-widget.c:1094
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Pristupite Internetu preko mobilnog telefona (DUN)"
 
@@ -2222,76 +2246,80 @@ msgstr ""
 "Ovaj program nije namenjen za rad u komandnoj liniji, veÄ? je deo Gnom radnog "
 "okruženja."
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:57
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:61
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:63
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:65
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:67
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:69
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:71
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:104
+#: ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "ViMAH"
+
+#: ../src/mb-menu-item.c:109
 msgid "not enabled"
 msgstr "nije omoguÄ?eno"
 
-#: ../src/mb-menu-item.c:110
+#: ../src/mb-menu-item.c:115
 msgid "not registered"
 msgstr "nije registrovan"
 
-#: ../src/mb-menu-item.c:128
+#: ../src/mb-menu-item.c:133
 #, c-format
 msgid "Home network (%s)"
 msgstr "KuÄ?na mreža (%s)"
 
-#: ../src/mb-menu-item.c:130
+#: ../src/mb-menu-item.c:135
 #, c-format
 msgid "Home network"
 msgstr "KuÄ?na mreža"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 msgid "searching"
 msgstr "pretražujem"
 
-#: ../src/mb-menu-item.c:141
+#: ../src/mb-menu-item.c:146
 msgid "registration denied"
 msgstr "registracija je odbijena"
 
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roming)"
 
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
+#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roming)"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:162
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Mreža u romingu (%s)"
 
-#: ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:164
 #, c-format
 msgid "Roaming network"
 msgstr "Mreža u romingu"
@@ -2382,43 +2410,43 @@ msgstr "Ne mogu da naÄ?em izdavaÄ?a i želim da ga unesem _ruÄ?no:"
 msgid "Provider:"
 msgstr "IzdavaÄ?:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../src/utils/mobile-wizard.c:761
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Moj izdavaÄ? koristi GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../src/utils/mobile-wizard.c:767
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Moj izdavaÄ? koristi CDMA (1xRTT, EVDO)"
 
-#: ../src/utils/mobile-wizard.c:766
+#: ../src/utils/mobile-wizard.c:778
 msgid "Choose your Provider"
 msgstr "Izaberite izdavaÄ?a usluga"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
-msgstr "Spisak zemalja:"
-
 #: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "Zemlja"
+msgid "Country or Region List:"
+msgstr "Spisak država ili regiona:"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/utils/mobile-wizard.c:1036
+msgid "Country or region"
+msgstr "Država ili region"
+
+#: ../src/utils/mobile-wizard.c:1043
 msgid "My country is not listed"
 msgstr "Moja zemlja nije na spisku"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
-msgstr "Izaberite zemlju davaoca Internet usluga"
+#: ../src/utils/mobile-wizard.c:1089
+msgid "Choose your Provider's Country or Region"
+msgstr "Izaberite državu ili region vaÅ¡eg dostavljaÄ?a usluga"
 
-#: ../src/utils/mobile-wizard.c:1126
+#: ../src/utils/mobile-wizard.c:1143
 msgid "Installed GSM device"
 msgstr "Instaliran GSM ureÄ?aj"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/utils/mobile-wizard.c:1146
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS ureÄ?aj"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../src/utils/mobile-wizard.c:1314
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2426,121 +2454,98 @@ msgstr ""
 "Ovaj Ä?arobnjak Ä?e vam pomoÄ?i da lako podesite mobilnu Å¡irokopojasnu vezi sa "
 "3G mrežom."
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/utils/mobile-wizard.c:1319
 msgid "You will need the following information:"
 msgstr "Potrebni su vam sledeÄ?i podaci:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/utils/mobile-wizard.c:1330
 msgid "Your broadband provider's name"
 msgstr "Ime izdavaÄ?a Å¡irokopojasne usluge"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/utils/mobile-wizard.c:1336
 msgid "Your broadband billing plan name"
 msgstr "Ime Å¡irokopojasnog plana naplate"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../src/utils/mobile-wizard.c:1342
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(u nekim sluÄ?ajevima) VaÅ¡ plan Å¡irokopojasne naplate za APN (Access Point "
 "Name)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../src/utils/mobile-wizard.c:1369
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Napravi vezu za _ovaj mobilni, Å¡irokopojasni ureÄ?aj:"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/utils/mobile-wizard.c:1384
 msgid "Any device"
 msgstr "Bilo koji ureÄ?aj"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/utils/mobile-wizard.c:1397
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Podesi mobilnu, Å¡irokopojasnu vezu"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/utils/mobile-wizard.c:1561
 msgid "New Mobile Broadband Connection"
 msgstr "Nova mobilna, Å¡irokopojasna veza"
 
-#: ../src/utils/nmn-mobile-providers.c:76
+#: ../src/utils/nmn-mobile-providers.c:78
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../src/utils/nmn-mobile-providers.c:508
+#: ../src/utils/nmn-mobile-providers.c:510
 msgid "Default"
 msgstr "Podrazumevana"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:255
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "Ne mogu da uspostavim VPN vezu â??%sâ??"
-
-#: ../src/vpn-password-dialog.c:140
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"Ne mogu da naÄ?em prozorÄ?e za autentifikaciju za VPN veze tipa â??%sâ??. Javite "
-"se administratoru vašeg sistema."
-
-#: ../src/vpn-password-dialog.c:258
-#, c-format
-msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
-msgstr ""
-"DoÅ¡lo je do neprilike pri pokretanju prozorÄ?eta za autentifikaciju za VPN "
-"veze tipa â??%sâ??. Javite se administratoru vaÅ¡eg sistema."
-
-#: ../src/wired-dialog.c:99
+#: ../src/wired-dialog.c:97
 msgid "Wired 802.1X authentication"
 msgstr "ŽiÄ?ana 802.1X prijava"
 
-#: ../src/wireless-dialog.c:474
+#: ../src/wireless-dialog.c:454
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/wireless-dialog.c:1094
+#: ../src/wireless-dialog.c:1074
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/wireless-dialog.c:1175
+#: ../src/wireless-dialog.c:1152
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr ""
 "Potrebni su kljuÄ?evi za lozinke ili Å¡ifrovanje kako bi pristupili bežiÄ?noj "
 "mreži â??%sâ??."
 
-#: ../src/wireless-dialog.c:1177
+#: ../src/wireless-dialog.c:1154
 msgid "Wireless Network Authentication Required"
 msgstr "Potrebna je prijava na bežiÄ?nu mrežu"
 
-#: ../src/wireless-dialog.c:1179
+#: ../src/wireless-dialog.c:1156
 msgid "Authentication required by wireless network"
 msgstr "BežiÄ?nu mrežu zahteva prijavu"
 
-#: ../src/wireless-dialog.c:1184
+#: ../src/wireless-dialog.c:1161
 msgid "Create New Wireless Network"
 msgstr "Napravi novu bežiÄ?nu mrežu"
 
-#: ../src/wireless-dialog.c:1186
+#: ../src/wireless-dialog.c:1163
 msgid "New wireless network"
 msgstr "Nova bežiÄ?na mreža"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/wireless-dialog.c:1164
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Unesite naziv za novu bežiÄ?nu mrežu."
 
-#: ../src/wireless-dialog.c:1189
+#: ../src/wireless-dialog.c:1166
 msgid "Connect to Hidden Wireless Network"
 msgstr "Poveži se sa skrivenim bežiÄ?nim mrežama"
 
-#: ../src/wireless-dialog.c:1191
+#: ../src/wireless-dialog.c:1168
 msgid "Hidden wireless network"
 msgstr "Skrivena bežiÄ?na mreža"
 
-#: ../src/wireless-dialog.c:1192
+#: ../src/wireless-dialog.c:1169
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
@@ -2548,11 +2553,11 @@ msgstr ""
 "Unesite ime i bezbednosne podatke za skrivenu bežiÄ?nu mrežu na koju želite "
 "da se povežete."
 
-#: ../src/wireless-security/eap-method.c:227
+#: ../src/wireless-security/eap-method.c:279
 msgid "No Certificate Authority certificate chosen"
 msgstr "Nije izabran sertifikat ovlaÅ¡Ä?enja (CA)"
 
-#: ../src/wireless-security/eap-method.c:228
+#: ../src/wireless-security/eap-method.c:280
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2561,37 +2566,71 @@ msgstr ""
 "Ukoliko ne izaberete sertifikat ovlaÅ¡Ä?enja (CA) vaÅ¡a bežiÄ?na veza može biti "
 "nesigurna ili lažna.  Da li želite da izaberete sertifikat?"
 
-#: ../src/wireless-security/eap-method.c:237
+#: ../src/wireless-security/eap-method.c:289
 msgid "Choose CA Certificate"
 msgstr "Izaberite CA sertifikat"
 
-#: ../src/wireless-security/eap-method.c:552
+#: ../src/wireless-security/eap-method.c:627
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, ili PKCS#12 liÄ?ni kljuÄ?evi (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:555
+#: ../src/wireless-security/eap-method.c:630
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ili PEM sertifikati (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:261
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/wireless-security.c:368
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:277
+#: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:366
-#: ../src/wireless-security/eap-method-tls.c:457
-#: ../src/wireless-security/eap-method-ttls.c:365
+#: ../src/wireless-security/eap-method-peap.c:349
+#: ../src/wireless-security/eap-method-tls.c:419
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Izaberite sertifikat ovlaÅ¡Ä?enja (CA)..."
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "Anonimni _identitet:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "CA _sertifikat:"
+
+# ~Miloš
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "_Unutrašnja prijava:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+msgid "Version 0"
+msgstr "Izdanje 0"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "Izdanje 1"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "_PEAP izdanje:"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:1
+msgid "As_k for this password every time"
+msgstr "Uvek mi zatraži _lozinku"
+
+#: ../src/wireless-security/eap-method-tls.c:250
 msgid "Unencrypted private keys are insecure"
 msgstr "NeÅ¡ifrovani privatni kljuÄ?evi nisu sigurni"
 
-#: ../src/wireless-security/eap-method-tls.c:266
+#: ../src/wireless-security/eap-method-tls.c:253
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -2603,28 +2642,250 @@ msgstr ""
 "vaÅ¡e sigurnosne podatke.  Izaberite privatni kljuÄ? koji ze zaÅ¡tiÄ?en "
 "lozinkom.\n"
 "\n"
-"(Možete zaÅ¡tititi privatne kljuÄ?eve koristeÄ?i openssl)"
+"(Možete zaÅ¡tititi privatne kljuÄ?eve koristeÄ?i â??opensslâ??)"
 
-#: ../src/wireless-security/eap-method-tls.c:451
+#: ../src/wireless-security/eap-method-tls.c:413
 msgid "Choose your personal certificate..."
 msgstr "Izaberite liÄ?ni sertifikat..."
 
-#: ../src/wireless-security/eap-method-tls.c:463
+#: ../src/wireless-security/eap-method-tls.c:425
 msgid "Choose your private key..."
 msgstr "Izaberite liÄ?ni kljuÄ?..."
 
-#: ../src/wireless-security/wireless-security.c:329
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "I_dentity:"
+msgstr "_Identitet:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+msgid "Private _key:"
+msgstr "Privatni _kljuÄ?:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password:"
+msgstr "L_ozinka privatnog kljuÄ?a:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_User certificate:"
+msgstr "Ko_risnikov sertifikat:"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "Ne _upozoravaj me više"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "Ne"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/wireless-security/wireless-security.c:380
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:353
+#: ../src/wireless-security/wireless-security.c:404
 msgid "Tunneled TLS"
 msgstr "TLS kroz tunel"
 
-#: ../src/wireless-security/wireless-security.c:364
+#: ../src/wireless-security/wireless-security.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "ZaÅ¡tiÄ?eni EAP (PEAP)"
 
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+msgid "_Authentication:"
+msgstr "_Prijava:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (Osnovno)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Otvoreni sistem"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Deljeni kljuÄ?"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "Sho_w key"
+msgstr "P_rikaži kljuÄ?"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "WEP inde_x:"
+msgstr "VEP i_ndeks:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "_Key:"
+msgstr "_KljuÄ?:"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "VeÄ? je pokrenuto programÄ?e Upravnika mreže.\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "Ne mogu da dobijem %s servis. (%d)\n"
+
+#~ msgid "PUK code required"
+#~ msgstr "Potreban je PUK kod"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "Potreban je PUK kod za povezivanje mobilnog, Å¡irokopojasnog ureÄ?aja"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "Ništa"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Filip MiletiÄ?\n"
+#~ "Danilo Å egan\n"
+#~ "MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
+#~ "Prevod.org â?? prevod na srpski jezik."
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">Pokrenute mrežne veze</span>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "Automatski\n"
+#~ "Izdanje 0\n"
+#~ "Izdanje 1"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>Adrese</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+#~ msgstr ""
+#~ "Automatski\n"
+#~ "Automatski sa ruÄ?nim DNS podeÅ¡avanjem\n"
+#~ "RuÄ?no\n"
+#~ "Veži-lokalno\n"
+#~ "Podeli sa drugim raÄ?unarima"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "_Rute&#x2026;"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>Osnovno</b>"
+
+#~ msgid ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+#~ msgstr ""
+#~ "Bilo koja\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Najpre 3G (UMTS/HSPA)\n"
+#~ "Najpre 2G (GPRS/EDGE)"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Prijava</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>Eho</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+#~ msgstr ""
+#~ "Automatski\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+#~ msgstr ""
+#~ "Automatski\n"
+#~ "Obrnuti Par (TP)\n"
+#~ "SuÄ?elje prikaÄ?ive jedinica (AUI)\n"
+#~ "BNC\n"
+#~ "SiÄ?elje nezavisno od medija (MII)"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "Automatski\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "Program za ureÄ?ivanje veza ne može da pronaÄ?e neke od potrebnih resursa "
+#~ "(nije naÄ?ena glejd datoteka programÄ?eta â??Upravnik vezeâ??)."
+
+#~ msgid "Apply"
+#~ msgstr "Primeni"
+
+#~ msgid "Apply..."
+#~ msgstr "Primeni..."
+
+#~ msgid "could not connect to the system bus."
+#~ msgstr "ne mogu da se povežem na sistemsku magistralu."
+
+#~ msgid "Country"
+#~ msgstr "Zemlja"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "Ne mogu da uspostavim VPN vezu â??%sâ??"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "Ne mogu da naÄ?em prozorÄ?e za autentifikaciju za VPN veze tipa â??%sâ??. "
+#~ "Javite se administratoru vašeg sistema."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "DoÅ¡lo je do neprilike pri pokretanju prozorÄ?eta za autentifikaciju za VPN "
+#~ "veze tipa â??%sâ??. Javite se administratoru vaÅ¡eg sistema."
+
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue.\n"
@@ -2635,9 +2896,6 @@ msgstr "ZaÅ¡tiÄ?eni EAP (PEAP)"
 #~ msgid "Select A File"
 #~ msgstr "Izaberite datoteku"
 
-#~ msgid "_Routesâ?¦"
-#~ msgstr "_Ruteâ?¦"
-
 # Ne znam na Å¡ta se odnosi
 # ~Miloš
 #~ msgid "_Band:"