[network-manager-applet/nma-0-9-8] Updated Serbian translation
- From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/nma-0-9-8] Updated Serbian translation
- Date: Mon, 18 Feb 2013 18:59:19 +0000 (UTC)
commit 0cebf4ed081ca8ca4835e5c63f3d43946d57a069
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date: Mon Feb 18 20:00:53 2013 +0100
Updated Serbian translation
po/sr.po | 1526 ++++++++++++++++++++++++++++++++------------------------
po/sr latin po | 1526 ++++++++++++++++++++++++++++++++------------------------
2 files changed, 1750 insertions(+), 1302 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index e40e391..a78975f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the totem package.
# Maintainer: Filip Miletic
# ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>, 2010.
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011â2013.
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ";
"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-09 18:11+0000\n"
-"PO-Revision-Date: 2012-08-17 18:28+0200\n"
+"POT-Creation-Date: 2013-02-17 21:02+0000\n"
+"PO-Revision-Date: 2013-02-18 19:54+0200\n"
"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -74,9 +74,6 @@ msgid "Suppress networks available notifications"
msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐÐÑÑÐÐÐÑÐ Ð ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐÐÐ"
#: ../org.gnome.nm-applet.gschema.xml.in.h:8
-#| msgid ""
-#| "Set this to true to disable notifications when wireless networks are "
-#| "available."
msgid ""
"Set this to true to disable notifications when Wi-Fi networks are available."
msgstr ""
@@ -121,7 +118,6 @@ msgstr ""
"ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
-#| msgid "Wired 802.1X authentication"
msgid "802.1X authentication"
msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ 802.1X ÐÐÐÑ"
@@ -130,37 +126,37 @@ msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ 802.1X ÐÐÐÑ"
msgid "_Network name:"
msgstr "_ÐÐÐ ÐÑÐÐÐ:"
-#: ../src/applet.c:488
+#: ../src/applet.c:545
msgid "Failed to add/activate connection"
msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ/ÐÐÑÐÐÐÑÐÐ ÐÐÐÑ"
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
msgid "Unknown error"
msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-#: ../src/applet.c:493 ../src/applet.c:563 ../src/applet-device-wifi.c:1382
-#: ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
msgid "Connection failure"
msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
-#: ../src/applet.c:532
+#: ../src/applet.c:589
msgid "Device disconnect failed"
msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ ÑÑÐÑÐÑÐ"
-#: ../src/applet.c:537
+#: ../src/applet.c:594
msgid "Disconnect failure"
msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ"
-#: ../src/applet.c:558
+#: ../src/applet.c:615
msgid "Connection activation failed"
msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐÐÐ"
-#: ../src/applet.c:924 ../src/applet-device-wifi.c:1072
+#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
msgid "Don't show this message again"
msgstr "ÐÐ ÐÑÐÐÐÐÑÑ ÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑ"
-#: ../src/applet.c:1013
+#: ../src/applet.c:1075
#, c-format
msgid ""
"\n"
@@ -170,7 +166,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐ Ñ ÐÑÐÐÐ."
-#: ../src/applet.c:1016
+#: ../src/applet.c:1078
#, c-format
msgid ""
"\n"
@@ -179,7 +175,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÑÐÑÐÐÑÐ."
-#: ../src/applet.c:1019
+#: ../src/applet.c:1081
#, c-format
msgid ""
"\n"
@@ -190,7 +186,7 @@ msgstr ""
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÑÐÑ ÑÐ ÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐÑÑÑÐ "
"ÐÐÐÐÑÐÐÐÑÐ."
-#: ../src/applet.c:1022
+#: ../src/applet.c:1084
#, c-format
msgid ""
"\n"
@@ -199,7 +195,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÑÐÑ ÑÐ ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ."
-#: ../src/applet.c:1025
+#: ../src/applet.c:1087
#, c-format
msgid ""
"\n"
@@ -208,7 +204,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÑÐÑ ÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÑÐÐÑÑ ÐÐ ÐÑÐÐÐ."
-#: ../src/applet.c:1028
+#: ../src/applet.c:1090
#, c-format
msgid ""
"\n"
@@ -217,7 +213,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÐÐÑÐ ÑÑÐ ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÑÐÑÐÐÑ."
-#: ../src/applet.c:1031
+#: ../src/applet.c:1093
#, c-format
msgid ""
"\n"
@@ -226,7 +222,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÑÐÑ ÐÐ ÐÐÑÑÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ."
-#: ../src/applet.c:1034
+#: ../src/applet.c:1096
#, c-format
msgid ""
"\n"
@@ -235,7 +231,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ ÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐ."
-#: ../src/applet.c:1041
+#: ../src/applet.c:1103
#, c-format
msgid ""
"\n"
@@ -244,7 +240,7 @@ msgstr ""
"\n"
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑ â%sâ."
-#: ../src/applet.c:1059
+#: ../src/applet.c:1121
#, c-format
msgid ""
"\n"
@@ -254,7 +250,7 @@ msgstr ""
"\n"
"ÐÑÐÐÐÐÑÑÐ ÑÐ ÐÐÐ ÐÐÐÐ â%sâ ÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐ Ñ ÐÑÐÐÐ."
-#: ../src/applet.c:1062
+#: ../src/applet.c:1124
#, c-format
msgid ""
"\n"
@@ -263,7 +259,7 @@ msgstr ""
"\n"
"ÐÑÐÐÐÐÑÑÐ ÑÐ ÐÐÐ ÐÐÐÐ â%sâ ÐÐÐÐ ÐÑÐÑÑÑÐÐÐÑÐ ÐÐÐ ÑÐÑÐÐÑÐ."
-#: ../src/applet.c:1068
+#: ../src/applet.c:1130
#, c-format
msgid ""
"\n"
@@ -272,7 +268,7 @@ msgstr ""
"\n"
"ÐÐÐ ÐÐÐÐ â%sâ ÑÐ ÐÑÐÐÐÐÑÑÐ."
-#: ../src/applet.c:1098
+#: ../src/applet.c:1160
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -283,19 +279,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:1100
+#: ../src/applet.c:1162
msgid "VPN connection has been successfully established.\n"
msgstr "ÐÐÐ ÐÐÐÐ ÑÐ ÑÑÐÐÑÐÐ ÑÑÐÐÑÑÐÐÑÐÐÐ.\n"
-#: ../src/applet.c:1102
+#: ../src/applet.c:1164
msgid "VPN Login Message"
msgstr "ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÐÑÐÑÐÐÑ"
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
+#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
msgid "VPN Connection Failed"
msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ"
-#: ../src/applet.c:1173
+#: ../src/applet.c:1235
#, c-format
msgid ""
"\n"
@@ -309,7 +305,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1176
+#: ../src/applet.c:1238
#, c-format
msgid ""
"\n"
@@ -322,248 +318,235 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1496
+#: ../src/applet.c:1553
msgid "device not ready (firmware missing)"
msgstr "ÑÑÐÑÐÑ ÐÐÑÐ ÑÐÑÐÐÐÐ (ÐÐÐÐÑÑÐÑÐ ÑÐÑÐÐÐÑ)"
-#: ../src/applet.c:1498
+#: ../src/applet.c:1555
msgid "device not ready"
msgstr "ÑÑÐÑÐÑ ÐÐÑÐ ÑÐÑÐÐÐÐ"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1508 ../src/applet-device-ethernet.c:232
+#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
msgid "disconnected"
msgstr "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
-#: ../src/applet.c:1524
+#: ../src/applet.c:1581
msgid "Disconnect"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑ"
-#: ../src/applet.c:1538
+#: ../src/applet.c:1595
msgid "device not managed"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÐÐÑÐÐ ÑÑÐÑÐÑÐÐ"
-#: ../src/applet.c:1582
+#: ../src/applet.c:1639
msgid "No network devices available"
msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÑÐÐÐÐ ÑÑÐÑÐÑ"
-#: ../src/applet.c:1670
+#: ../src/applet.c:1727
msgid "_VPN Connections"
msgstr "_ÐÐÐ ÐÐÐÐ"
-#: ../src/applet.c:1727
+#: ../src/applet.c:1784
msgid "_Configure VPN..."
msgstr "ÐÐ_ÐÐÑÐ ÐÐÐ..."
-#: ../src/applet.c:1731
+#: ../src/applet.c:1788
msgid "_Disconnect VPN"
msgstr "_ÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÑ"
-#: ../src/applet.c:1825
+#: ../src/applet.c:1882
msgid "NetworkManager is not running..."
msgstr "ÐÐÑÐÐÑÐÑ ÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑ..."
-#: ../src/applet.c:1830 ../src/applet.c:2631
+#: ../src/applet.c:1887 ../src/applet.c:2739
msgid "Networking disabled"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÐ"
#. 'Enable Networking' item
-#: ../src/applet.c:2051
+#: ../src/applet.c:2108
msgid "Enable _Networking"
msgstr "ÐÐÑÑÑÐ _ÐÑÐÐÐÐ ÑÑÐÑÐÐ"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2060
-#| msgid "Enable _Wireless"
+#: ../src/applet.c:2117
msgid "Enable _Wi-Fi"
msgstr "ÐÐÑÑÑÐ _ÐÐÐÐÑÐÐ ÐÑÐÐÐÑÐ"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
+#: ../src/applet.c:2126
msgid "Enable _Mobile Broadband"
msgstr "ÐÐÐÐÑÑÐ _ÐÐÐÐÐÐÐ ÐÐÐÐ"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
+#: ../src/applet.c:2135
msgid "Enable WiMA_X Mobile Broadband"
msgstr "ÐÐÐÐÑ_ÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÑ"
#. Toggle notifications item
-#: ../src/applet.c:2089
+#: ../src/applet.c:2146
msgid "Enable N_otifications"
msgstr "_ÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐÑÐ"
#. 'Connection Information' item
-#: ../src/applet.c:2100
+#: ../src/applet.c:2157
msgid "Connection _Information"
msgstr "ÐÐÐÐ_ÑÐ Ð ÐÐÐÐ"
#. 'Edit Connections...' item
-#: ../src/applet.c:2110
+#: ../src/applet.c:2167
msgid "Edit Connections..."
msgstr "ÐÑÐÐÐ ÐÐÐÐ..."
#. Help item
-#: ../src/applet.c:2124
+#: ../src/applet.c:2181
msgid "_Help"
msgstr "ÐÐ_ÐÐÑ"
#. About item
-#: ../src/applet.c:2133
+#: ../src/applet.c:2190
msgid "_About"
msgstr "_Ð ÐÑÐÐÑÐÐÑ"
-#: ../src/applet.c:2310
+#: ../src/applet.c:2368
msgid "Disconnected"
msgstr "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
-#: ../src/applet.c:2311
+#: ../src/applet.c:2369
msgid "The network connection has been disconnected."
msgstr "ÐÑÐÐÐÐ ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ."
-#: ../src/applet.c:2494
+#: ../src/applet.c:2602
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "ÐÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐÐÑ â%sâ..."
-#: ../src/applet.c:2497
+#: ../src/applet.c:2605
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐ â%sâ..."
-#: ../src/applet.c:2500 ../src/applet-device-bt.c:239
-#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
-#: ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÑ ÐÐ â%sâ..."
-#: ../src/applet.c:2503
+#: ../src/applet.c:2611
#, c-format
msgid "Network connection '%s' active"
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐ â%sâ"
-#: ../src/applet.c:2586
+#: ../src/applet.c:2694
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "ÐÑÐÐÑÑÐÐÑÐÐ ÐÐÐ ÐÐÐÑ â%sâ..."
-#: ../src/applet.c:2589
+#: ../src/applet.c:2697
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐ â%sâ..."
-#: ../src/applet.c:2592
+#: ../src/applet.c:2700
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÑ ÐÐ â%sâ..."
-#: ../src/applet.c:2595
+#: ../src/applet.c:2703
#, c-format
msgid "VPN connection '%s' active"
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐ ÐÐÐÐ â%sâ"
-#: ../src/applet.c:2636
+#: ../src/applet.c:2744
msgid "No network connection"
msgstr "ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐ"
-#: ../src/applet.c:3336
+#: ../src/applet.c:3445
msgid "NetworkManager Applet"
msgstr "ÐÑÐÐÑÐÐÑÐ ÑÐÑÐÐÐÐÐÐ ÐÑÐÐÐ"
-#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
msgid "Available"
msgstr "ÐÐÑÑÑÐÐÐ"
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
+#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
#, c-format
msgid "You are now connected to '%s'."
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ â%sâ."
-#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
+#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
msgid "Connection Established"
msgstr "ÐÐÐÐ ÑÑÐÐÑÑÐÐÑÐÐÐ"
-#: ../src/applet-device-bt.c:204
+#: ../src/applet-device-bt.c:200
msgid "You are now connected to the mobile broadband network."
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐ."
-#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:606
#, c-format
msgid "Preparing mobile broadband connection '%s'..."
msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑ, ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ â%sâ..."
-#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:609
#, c-format
msgid "Configuring mobile broadband connection '%s'..."
msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑ, ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ â%sâ..."
-#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:612
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÑ ÐÑÐÐÐ â%sâ..."
-#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÐÐÐ â%sâ"
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "ÐÐÐÐ"
-
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐ (%s)"
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/new-connection.c:85
-#: ../src/connection-editor/page-mobile.c:379
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "ÐÐÐÐÐÐÐ"
#. Default connection item
-#: ../src/applet-device-cdma.c:409
+#: ../src/applet-device-cdma.c:316
msgid "New Mobile Broadband (CDMA) connection..."
msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ (ÐÐÐÐ) ÐÐÐÐ..."
-#: ../src/applet-device-cdma.c:443
+#: ../src/applet-device-cdma.c:350
msgid "You are now connected to the CDMA network."
msgstr "ÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÑÐÐÑ."
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ â%sâ: (%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "ÑÐÐÐÐÐ"
-
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
msgid "CDMA network."
msgstr "ÐÐÐÐ ÐÑÐÐÐ."
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
+#: ../src/applet-device-gsm.c:677
msgid "You are now registered on the home network."
msgstr "ÐÐÐÐ ÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÑÐÑ ÐÑÐÐÑ."
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
+#: ../src/applet-device-gsm.c:683
msgid "You are now registered on a roaming network."
msgstr "ÐÐÐÐ ÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÑÐ."
@@ -571,201 +554,122 @@ msgstr "ÐÐÐÐ ÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÑÐÐÐÑÐ
msgid "Auto Ethernet"
msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÑÐÐÐ ÐÐÐÐ"
-#: ../src/applet-device-ethernet.c:205
+#: ../src/applet-device-ethernet.c:202
#, c-format
-#| msgid "Wired Networks (%s)"
msgid "Ethernet Networks (%s)"
msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐ (%s)"
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:204
#, c-format
-#| msgid "Wired Network (%s)"
msgid "Ethernet Network (%s)"
msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐ (%s)"
-#: ../src/applet-device-ethernet.c:210
-#| msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:207
msgid "Ethernet Networks"
msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐ"
-#: ../src/applet-device-ethernet.c:212
-#| msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:209
msgid "Ethernet Network"
msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐ"
-#: ../src/applet-device-ethernet.c:274
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:271
msgid "You are now connected to the ethernet network."
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÑÐÐÑ ÐÑÐÐÑ."
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:297
#, c-format
-#| msgid "Preparing wired network connection '%s'..."
msgid "Preparing ethernet network connection '%s'..."
msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÐÑ ÐÑÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÑ â%sâ..."
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:300
#, c-format
-#| msgid "Configuring wired network connection '%s'..."
msgid "Configuring ethernet network connection '%s'..."
msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÑÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÑ â%sâ..."
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:303
#, c-format
-#| msgid "User authentication required for wired network connection '%s'..."
msgid "User authentication required for ethernet network connection '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐ â%sâ..."
-#: ../src/applet-device-ethernet.c:309
+#: ../src/applet-device-ethernet.c:306
#, c-format
-#| msgid "Requesting a wired network address for '%s'..."
msgid "Requesting an ethernet network address for '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÑ ÐÐ ÐÐÑÐÐÑ ÐÑÐÐÑ â%sâ..."
-#: ../src/applet-device-ethernet.c:313
+#: ../src/applet-device-ethernet.c:310
#, c-format
-#| msgid "Wired network connection '%s' active"
msgid "Ethernet network connection '%s' active"
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÑÐÐÐ ÐÐÐÐ â%sâ"
-#: ../src/applet-device-ethernet.c:494
+#: ../src/applet-device-ethernet.c:491
msgid "DSL authentication"
msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÐ-Ð"
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:702
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "ÐÐÐ"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐ..."
-
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐ ÐÑÐÐÑ."
-
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐ ÐÃÐ"
-
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÑÑÐÑÐÑÐ"
-
-#: ../src/applet-device-gsm.c:781
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "ÐÐÐ ÐÐÐ ÐÐ ÐÐÐ ÐÐÑÑÐÑÑ â%sâ ÐÐ â%sâ"
+#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
+msgid "Wrong PUK code; please contact your provider."
+msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐ, ÐÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐÐ ÐÑÐÐÐÑÐÐÑÐ."
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
msgid "Wrong PIN code; please contact your provider."
msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐ, ÐÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐÐ ÐÑÐÐÐÑÐÐÑÐ."
-#: ../src/applet-device-gsm.c:896
-msgid "Wrong PUK code; please contact your provider."
-msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐ, ÐÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐÐ ÐÑÐÐÐÑÐÐÑÐ."
-
#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:923
+#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
msgid "Sending unlock code..."
msgstr "ÐÐÑÐÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐÐÑÐ..."
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
-
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
-
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ â%sâ ÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐ."
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "ÐÐÐ ÐÃÐ:"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÐÃÐ"
-
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
-
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
-
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ â%sâ ÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ ÐÃÐ."
-
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "ÐÐÐ ÐÃÐ:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:780
+#| msgid "New Mobile Broadband Connection"
+msgid "New Mobile Broadband connection..."
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÐÐÐ..."
+
+#: ../src/applet-device-broadband.c:816
+#| msgid "You are now connected to the mobile broadband network."
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐ."
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "ÐÐÐÐ ÐÐÐ ÐÃÐ:"
+#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
+#| msgid "Mobile broadband network password"
+msgid "Mobile Broadband network."
+msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐ."
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐ ÐÃÐ:"
+#. Default connection item
+#: ../src/applet-device-gsm.c:370
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐ..."
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐ/ÐÐÐ ÐÃÐÐÐÐ"
+#: ../src/applet-device-gsm.c:404
+msgid "You are now connected to the GSM network."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐ ÐÑÐÐÑ."
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
msgid "GSM network."
msgstr "ÐÐÐ ÐÑÐÐÐ."
-#: ../src/applet-device-wifi.c:97
-#| msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:98
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐ _ÑÐÑÐÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ..."
-#: ../src/applet-device-wifi.c:148
-#| msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:149
msgid "Create _New Wi-Fi Network..."
msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ..."
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:293
msgid "(none)"
msgstr "(ÐÐÑÑÐ)"
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:787
#, c-format
-#| msgid "Wired Networks (%s)"
msgid "Wi-Fi Networks (%s)"
msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:789
#, c-format
-#| msgid "Wired Network (%s)"
msgid "Wi-Fi Network (%s)"
msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
-#: ../src/applet-device-wifi.c:794
-#| msgid "Wired Network"
+#: ../src/applet-device-wifi.c:791
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
@@ -773,109 +677,107 @@ msgstr[1] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
msgstr[2] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
msgstr[3] "ÐÐÑÐÐÐ ÐÑÐÐÐ"
-#: ../src/applet-device-wifi.c:827
-#| msgid "WiMAX is disabled"
+#: ../src/applet-device-wifi.c:824
msgid "Wi-Fi is disabled"
msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
-#: ../src/applet-device-wifi.c:828
-#| msgid "WiMAX is disabled by hardware switch"
+#: ../src/applet-device-wifi.c:825
msgid "Wi-Fi is disabled by hardware switch"
msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÑÐÐ"
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:886
msgid "More networks"
msgstr "ÐÐÑ ÐÑÐÐÐ"
# bug: no plural forms
-#: ../src/applet-device-wifi.c:1068
-#| msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1065
msgid "Wi-Fi Networks Available"
msgstr "ÐÐÑÑÑÐÐÐ ÑÑ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-#: ../src/applet-device-wifi.c:1069
-#| msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1066
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1260
#, c-format
-#| msgid "You are now connected to the wireless network '%s'."
msgid "You are now connected to the Wi-Fi network '%s'."
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ â%sâ."
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1291
#, c-format
-#| msgid "Preparing network connection '%s'..."
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÐÑ ÐÐÐÑ â%sâ..."
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1294
#, c-format
-#| msgid "Configuring wired network connection '%s'..."
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ â%sâ..."
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1297
#, c-format
-#| msgid "User authentication required for wireless network '%s'..."
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%sâ..."
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1300
#, c-format
-#| msgid "Requesting a network address for '%s'..."
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÑ ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÐÐ â%sâ..."
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-wifi.c:1321
#, c-format
-#| msgid "Wireless network connection '%s' active: %s (%d%%)"
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%sâ : %s (%d%%)"
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-wifi.c:1326
#, c-format
-#| msgid "Wired network connection '%s' active"
msgid "Wi-Fi network connection '%s' active"
msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%sâ"
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1374
msgid "Failed to activate connection"
msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑ"
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1393
msgid "Failed to add new connection"
msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÑ ÐÐÐÑ"
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wimax.c:227
#, c-format
msgid "WiMAX Mobile Broadband (%s)"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ (%s)"
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
msgid "WiMAX Mobile Broadband"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ"
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
msgid "WiMAX is disabled"
msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
msgid "WiMAX is disabled by hardware switch"
msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÑÐÐ"
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
msgid "You are now connected to the WiMAX network."
msgstr "ÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐÐÑ."
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ â%sâ: (%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
+msgid "roaming"
+msgstr "ÑÐÐÐÐÐ"
+
#: ../src/applet-dialogs.c:57
msgid "Error displaying connection information:"
msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÐÐ:"
#: ../src/applet-dialogs.c:109
#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:929
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
#: ../src/wireless-security/wireless-security.c:406
msgid "LEAP"
msgstr "ÐÐÐÐ"
@@ -894,7 +796,7 @@ msgid "WEP"
msgstr "ÐÐÐ"
#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:886
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
msgctxt "Wifi/wired security"
msgid "None"
msgstr "ÐÐÑÑÐ"
@@ -956,6 +858,7 @@ msgstr "ÐÐÐÐÐÐ (%s)"
#. --- General ---
#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:345
msgid "General"
msgstr "ÐÐÑÑÐ"
@@ -1062,7 +965,7 @@ msgstr "ÐÐÐ ÐÐÐÐÑ:"
msgid "Base Connection:"
msgstr "ÐÐÐÐ ÐÑÐÐÐÐ:"
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
msgid "Unknown"
msgstr "ÐÐÐÐÐÐÐÑÐ"
@@ -1107,6 +1010,68 @@ msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ â%
msgid "Password:"
msgstr "ÐÐÐÐÐÐÐ:"
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
+
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ â%sâ ÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐ."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "ÐÐÐ ÐÃÐ:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÐÃÐ"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
+
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐ ÐÐÐ"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ â%sâ ÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ ÐÃÐ."
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "ÐÐÐ ÐÃÐ:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "ÐÐÐÐ ÐÐÐ ÐÃÐ:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐ ÐÃÐ:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐ/ÐÐÐ ÐÃÐÐÐÐ"
+
#: ../src/connection-editor/ce-ip4-routes.ui.h:1
#: ../src/connection-editor/ce-ip6-routes.ui.h:1
#: ../src/connection-editor/ce-page-ip4.ui.h:8
@@ -1167,16 +1132,160 @@ msgstr ""
msgid "Createâ"
msgstr "ÐÐÐÑÐÐÐâ"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "ÐÐÐÐÐ ÑÐÐÐÑÐÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "ÐÐÑÐÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#| msgid "Broadcast Address:"
+msgid "Broadcast"
+msgstr "ÐÐÐÑÐÐÐÑÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ÐÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "ÐÐÐ (ÐÑÐÐÐÑÑÑÐÐÐ)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#| msgid "EAP"
+msgid "ARP"
+msgstr "ÐÐÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#| msgid "Base Connection:"
+msgid "Bonded _connections:"
+msgstr "ÐÑÐÐÐÐÐÐÐ _ÐÐÐÐ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#| msgid "M_ode:"
+msgid "_Mode:"
+msgstr "_ÐÐÐÐÐ:"
+
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "_Edit"
+msgstr "_ÐÑÐÑÐÐÐÑÐ"
+
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "_Delete"
+msgstr "_ÐÐÑÐÑÐ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr "ÐÑÐÑÑÐÐÐÑÑ _ÐÑÐÑÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr "ms"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#| msgid "Interface:"
+msgid "_Interface name:"
+msgstr "_ÐÑÐÑÐÑ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr "_ÐÑÐÑÐÑÐ ÐÐÐÐ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr "ÐÐÐ _ÐÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
+"ÐÐ ÐÐÑÐÑÐ, ÐÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐÐÐÑ ÐÐ ÐÐÑÐÑÐ, ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÑÐÐÐÐÐ "
+"ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐ ÐÐÐÐ."
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr "ÐÐÑÑÐÑ _ÐÐÐÐÐÐÐÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr "ÐÐÑÑÐÑ _ÑÐÐÐÐÐÐÐÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr "ÐÑÐÑÐÐ _ÐÑÑÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#| msgid "S_ecurity:"
+msgid "_Priority:"
+msgstr "_ÐÐÐÐÐÑÑ:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#| msgid "_Transport mode:"
+msgid "_Hairpin mode:"
+msgstr "_ÐÐÐÐÐ ÑÐÐÑÐÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#| msgid "Base Connection:"
+msgid "Bridged _connections:"
+msgstr "ÐÑÐÐÐÑÑÐÐÐ _ÐÐÐÐ:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr "ÐÐÑÑÐÑ _ÐÑÐÑÐÐÑÐÐÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr "_ÐÑÐÐÐ ÐÐÐÐÑÐÐÐ:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "s"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr "ÐÐÑÑÑÐ _ÐÐÐ (ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÐÑÐÐÑÐ)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr "_ÐÐÑÐÐÑÐ ÐÑÐÐÐ:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr "ÐÑÐÐÐ _ÑÑÐÑÐÑÐ:"
+
#: ../src/connection-editor/ce-page.c:72
msgid "automatic"
msgstr "ÐÑÑÐÐÐÑÑÐÐ"
-#: ../src/connection-editor/ce-page.c:288
+#: ../src/connection-editor/ce-page.c:356
msgid "Failed to update connection secrets due to an unknown error."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÑÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
#: ../src/wireless-security/eap-method-leap.ui.h:1
#: ../src/wireless-security/eap-method-simple.ui.h:1
#: ../src/wireless-security/ws-leap.ui.h:1
@@ -1197,7 +1306,7 @@ msgid "Sho_w password"
msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÐÐÐÑ"
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
@@ -1286,16 +1395,35 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:17
#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
#: ../src/connection-editor/ce-page-wifi.ui.h:7
msgid "_MTU:"
msgstr "_ÐÐÐ:"
#: ../src/connection-editor/ce-page-ethernet.ui.h:18
#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
#: ../src/connection-editor/ce-page-wifi.ui.h:6
msgid "bytes"
msgstr "ÐÐÑÑÐ"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ _ÐÐÐ ÐÐÐÐ ÐÐÑÐÑÑÐÑ ÐÐÑ ÐÐÐÑ"
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#| msgid "You are now connected to the WiMAX network."
+msgid "All _users may connect to this network"
+msgstr "ÐÐÐ _ÐÐÑÐÑÐÐÑÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÑ ÐÐ ÐÐÑ ÐÑÐÐÑ"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "_Automatically connect to this network when it is available"
+msgstr "_ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÑÐÐÑ ÐÐÐÐ ÑÐ ÐÐÑÑÑÐÐÐ"
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+msgstr "ÐÐÐÐÑÑ _ÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ:"
+
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
msgid "_Transport mode:"
msgstr "ÐÐÐÐÐ _ÐÑÐÐÐÑÐ:"
@@ -1440,43 +1568,52 @@ msgid "Prefer 2G (GPRS/EDGE)"
msgstr "ÐÐÑÐÑÐ 2Ð (ÐÐÐÐ/ÐÐÐÐ)"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#| msgid "Prefer 3G (UMTS/HSPA)"
+msgid "Prefer 4G (LTE)"
+msgstr "ÐÐÑÐÑÐ 4Ð (ÐÐÐ)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr "ÐÐÐÐ 4Ð (ÐÐÐ)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
msgid "Basic"
msgstr "ÐÑÐÐÐÐo"
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
msgid "Nu_mber:"
msgstr "_ÐÑÐÑ:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
msgid "Advanced"
msgstr "ÐÐÐÑÐÐÐÐ"
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
msgid "_APN:"
msgstr "_ÐÐÐ:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
msgid "N_etwork ID:"
msgstr "_ÐÐ ÐÑÐÐÐ:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type:"
msgstr "_ÐÑÑÑÐ:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
msgid "Change..."
msgstr "ÐÐÐÐÐÐ..."
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
msgid "P_IN:"
msgstr "_ÐÐÐ:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
msgid "Allow _roaming if home network is not available"
msgstr "ÐÐÐÐÐÐÐ _ÑÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐ"
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
msgid "Sho_w passwords"
msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÐÐÐÐ"
@@ -1528,6 +1665,34 @@ msgstr "ÐÑÐ"
msgid "Send PPP _echo packets"
msgstr "ÐÐÑÐ ÐÐÐ _ÐÑÐ ÐÐÐÐÑÐ"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#| msgid "Interface:"
+msgid "_Parent interface:"
+msgstr "_ÐÐÐÐÑÐÑÑÐÐ ÑÑÐÑÐÑ:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr "ÐÐÐÐÐ _ÐÐÐÐ ÑÑÐÑÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#| msgid "C_loned MAC address:"
+msgid "_Cloned MAC address:"
+msgstr "_ÐÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "_ÐÐ ÐÐÐÐ-Ð:"
+
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr "ÐÐÐÐÐ ÑÑÐÑÐÑÐ + ÐÑÐÑ"
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number
together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr "âÐÐÐÐâ + ÐÑÐÑ"
+
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
msgid "S_ecurity:"
msgstr "Ð_ÐÐÐÐÐÐÐÑÑ:"
@@ -1565,35 +1730,24 @@ msgid "_Rate:"
msgstr "_ÐÑÐÑÐÐ:"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-#| msgid ""
-#| "This option locks this connection to the wireless access point (AP) "
-#| "specified by the BSSID entered here. Example: 00:11:22:33:44:55"
-msgid ""
-"This option locks this connection to the Wi-Fi access point (AP) specified "
-"by the BSSID entered here. Example: 00:11:22:33:44:55"
-msgstr ""
-"ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÑÑÐ ÐÐÑ ÐÐÐÑ ÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÑÐÐ (ÐÐ) ÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÐ "
-"ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐ-ÐÐ. ÐÐÑ: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "_BSSID:"
msgstr "_ÐÐÐÐÐ:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "C_hannel:"
msgstr "_ÐÐÐÐÐ:"
# ÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ, Ð?
# ~ÐÐÐÐÑ
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
msgid "Ban_d:"
msgstr "_ÐÐÑÐÐ:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
msgid "M_ode:"
msgstr "_ÐÐÐÐÐ:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
msgid "SS_ID:"
msgstr "ÐÐ_ÐÐ:"
@@ -1651,80 +1805,130 @@ msgstr ""
"Ð ÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐ, ÐÐÐ ÑÐÑÐÐÑÐ ÐÐÐÐÐÑÐÑÐ ÑÐ ÐÐÐÑÐÐÑÐ ÑÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ "
"ÐÐÐÐÑÐÑÐÑÐ. ÐÐÐ ÐÐÐÐ ÐÐ ÑÑÐÐ, ÐÐÐÑÑÐÑÑÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐÑÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐÐÐ."
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
msgid "Address"
msgstr "ÐÐÑÐÑÐ"
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
msgid "Netmask"
msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐ"
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
msgid "Gateway"
msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐ"
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
msgid "Metric"
msgstr "ÐÐÑÑÐÑÐÐ"
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
msgid "Prefix"
msgstr "ÐÑÐÑÐÐÑ"
-#: ../src/connection-editor/new-connection.c:75
-#: ../src/connection-editor/page-ethernet.c:273
-#| msgid "Auto Ethernet"
+#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Ethernet"
msgstr "ÐÐÑÐÐÐ ÐÐÐÐ"
-#: ../src/connection-editor/new-connection.c:80
-#: ../src/connection-editor/page-wifi.c:462
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Wi-Fi"
msgstr "ÐÐÐÐÑÐÐ"
-#: ../src/connection-editor/new-connection.c:90
-#: ../src/connection-editor/page-wimax.c:157 ../src/mb-menu-item.c:73
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
msgid "WiMAX"
msgstr "ÐÐÐÐÐÐ"
-#: ../src/connection-editor/new-connection.c:95
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
msgid "DSL"
msgstr "ÐÐÐ"
-#: ../src/connection-editor/new-connection.c:100
-#: ../src/connection-editor/page-infiniband.c:189
+#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
msgid "InfiniBand"
msgstr "ÐÐÑÐÐÐ ÐÐÐÐ"
-#: ../src/connection-editor/new-connection.c:112
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
+msgid "Bond"
+msgstr "ÐÐÐÐ"
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+msgid "Bridge"
+msgstr "ÐÐÑÑ"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
+msgid "VLAN"
+msgstr "ÐÐÐÐ"
+
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "ÐÐÐ"
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/new-connection.c:252
+#| msgid "Hardware Address:"
+msgid "Hardware"
+msgstr "ÐÐÑÐÐÐÑ"
+
+#: ../src/connection-editor/new-connection.c:272
+msgid "Virtual"
+msgstr "ÐÐÑÑÑÐÐÐÐ"
+
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
msgid "Import a saved VPN configuration..."
msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ..."
-#: ../src/connection-editor/nm-connection-editor.c:106
+#: ../src/connection-editor/new-connection.c:371
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÑ ÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
+
+#: ../src/connection-editor/new-connection.c:380
+msgid "Could not create new connection"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐÐÑ"
+
+#: ../src/connection-editor/new-connection.c:515
+msgid "Connection delete failed"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑ"
+
+#: ../src/connection-editor/new-connection.c:562
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÐÐÐÑ %s?"
+
+#: ../src/connection-editor/nm-connection-editor.c:118
#, c-format
msgid "Editing %s"
msgstr "ÐÑÐÑÑÑÐÐ %s"
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: ../src/connection-editor/nm-connection-editor.c:122
msgid "Editing un-named connection"
msgstr "ÐÑÐÑÑÑÐÐ ÐÐÐÐÐÐÐÐÐÐÑ ÐÐÐÑ"
-#: ../src/connection-editor/nm-connection-editor.c:297
+#: ../src/connection-editor/nm-connection-editor.c:282
msgid ""
"The connection editor could not find some required resources (the .ui file "
"was not found)."
@@ -1732,53 +1936,72 @@ msgstr ""
"ÐÑÐÐÑÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÐÑ ÑÐÑÑÑÑÐ (ÐÐÑÐ "
"ÐÐÑÐÐÐ â.uiâ ÐÐÑÐÑÐÐÐ)."
-#: ../src/connection-editor/nm-connection-editor.c:401
-msgid "Error creating connection editor dialog."
-msgstr "ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐÐÐÑÑ ÐÑÐÐÐÑÑÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÐ."
-
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:408
msgid "_Save"
msgstr "_ÐÐÑÑÐÐÑ"
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:409
msgid "Save any changes made to this connection."
msgstr "ÐÐÑÑÐÐÑ ÑÐÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÑ ÐÐÐÐ."
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:410
msgid "_Save..."
msgstr "_ÐÐÑÑÐÐÑ..."
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:411
msgid "Authenticate to save this connection for all users of this machine."
msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑ ÐÐÐÑ ÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÑÐ."
+#: ../src/connection-editor/nm-connection-editor.c:427
+#| msgid "Could not create new connection"
+msgid "Could not create connection"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ"
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+msgid "Could not edit connection"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐ ÐÐÐÑ"
+
+#: ../src/connection-editor/nm-connection-editor.c:429
+#| msgid "Error creating connection editor dialog."
+msgid "Unknown error creating connection editor dialog."
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÑÐÐÑÐÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÐ."
+
+#: ../src/connection-editor/nm-connection-editor.c:536
+msgid "Error saving connection"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐ ÐÐÐÐ"
+
+#: ../src/connection-editor/nm-connection-editor.c:537
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "ÐÐÐÑÑÑÐÐ â%sâ/ â%sâ ÑÐ ÐÐÐÐÐÐÑÐ: â%dâ"
+
+#: ../src/connection-editor/nm-connection-editor.c:631
+msgid "Error initializing editor"
+msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÑÐÑÐÑÑ ÑÑÐÑÐÐÐÑÐ"
+
+#: ../src/connection-editor/nm-connection-editor.c:952
+msgid "Connection add failed"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
+
#: ../src/connection-editor/nm-connection-editor.ui.h:2
msgid "Connection _name:"
msgstr "ÐÐÐ _ÐÐÐÐ:"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connect _automatically"
-msgstr "_ÐÐÐ ÑÐ ÐÐÐÐÐÐ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "A_vailable to all users"
-msgstr "_ÐÐÑÑÑÐÐÐ ÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
msgid "_Export..."
msgstr "_ÐÐÐÐÐÐ..."
-#: ../src/connection-editor/nm-connection-list.c:169
+#: ../src/connection-editor/nm-connection-list.c:143
msgid "never"
msgstr "ÐÐÐÐÐ"
-#: ../src/connection-editor/nm-connection-list.c:180
-#: ../src/connection-editor/nm-connection-list.c:191
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
msgid "now"
msgstr "ÑÐÐÐ"
#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:172
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
@@ -1787,7 +2010,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÑÑÐ"
msgstr[2] "ÐÑÐ %d ÐÐÐÑÑÐ"
msgstr[3] "ÐÑÐ %d ÐÐÐÑÑ"
-#: ../src/connection-editor/nm-connection-list.c:202
+#: ../src/connection-editor/nm-connection-list.c:176
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
@@ -1796,7 +2019,7 @@ msgstr[1] "ÐÑÐ %d ÑÐÑÐ"
msgstr[2] "ÐÑÐ %d ÑÐÑÐ"
msgstr[3] "ÐÑÐ %d ÑÐÑ"
-#: ../src/connection-editor/nm-connection-list.c:214
+#: ../src/connection-editor/nm-connection-list.c:188
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -1805,7 +2028,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐ"
msgstr[2] "ÐÑÐ %d ÐÐÐÐ"
msgstr[3] "ÐÑÐ %d ÐÐÐ"
-#: ../src/connection-editor/nm-connection-list.c:220
+#: ../src/connection-editor/nm-connection-list.c:194
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
@@ -1814,7 +2037,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÑÐÑÐ"
msgstr[2] "ÐÑÐ %d ÐÐÑÐÑÐ"
msgstr[3] "ÐÑÐ %d ÐÐÑÐÑ"
-#: ../src/connection-editor/nm-connection-list.c:224
+#: ../src/connection-editor/nm-connection-list.c:198
#, c-format
msgid "%d year ago"
msgid_plural "%d years ago"
@@ -1823,142 +2046,114 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐÐÐ"
msgstr[2] "ÐÑÐ %d ÐÐÐÐÐÐ"
msgstr[3] "ÐÑÐ %d ÐÐÐÐÐÐ"
-#: ../src/connection-editor/nm-connection-list.c:443
-msgid "Connection add failed"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
-
-#: ../src/connection-editor/nm-connection-list.c:472
-msgid "Error saving connection"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐ ÐÐÐÐ"
-
-#: ../src/connection-editor/nm-connection-list.c:473
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ÐÐÐÑÑÑÐÐ â%sâ/ â%sâ ÑÐ ÐÐÐÐÐÐÑÐ: â%dâ"
-
-#: ../src/connection-editor/nm-connection-list.c:480
-#: ../src/connection-editor/nm-connection-list.c:598
-msgid "An unknown error occurred."
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
-
-#: ../src/connection-editor/nm-connection-list.c:485
-#: ../src/connection-editor/nm-connection-list.c:638
-msgid "Error initializing editor"
-msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÑÐÑÐÑÑ ÑÑÐÑÐÐÐÑÐ"
-
-#: ../src/connection-editor/nm-connection-list.c:503
-#: ../src/connection-editor/nm-connection-list.c:655
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÑ ÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
-
-#: ../src/connection-editor/nm-connection-list.c:512
-msgid "Could not create new connection"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐÐÑ"
-
-#: ../src/connection-editor/nm-connection-list.c:524
-msgid "Could not edit new connection"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐ ÐÐÐÑ ÐÐÐÑ"
-
-#: ../src/connection-editor/nm-connection-list.c:669
-msgid "Could not edit connection"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐ ÐÐÐÑ"
-
-#: ../src/connection-editor/nm-connection-list.c:699
-msgid "Connection delete failed"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑ"
-
-#: ../src/connection-editor/nm-connection-list.c:731
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÐÐÐÑ %s?"
-
-#: ../src/connection-editor/nm-connection-list.c:972
+#: ../src/connection-editor/nm-connection-list.c:631
msgid "Name"
msgstr "ÐÐÐÐÐ"
-#: ../src/connection-editor/nm-connection-list.c:985
+#: ../src/connection-editor/nm-connection-list.c:644
msgid "Last Used"
msgstr "ÐÐÐÑÑÐÑÐÐÐ"
-#. Edit
-#: ../src/connection-editor/nm-connection-list.c:1026
-msgid "_Edit"
-msgstr "_ÐÑÐÑÐÐÐÑÐ"
-
-#: ../src/connection-editor/nm-connection-list.c:1027
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "Edit the selected connection"
msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÐÐÐÑ"
-#: ../src/connection-editor/nm-connection-list.c:1028
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "_Edit..."
msgstr "_ÐÑÐÐÐ..."
-#: ../src/connection-editor/nm-connection-list.c:1029
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "Authenticate to edit the selected connection"
msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÐÑ"
-#. Delete
-#: ../src/connection-editor/nm-connection-list.c:1043
-msgid "_Delete"
-msgstr "_ÐÐÑÐÑÐ"
-
-#: ../src/connection-editor/nm-connection-list.c:1044
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "Delete the selected connection"
msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÐÑ"
-#: ../src/connection-editor/nm-connection-list.c:1045
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "_Delete..."
msgstr "_ÐÐÑÐÑÐ..."
-#: ../src/connection-editor/nm-connection-list.c:1046
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "Authenticate to delete the selected connection"
msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÐÑ"
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:942
msgid "Error creating connection"
msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐ"
-#: ../src/connection-editor/nm-connection-list.c:1286
+#: ../src/connection-editor/nm-connection-list.c:943
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "ÐÐ ÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÐÐÑ"
-#: ../src/connection-editor/nm-connection-list.c:1341
+#: ../src/connection-editor/nm-connection-list.c:998
msgid "Error editing connection"
msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÐ"
-#: ../src/connection-editor/nm-connection-list.c:1342
+#: ../src/connection-editor/nm-connection-list.c:999
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "ÐÐÑÐÐ ÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐ ÐÐÐÐ â%sâ"
-#: ../src/connection-editor/page-8021x-security.c:119
+#: ../src/connection-editor/page-8021x-security.c:121
msgid "802.1x Security"
msgstr "ÐÐÐÐÐÐÐÐÑÑ 802.1x"
-#: ../src/connection-editor/page-8021x-security.c:121
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-8021x-security.c:123
msgid "Could not load 802.1x Security user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ 802.1x."
-#: ../src/connection-editor/page-8021x-security.c:139
+#: ../src/connection-editor/page-8021x-security.c:141
msgid "Use 802.1_X security for this connection"
msgstr "ÐÐÑÐÑÑÐ 802.1_X ÐÐÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑ ÐÐÐÑ"
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-bond.c:422
+#| msgid "Could not load DSL user interface."
+msgid "Could not load bond user interface."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÑÐÐÐÐ."
+
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
+#| msgid "InfiniBand connection %d"
+msgid "Bond connection %d"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ %d"
+
+#: ../src/connection-editor/page-bridge.c:214
+#| msgid "Could not load Wi-Fi user interface."
+msgid "Could not load bridge user interface."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐÑÑÐ."
+
+#: ../src/connection-editor/page-bridge.c:309
+#, c-format
+#| msgid "Wi-Fi connection %d"
+msgid "Bridge connection %d"
+msgstr "ÐÐÐÐ ÐÐÑÑÐ %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr "ÐÑÐÐÑÑÑÐÐÐ ÐÐÑÑÐ"
+
+#: ../src/connection-editor/page-bridge-port.c:117
+#| msgid "Could not load ethernet user interface."
+msgid "Could not load bridge port user interface."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÑÐÐÑÑÑÐÐÐÐ ÐÐÑÑÐ."
+
+#: ../src/connection-editor/page-dsl.c:143
msgid "Could not load DSL user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ DSL."
-#: ../src/connection-editor/page-dsl.c:233
+#: ../src/connection-editor/page-dsl.c:235
#, c-format
msgid "DSL connection %d"
msgstr "ÐÐÐ ÐÐÐÐ â%dâ"
-#: ../src/connection-editor/page-ethernet.c:89
+#: ../src/connection-editor/page-ethernet.c:90
#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wifi.c:113
#: ../src/connection-editor/page-wimax.c:70
msgid ""
"This option locks this connection to the network device specified by its "
@@ -1967,22 +2162,46 @@ msgstr ""
"ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÑÑÑÐÐÐ ÐÐÐÑ ÑÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÑÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÐÐ ÑÑÐÑÐÐÐ ÐÐÐ "
"ÐÐÑÐÑÐÐ. ÐÐÑ: 00:11:22:33:44:55"
-#: ../src/connection-editor/page-ethernet.c:275
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-ethernet.c:253
msgid "Could not load ethernet user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÑÐÐÑ ÐÑÐÐÑ."
-#: ../src/connection-editor/page-ethernet.c:451
+#: ../src/connection-editor/page-ethernet.c:396
#, c-format
-#| msgid "Wired connection %d"
msgid "Ethernet connection %d"
msgstr "ÐÐÑÐÐÐ ÐÐÐÐ %d"
-#: ../src/connection-editor/page-infiniband.c:192
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:59
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+
+#: ../src/connection-editor/page-general.c:60
+msgid ""
+"The zone defines the trust level of the connection. Default is not a regular "
+"zone, selecting it results in the use of the default zone set in the "
+"firewall. Only usable if firewalld is active."
+msgstr ""
+"ÐÐÐÐÑÑ ÐÐÑÐÑÑÑÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐÑÑÐ ÐÐÐÐ. ÐÐÐÐÑÐ ÐÐÑÐ ÑÐÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑ, ÑÐÐÐ "
+"ÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÑÐÐÐÐÑ ÐÐÑÐÑÐÑÐ. ÐÐÐÐ "
+"ÑÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÑÐÐÑÑ ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ (firewalld)."
+
+#: ../src/connection-editor/page-general.c:61
+#| msgid "NetworkManager is not running..."
+msgid "FirewallD is not running."
+msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑ."
+
+#: ../src/connection-editor/page-general.c:348
+#| msgid "Could not load ethernet user interface."
+msgid "Could not load General user interface."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ."
+
+#: ../src/connection-editor/page-infiniband.c:171
msgid "Could not load InfiniBand user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐÐ."
-#: ../src/connection-editor/page-infiniband.c:317
+#: ../src/connection-editor/page-infiniband.c:263
#, c-format
msgid "InfiniBand connection %d"
msgstr "ÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐ %d"
@@ -2044,16 +2263,16 @@ msgstr "ÐÐÐÐÑÐÐ _ÐÐÐ ÑÐÑÐÐÑÐ:"
msgid "Additional s_earch domains:"
msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐÐ _ÐÑÐÑÑÐÐÐ:"
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "ÐÑÐÑÑÑÐÐ ÐÐÐ4 ÑÑÑÐ ÐÐ %s"
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1011
msgid "IPv4 Settings"
msgstr "ÐÐÐ4 ÐÐÐÐÑÐÐÐÑÐ"
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1013
msgid "Could not load IPv4 user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐ4 ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ."
@@ -2070,33 +2289,38 @@ msgstr "ÐÐÐÐÐÐÑÐ"
msgid "Automatic, DHCP only"
msgstr "ÐÑÑÐÐÐÑÑÐÐ, ÑÐÐÐ ÐÐÐÐ"
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "ÐÑÐÑÑÑÐÐ ÐÐÐ6 ÑÑÑÐ ÐÐ %s"
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:975
msgid "IPv6 Settings"
msgstr "ÐÐÐ6 ÐÐÐÐÑÐÐÐÑÐ"
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:977
msgid "Could not load IPv6 user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐ6 ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ."
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr "%s ÐÐÐÐÐÐÐ %d"
+
+#: ../src/connection-editor/page-mobile.c:391
msgid "Could not load mobile broadband user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑ, ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÑÐÐÑ."
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:408
msgid "Unsupported mobile broadband connection type."
msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÑÑÑÐ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐ."
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:642
+#: ../src/connection-editor/page-mobile.c:658
msgid "Select Mobile Broadband Provider Type"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÑÑÑ ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑÐ"
-#: ../src/connection-editor/page-mobile.c:677
+#: ../src/connection-editor/page-mobile.c:693
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
@@ -2104,14 +2328,24 @@ msgstr ""
"ÐÐÐÐÐÑÐÑÐ ÑÐÑÐÐÐÐÐÐÑÑ ÐÐÑÑ ÐÐÑÐÑÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÐÑ "
"ÑÑÐÑÐÐ. ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÑÐÐÑÑÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÐ."
-#: ../src/connection-editor/page-mobile.c:682
+#: ../src/connection-editor/page-mobile.c:698
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐ _ÐÐÐ ÑÐÑÐÐÐÐÐÐÑÐ (ÐÐÑ. ÐÐÐÐ, ÐÐÐÐ, ÐÐÐÐ, ÐÐÐÐÐ)"
-#: ../src/connection-editor/page-mobile.c:689
+#: ../src/connection-editor/page-mobile.c:705
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐ Ð_ÐÐÐ ÑÐÑÐÐÐÐÐÐÑÐ (ÐÐÑ. 1xÐÐÐ, ÐÐÐÐ)"
+#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:268
+msgid "CDMA"
+msgstr "ÐÐÐÐ"
+
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:266
+msgid "GSM"
+msgstr "ÐÐÐ"
+
#: ../src/connection-editor/page-ppp.c:134
msgid "EAP"
msgstr "ÐÐÐ"
@@ -2148,30 +2382,41 @@ msgstr "ÐÐÑÑÐ"
msgid "Editing PPP authentication methods for %s"
msgstr "ÐÑÐÑÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ %s"
-#: ../src/connection-editor/page-ppp.c:282
+#: ../src/connection-editor/page-ppp.c:284
msgid "PPP Settings"
msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ"
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:286
msgid "Could not load PPP user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ."
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/page-vlan.c:482
+#| msgid "Could not load IPv4 user interface."
+msgid "Could not load vlan user interface."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐÐÐ-Ð."
+
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+#| msgid "VPN connection %d"
+msgid "VLAN connection %d"
+msgstr "ÐÐÐÐ ÐÐÐÐ %d"
+
+#: ../src/connection-editor/page-vpn.c:115
msgid "Could not load VPN user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ."
-#: ../src/connection-editor/page-vpn.c:128
+#: ../src/connection-editor/page-vpn.c:130
#, c-format
msgid "Could not find VPN plugin service for '%s'."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÑÑÐÑÐÑ ÐÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ â%sâ."
-#: ../src/connection-editor/page-vpn.c:222
-#: ../src/connection-editor/page-vpn.c:305
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
#, c-format
msgid "VPN connection %d"
msgstr "ÐÐÐ ÐÐÐÐ %d"
-#: ../src/connection-editor/page-vpn.c:248
+#: ../src/connection-editor/page-vpn.c:250
msgid ""
"The VPN plugin failed to import the VPN connection correctly\n"
"\n"
@@ -2181,11 +2426,11 @@ msgstr ""
"\n"
"ÐÑÐÑÐÐ: ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÑÑÐ ÐÐÐ ÑÐÑÐÐÑÐ."
-#: ../src/connection-editor/page-vpn.c:273
+#: ../src/connection-editor/page-vpn.c:275
msgid "Choose a VPN Connection Type"
msgstr "ÐÐÐÐÑ ÐÑÑÑÐ ÐÐÐ ÐÐÐÐ"
-#: ../src/connection-editor/page-vpn.c:274
+#: ../src/connection-editor/page-vpn.c:276
msgid ""
"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 "
@@ -2195,83 +2440,84 @@ msgstr ""
"ÐÑÑÑÐ ÐÐÐ ÐÐÐÐ ÐÐÑÑ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÐÑ, ÐÐÐÐÐ ÐÐÐÐÑÐ "
"ÐÐÑÑÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐ ÐÑÐÐÑÑÑÐÐ."
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:98
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here. Example: 00:11:22:33:44:55"
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÑÑÐ ÐÐÑ ÐÐÐÑ ÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÑÐÐ (ÐÐ) ÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÐ "
+"ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐ-ÐÐ. ÐÐÑ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
#, c-format
msgid "default"
msgstr "ÐÑÐÐÐÐÐ"
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:219
#, c-format
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:464
-#| msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:473
msgid "Could not load Wi-Fi user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ."
-#: ../src/connection-editor/page-wifi.c:669
+#: ../src/connection-editor/page-wifi.c:650
#, c-format
-#| msgid "WiMAX connection %d"
msgid "Wi-Fi connection %d"
msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ %d"
#: ../src/connection-editor/page-wifi-security.c:265
-#| msgctxt "Wifi/wired security"
-#| msgid "None"
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "ÐÐÑÑÐ"
#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:903
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "ÐÐÐ 40/128-ÐÐÑÐÐ ÐÑÑÑ"
#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:912
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
msgid "WEP 128-bit Passphrase"
msgstr "ÐÐÐ 128-ÐÐÑÐÐ ÐÐÐÐÐÐÐ"
#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:942
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
msgid "Dynamic WEP (802.1x)"
msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐ (802.1x)"
#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:956
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
msgid "WPA & WPA2 Personal"
msgstr "ÐÐÑÐÐ ÐÐÐ & ÐÐÐ2"
#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:970
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
msgid "WPA & WPA2 Enterprise"
msgstr "ÐÐÑÐÐÐÐÐ ÐÐÐ & ÐÐÐ2"
-#: ../src/connection-editor/page-wifi-security.c:395
-#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:396
msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
msgstr ""
"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ; ÐÐÐÐÑÑÐÑÑ "
"ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ."
-#: ../src/connection-editor/page-wifi-security.c:405
-#| msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:407
msgid "Wi-Fi Security"
msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑ"
-#: ../src/connection-editor/page-wifi-security.c:407
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:409
msgid "Could not load Wi-Fi security user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ."
-#: ../src/connection-editor/page-wimax.c:160
+#: ../src/connection-editor/page-wimax.c:137
msgid "Could not load WiMAX user interface."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐ."
-#: ../src/connection-editor/page-wimax.c:289
+#: ../src/connection-editor/page-wimax.c:233
#, c-format
msgid "WiMAX connection %d"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐ %d"
@@ -2340,18 +2586,14 @@ msgstr ""
#: ../src/gnome-bluetooth/bt-widget.c:321
#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
msgid ""
"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÑÑÐ (ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ Ð-ÑÐÐÐÑÐÐÑÑ: (%"
-"s) %s)."
+"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÑÑÐ (ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ Ð-ÑÐÐÐÑÐÐÑÑ: "
+"(%s) %s)."
#: ../src/gnome-bluetooth/bt-widget.c:330
#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
msgid ""
"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
msgstr ""
@@ -2365,63 +2607,68 @@ msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐ
msgid "Access the Internet using your mobile phone (DUN)"
msgstr "ÐÑÐÑÑÑÐÐÑÐ ÐÐÑÐÑÐÐÑÑ ÐÑÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐ (ÐÐÐ)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
#, c-format
msgid "Error: %s"
msgstr "ÐÑÐÑÐÐ: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
#, c-format
msgid "Failed to create DUN connection: %s"
msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:959
msgid "Your phone is now ready to use!"
msgstr "ÐÐÑ ÑÐÐÐÑÐÐ ÑÐ ÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÑÐÐÑ!"
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
msgid "Mobile wizard was canceled"
msgstr "ÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
msgid "Unknown phone device type (not GSM or CDMA)"
msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐ ÑÐÐÐÑÐÐÐ (ÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐ)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
msgid "unknown modem type."
msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÐ."
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
msgid "failed to connect to the phone."
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐ."
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
msgid "unexpectedly disconnected from the phone."
msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐÐ."
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
msgid "timed out detecting phone details."
msgstr "ÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÑÐÐÐÑÐÐÑ."
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:791
msgid "Detecting phone configuration..."
msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÐÐÑÐÐÑ..."
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:823
+#| msgid "Error editing connection"
+msgid "error getting bus connection"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÐÑÐÐÑÐ"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:920
msgid ""
"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
"Networking connection."
msgstr ""
"ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÑÑÑ ÑÑÐÑÐÑ ÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ-ÐÐ ÐÐÐÐ."
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
#, c-format
msgid "Failed to create PAN connection: %s"
msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:978
#, c-format
msgid "%s Network"
msgstr "%s ÐÑÐÐÐ"
@@ -2442,27 +2689,27 @@ msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐ"
msgid "Active Network Connections"
msgstr "ÐÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
msgid ""
"Your mobile broadband connection is configured with the following settings:"
msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐ ÑÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÑÐÐÐ:"
#. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
msgid "Your Device:"
msgstr "ÐÐÑ ÑÑÐÑÐÑ:"
#. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
msgid "Your Provider:"
msgstr "ÐÐÑ ÐÐÐÐÑÐÐÑ:"
#. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:236
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
msgid "Your Plan:"
msgstr "ÐÐÑ ÐÐÐÐ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
msgid ""
"A connection will now be made to your mobile broadband provider using the "
"settings you selected. If the connection fails or you cannot access network "
@@ -2475,23 +2722,23 @@ msgstr ""
"ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑ, ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ. ÐÐ ÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐÑÐ, "
"ÐÐÐÐÐÑÐÑÐ âÐÐÐÐ ÑÐ ÐÑÐÐÐÐâ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐ >> ÐÐÑÑÐÐÐÐ."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:273
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
msgid "Confirm Mobile Broadband Settings"
msgstr "ÐÐÑÐÑÐÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:337
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
msgid "Unlisted"
msgstr "ÐÐÐÐÐÐÑÑÐÐÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:492
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
msgid "_Select your plan:"
msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
msgid "Selected plan _APN (Access Point Name):"
msgstr "ÐÐÐÐÑÐÐÐ _ÐÐÐ ÐÐÐÐ (ÐÐÐÐÐ ÑÐÑÐÐ ÐÑÐÑÑÑÐÐ):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:540
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
"broadband account or may prevent connectivity.\n"
@@ -2504,67 +2751,67 @@ msgstr ""
"ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐ ÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ "
"ÐÐÑÐÑÐÐÑ ÑÑÐÑÐÐ."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:547
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
msgid "Choose your Billing Plan"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐÐÑÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:596
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
msgid "My plan is not listed..."
msgstr "ÐÐÑ ÐÐÐÐ ÐÐÑÐ ÐÐ ÑÐÐÑÐÑ..."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
msgid "Select your provider from a _list:"
msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÑÐÑÐÐ ÐÐ _ÑÐÐÑÐÐ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:766
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
msgid "Provider"
msgstr "ÐÐÑÑÐÐÑÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐÑÐ Ð ÐÐÐÐÐ ÐÐ ÐÐ ÑÐÐÑÐÐ _ÑÑÑÐÐ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
msgid "Provider:"
msgstr "ÐÐÐÐÐÐÑ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐ (ÐÐÐÐ, ÐÐÐÐ, ÐÐÐÐ, ÐÐÐÐ)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:832
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÐ (1xÐÐÐ, ÐÐÐÐ)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:843
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
msgid "Choose your Provider"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÑÑÐÑÐÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
msgid "Country or Region List:"
msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÐÐÐ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
msgid "Country or region"
msgstr "ÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÐÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
msgid "My country is not listed"
msgstr "ÐÐÑÐ ÐÐÐÑÐ ÐÐÑÐ ÐÐ ÑÐÐÑÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
msgid "Choose your Provider's Country or Region"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÑ ÐÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ ÐÐÑÑÐÐÑÐÑÐ ÑÑÐÑÐÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
msgid "Installed GSM device"
msgstr "ÐÐÑÑÐÐÐÑÐÐ ÐÐÐ ÑÑÐÑÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
msgid "Installed CDMA device"
msgstr "ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐ ÑÑÐÑÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
@@ -2572,97 +2819,120 @@ msgstr ""
"ÐÐÐÑ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÐ ÑÐ "
"3Ð ÐÑÐÐÐÐ."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
msgid "You will need the following information:"
msgstr "ÐÐÑÑÐÐÐÐ ÑÑ ÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
msgid "Your broadband provider's name"
msgstr "ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Your broadband billing plan name"
msgstr "ÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÑÐ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr ""
"(Ñ ÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÐÐ) ÐÐÑ ÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÐ (ÐÐÐÐÐ ÑÐÑÐÐ "
"ÐÑÐÑÑÑÐÐ)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1447
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
msgid "Create a connection for _this mobile broadband device:"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐ _ÐÐÐÑ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÑÑÐÑÐÑ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
msgid "Any device"
msgstr "ÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
msgid "Set up a Mobile Broadband Connection"
msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÑ, ÑÐÑÐÐÐÐÐÑÐÑÐÑ ÐÐÐÑ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
msgid "New Mobile Broadband Connection"
msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐ, ÑÐÑÐÐÐÐÐÑÐÑÐÐ ÐÐÐÐ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:438
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+msgid "Wired"
+msgstr "ÐÐÑÐÐÐ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr "ÐÐÑÑÑÑ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "ADSL"
+msgstr "ÐÐÐÐ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:405
+msgid "PCI"
+msgstr "ÐÐÐ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:407
+msgid "USB"
+msgstr "ÐÐÐ"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
msgid "New..."
msgstr "ÐÐÐÐ..."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
msgid "C_reate"
msgstr "_ÐÐÐÑÐÐÐ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
#, c-format
-#| msgid ""
-#| "Passwords or encryption keys are required to access the wireless network "
-#| "'%s'."
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr ""
"ÐÐÑÑÐÐÐÐ ÑÑ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÑÑÐÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÑÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÑÐÐÐ â%sâ."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
-#| msgid "Wireless Network Authentication Required"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
msgid "Wi-Fi Network Authentication Required"
msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
-#| msgid "Authentication required by wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
msgid "Authentication required by Wi-Fi network"
msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
-#| msgid "Create New Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
msgid "Create New Wi-Fi Network"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
-#| msgid "New wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
msgid "New Wi-Fi network"
msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
-#| msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
-#| msgid "Connect to Hidden Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
msgid "Connect to Hidden Wi-Fi Network"
msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐ ÑÐÑÐÐÐÐÑ ÐÐÐÐÑÐÑ ÐÑÐÐÑ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
-#| msgid "Hidden wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Hidden Wi-Fi network"
msgstr "ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
-#| msgid ""
-#| "Enter the name and security details of the hidden wireless network you "
-#| "wish to connect to."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
msgid ""
"Enter the name and security details of the hidden Wi-Fi network you wish to "
"connect to."
@@ -2671,7 +2941,6 @@ msgstr ""
"ÐÐ ÑÐ ÐÐÐÐÐÐÑÐ."
#: ../src/libnm-gtk/wifi.ui.h:2
-#| msgid "Wireless _security:"
msgid "Wi-Fi _security:"
msgstr "ÐÐÐÐÑÐÐ _ÐÐÐÐÐÐÐÐÑÑ:"
@@ -2680,7 +2949,6 @@ msgid "C_onnection:"
msgstr "_ÐÐÐÐ:"
#: ../src/libnm-gtk/wifi.ui.h:5
-#| msgid "Wireless _adapter:"
msgid "Wi-Fi _adapter:"
msgstr "ÐÐÐÐÑÐÐ _ÑÑÐÑÐÑ:"
@@ -2704,88 +2972,105 @@ msgstr ""
"ÐÐÐÑ ÐÑÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐ Ñ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐ, ÐÐÑ ÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ "
"ÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐ."
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
msgid "EVDO"
msgstr "ÐÐÐÐ"
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
msgid "GPRS"
msgstr "ÐÐÐÐ"
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
msgid "EDGE"
msgstr "ÐÐÐÐ"
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
msgid "UMTS"
msgstr "ÐÐÐÐ"
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
msgid "HSDPA"
msgstr "ÐÐÐÐÐ"
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
msgid "HSUPA"
msgstr "ÐÐÐÐÐ"
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
msgid "HSPA"
msgstr "ÐÐÐÐ"
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:72
+#| msgid "HSPA"
+msgid "HSPA+"
+msgstr "ÐÐÐÐ+"
+
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr "ÐÐÐ"
+
+#: ../src/mb-menu-item.c:112
msgid "not enabled"
msgstr "ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ"
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
msgid "not registered"
msgstr "ÐÐÑÐ ÑÐÐÐÑÑÑÐÐÐÐ"
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
#, c-format
msgid "Home network (%s)"
msgstr "ÐÑÑÐÐ ÐÑÐÐÐ (%s)"
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
#, c-format
msgid "Home network"
msgstr "ÐÑÑÐÐ ÐÑÐÐÐ"
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
msgid "searching"
msgstr "ÐÑÐÑÑÐÐÑÑÐÐ"
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
msgid "registration denied"
msgstr "ÑÐÐÐÑÑÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ"
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
#, c-format
msgid "%s (%s roaming)"
msgstr "%s (%s ÑÐÐÐÐÐ)"
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
#, c-format
msgid "%s (roaming)"
msgstr "%s (ÑÐÐÐÐÐ)"
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
#, c-format
msgid "Roaming network (%s)"
msgstr "ÐÑÐÐÐ Ñ ÑÐÐÐÐÐÑ (%s)"
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
#, c-format
msgid "Roaming network"
msgstr "ÐÑÐÐÐ Ñ ÑÐÐÐÐÐÑ"
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+#: ../src/mobile-helpers.c:297
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "ÐÐÐ ÐÐÐ ÐÐ ÐÐÐ ÐÐÑÑÐÑÑ â%sâ ÐÐ â%sâ"
+
+#: ../src/mobile-helpers.c:471
+msgid "PIN code required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐ ÐÃÐ"
+
+#: ../src/mobile-helpers.c:479
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÑÐÐÐ ÑÑÐÑÐÑÐ"
#. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:174
#, c-format
-#| msgid "Base Connection:"
msgid "%s connection"
msgstr "%s ÐÐÐÐ"
@@ -2794,10 +3079,6 @@ msgid "No Certificate Authority certificate chosen"
msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
#: ../src/wireless-security/eap-method.c:276
-#| msgid ""
-#| "Not using a Certificate Authority (CA) certificate can result in "
-#| "connections to insecure, rogue wireless networks. Would you like to "
-#| "choose a Certificate Authority certificate?"
msgid ""
"Not using a Certificate Authority (CA) certificate can result in connections "
"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate "
@@ -2874,7 +3155,7 @@ msgid "MD5"
msgstr "ÐÐ5"
#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
#: ../src/wireless-security/eap-method-ttls.c:350
msgid "Choose a Certificate Authority certificate..."
msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ..."
@@ -2901,11 +3182,11 @@ msgstr "ÐÐÐÐ _ÐÐÐÐÑÐ:"
msgid "As_k for this password every time"
msgstr "ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐ _ÐÐÐÐÐÐÑ"
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
msgid "Unencrypted private keys are insecure"
msgstr "ÐÐÑÐÑÑÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÑÑÑÐÐÐ ÐÐÑÑ ÑÐÐÑÑÐÐ"
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
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 "
@@ -2919,11 +3200,11 @@ msgstr ""
"\n"
"(ÐÐÐÐÑÐ ÐÐÑÑÐÑÐÑÐ ÐÑÐÐÐÑÐÐ ÐÑÑÑÐÐÐ ÐÐÑÐÑÑÐÑÐ âopensslâ)"
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
msgid "Choose your personal certificate..."
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÑÐÐÑÐÑÐ..."
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
msgid "Choose your private key..."
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÑÑÑ..."
@@ -3012,60 +3293,3 @@ msgstr "Ð_ÑÐÐÐÐÐ ÐÑÑÑ"
#: ../src/wireless-security/ws-wep-key.ui.h:10
msgid "WEP inde_x:"
msgstr "ÐÐÐ Ð_ÐÐÐÐÑ:"
-
-# bug: no plural forms
-#~ msgid "Wireless Networks (%s)"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
-
-# bug: no plural forms
-#~ msgid "Wireless Network (%s)"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ (%s)"
-
-# bug: no plural forms
-#~ msgid "Wireless Network"
-#~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-#~ msgstr[1] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-#~ msgstr[2] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-#~ msgstr[3] "ÐÐÐÐÑÐÐ ÐÑÐÐÐ"
-
-#~ msgid "wireless is disabled"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÑÑÐÐÐ"
-
-#~ msgid "wireless is disabled by hardware switch"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÑÐÐ"
-
-#~ msgid "Preparing wireless network connection '%s'..."
-#~ msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ â%sâ..."
-
-#~ msgid "Configuring wireless network connection '%s'..."
-#~ msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ â%sâ..."
-
-#~ msgid "Requesting a wireless network address for '%s'..."
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÑÐÐÑ â%sâ..."
-
-#~ msgid "Wireless network connection '%s' active"
-#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ â%sâ"
-
-#~ msgid "Wired"
-#~ msgstr "ÐÐÑÐÐÐ"
-
-#~ msgid "Wireless"
-#~ msgstr "ÐÐÐÐÑÐÐ"
-
-#~ msgid "Could not load Wired Security security user interface."
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÑÑÐÑÐ ÐÐÑÐÐÐ ÑÐÐÑÑÐÐÑÑÐ."
-
-#~ msgid "Wireless connection %d"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ %d"
-
-#~ msgid ""
-#~ "failed to find Bluetooth device (unknown gnome-bluetooth proxy object "
-#~ "type)."
-#~ msgstr ""
-#~ "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÑÑ ÑÑÐÑÐÑ (ÐÐÐÐÐÐÐÑÐ ÐÑÑÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ "
-#~ "ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÑÐ)."
-
-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÑÑ ÐÐÐÐÑÐÐÐÑÐ (ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÑÐÐ Ð-ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ)."
diff --git a/po/sr latin po b/po/sr latin po
index beef273..d2ebe8c 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -3,14 +3,14 @@
# 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, 2012.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011â2013.
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ";
"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-09 18:11+0000\n"
-"PO-Revision-Date: 2012-08-17 18:28+0200\n"
+"POT-Creation-Date: 2013-02-17 21:02+0000\n"
+"PO-Revision-Date: 2013-02-18 19:54+0200\n"
"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -74,9 +74,6 @@ msgid "Suppress networks available notifications"
msgstr "IskljuÄi obaveÅtavanja o dostupnim mreÅama"
#: ../org.gnome.nm-applet.gschema.xml.in.h:8
-#| msgid ""
-#| "Set this to true to disable notifications when wireless networks are "
-#| "available."
msgid ""
"Set this to true to disable notifications when Wi-Fi networks are available."
msgstr ""
@@ -121,7 +118,6 @@ msgstr ""
"potvrÄivanja identiteta."
#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
-#| msgid "Wired 802.1X authentication"
msgid "802.1X authentication"
msgstr "PotvrÄivanje identiteta za 802.1X vezu"
@@ -130,37 +126,37 @@ msgstr "PotvrÄivanje identiteta za 802.1X vezu"
msgid "_Network name:"
msgstr "_Ime mreÅe:"
-#: ../src/applet.c:488
+#: ../src/applet.c:545
msgid "Failed to add/activate connection"
msgstr "Nisam uspeo da dodam/aktiviram vezu"
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
msgid "Unknown error"
msgstr "Nepoznata greÅka"
-#: ../src/applet.c:493 ../src/applet.c:563 ../src/applet-device-wifi.c:1382
-#: ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
msgid "Connection failure"
msgstr "Neuspelo povezivanje"
-#: ../src/applet.c:532
+#: ../src/applet.c:589
msgid "Device disconnect failed"
msgstr "Neuspelo prekidanje veze ureÄaja"
-#: ../src/applet.c:537
+#: ../src/applet.c:594
msgid "Disconnect failure"
msgstr "Neuspelo prekidanje veze"
-#: ../src/applet.c:558
+#: ../src/applet.c:615
msgid "Connection activation failed"
msgstr "Neuspelo aktiviranje veze"
-#: ../src/applet.c:924 ../src/applet-device-wifi.c:1072
+#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
msgid "Don't show this message again"
msgstr "Ne prikazuj viÅe ovu poruku"
-#: ../src/applet.c:1013
+#: ../src/applet.c:1075
#, c-format
msgid ""
"\n"
@@ -170,7 +166,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ zbog prekida veze u mreÅi."
-#: ../src/applet.c:1016
+#: ../src/applet.c:1078
#, c-format
msgid ""
"\n"
@@ -179,7 +175,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ zbog neoÄekivanog iskljuÄenja VPN servisa."
-#: ../src/applet.c:1019
+#: ../src/applet.c:1081
#, c-format
msgid ""
"\n"
@@ -190,7 +186,7 @@ msgstr ""
"Ne mogu da uspostavim VPN vezu â%sâ jer je VPN servis poslao neodgovarajuÄa "
"podeÅavanja."
-#: ../src/applet.c:1022
+#: ../src/applet.c:1084
#, c-format
msgid ""
"\n"
@@ -199,7 +195,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ jer je isteklo vreme za povezivanje."
-#: ../src/applet.c:1025
+#: ../src/applet.c:1087
#, c-format
msgid ""
"\n"
@@ -208,7 +204,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ jer VPN servis nije pokrenut na vreme."
-#: ../src/applet.c:1028
+#: ../src/applet.c:1090
#, c-format
msgid ""
"\n"
@@ -217,7 +213,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ zato Åto ne mogu da pokrenem VPN servis."
-#: ../src/applet.c:1031
+#: ../src/applet.c:1093
#, c-format
msgid ""
"\n"
@@ -226,7 +222,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ jer ne postoje ispravne VPN lozinke."
-#: ../src/applet.c:1034
+#: ../src/applet.c:1096
#, c-format
msgid ""
"\n"
@@ -235,7 +231,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ zbog neispravnih VPN lozinki."
-#: ../src/applet.c:1041
+#: ../src/applet.c:1103
#, c-format
msgid ""
"\n"
@@ -244,7 +240,7 @@ msgstr ""
"\n"
"Ne mogu da uspostavim VPN vezu â%sâ."
-#: ../src/applet.c:1059
+#: ../src/applet.c:1121
#, c-format
msgid ""
"\n"
@@ -254,7 +250,7 @@ msgstr ""
"\n"
"Prekinuta je VPN veza â%sâ zbog prekida veze u mreÅi."
-#: ../src/applet.c:1062
+#: ../src/applet.c:1124
#, c-format
msgid ""
"\n"
@@ -263,7 +259,7 @@ msgstr ""
"\n"
"Prekinuta je VPN veza â%sâ zbog iskljuÄivanja VPN servisa."
-#: ../src/applet.c:1068
+#: ../src/applet.c:1130
#, c-format
msgid ""
"\n"
@@ -272,7 +268,7 @@ msgstr ""
"\n"
"VPN veza â%sâ je prekinuta."
-#: ../src/applet.c:1098
+#: ../src/applet.c:1160
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -283,19 +279,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:1100
+#: ../src/applet.c:1162
msgid "VPN connection has been successfully established.\n"
msgstr "VPN veza je uspeÅno uspostavljena.\n"
-#: ../src/applet.c:1102
+#: ../src/applet.c:1164
msgid "VPN Login Message"
msgstr "Poruka za VPN prijavu"
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
+#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
msgid "VPN Connection Failed"
msgstr "Nije uspelo povezivanje na VPN"
-#: ../src/applet.c:1173
+#: ../src/applet.c:1235
#, c-format
msgid ""
"\n"
@@ -309,7 +305,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1176
+#: ../src/applet.c:1238
#, c-format
msgid ""
"\n"
@@ -322,248 +318,235 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1496
+#: ../src/applet.c:1553
msgid "device not ready (firmware missing)"
msgstr "ureÄaj nije spreman (nedostaje firmver)"
-#: ../src/applet.c:1498
+#: ../src/applet.c:1555
msgid "device not ready"
msgstr "ureÄaj nije spreman"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1508 ../src/applet-device-ethernet.c:232
+#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
msgid "disconnected"
msgstr "veza je prekinuta"
-#: ../src/applet.c:1524
+#: ../src/applet.c:1581
msgid "Disconnect"
msgstr "Prekini vezu"
-#: ../src/applet.c:1538
+#: ../src/applet.c:1595
msgid "device not managed"
msgstr "ne mogu da upravljam ureÄajem"
-#: ../src/applet.c:1582
+#: ../src/applet.c:1639
msgid "No network devices available"
msgstr "Nije pronaÄen nijedan mreÅni ureÄaj"
-#: ../src/applet.c:1670
+#: ../src/applet.c:1727
msgid "_VPN Connections"
msgstr "_VPN veze"
-#: ../src/applet.c:1727
+#: ../src/applet.c:1784
msgid "_Configure VPN..."
msgstr "Po_desi VPN..."
-#: ../src/applet.c:1731
+#: ../src/applet.c:1788
msgid "_Disconnect VPN"
msgstr "_Prekini VPN vezu"
-#: ../src/applet.c:1825
+#: ../src/applet.c:1882
msgid "NetworkManager is not running..."
msgstr "UpravljaÄ mreÅom nije pokrenut..."
-#: ../src/applet.c:1830 ../src/applet.c:2631
+#: ../src/applet.c:1887 ../src/applet.c:2739
msgid "Networking disabled"
msgstr "UmreÅavanje iskljuÄeno"
#. 'Enable Networking' item
-#: ../src/applet.c:2051
+#: ../src/applet.c:2108
msgid "Enable _Networking"
msgstr "UkljuÄi _mreÅne usluge"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2060
-#| msgid "Enable _Wireless"
+#: ../src/applet.c:2117
msgid "Enable _Wi-Fi"
msgstr "UkljuÄi _beÅiÄno mreÅenje"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
+#: ../src/applet.c:2126
msgid "Enable _Mobile Broadband"
msgstr "OmoguÄi _mobilne veze"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
+#: ../src/applet.c:2135
msgid "Enable WiMA_X Mobile Broadband"
msgstr "Omogu_Äi ViMAH Mobilnu Åirokopojasnu"
#. Toggle notifications item
-#: ../src/applet.c:2089
+#: ../src/applet.c:2146
msgid "Enable N_otifications"
msgstr "_PrikaÅi obaveÅtenja"
#. 'Connection Information' item
-#: ../src/applet.c:2100
+#: ../src/applet.c:2157
msgid "Connection _Information"
msgstr "Poda_ci o vezi"
#. 'Edit Connections...' item
-#: ../src/applet.c:2110
+#: ../src/applet.c:2167
msgid "Edit Connections..."
msgstr "Uredi veze..."
#. Help item
-#: ../src/applet.c:2124
+#: ../src/applet.c:2181
msgid "_Help"
msgstr "Po_moÄ"
#. About item
-#: ../src/applet.c:2133
+#: ../src/applet.c:2190
msgid "_About"
msgstr "_O programu"
-#: ../src/applet.c:2310
+#: ../src/applet.c:2368
msgid "Disconnected"
msgstr "Veza je prekinuta"
-#: ../src/applet.c:2311
+#: ../src/applet.c:2369
msgid "The network connection has been disconnected."
msgstr "MreÅna veza je prekinuta."
-#: ../src/applet.c:2494
+#: ../src/applet.c:2602
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "Pripremam mreÅnu vezu â%sâ..."
-#: ../src/applet.c:2497
+#: ../src/applet.c:2605
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "Potrebna je prijava korisnika za uspostavljanje veze â%sâ..."
-#: ../src/applet.c:2500 ../src/applet-device-bt.c:239
-#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
-#: ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "Zahtevam mreÅnu adresu za â%sâ..."
-#: ../src/applet.c:2503
+#: ../src/applet.c:2611
#, c-format
msgid "Network connection '%s' active"
msgstr "Povezani ste preko veze â%sâ"
-#: ../src/applet.c:2586
+#: ../src/applet.c:2694
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "Uspostavljam VPN vezu â%sâ..."
-#: ../src/applet.c:2589
+#: ../src/applet.c:2697
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "Potrebna je prijava korisnika za uspostavljanje VPN veze â%sâ..."
-#: ../src/applet.c:2592
+#: ../src/applet.c:2700
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "Zahtevam VPN mreÅnu adresu za â%sâ..."
-#: ../src/applet.c:2595
+#: ../src/applet.c:2703
#, c-format
msgid "VPN connection '%s' active"
msgstr "Povezani ste preko VPN veze â%sâ"
-#: ../src/applet.c:2636
+#: ../src/applet.c:2744
msgid "No network connection"
msgstr "Nema mreÅne veze"
-#: ../src/applet.c:3336
+#: ../src/applet.c:3445
msgid "NetworkManager Applet"
msgstr "ProgramÄe upravnika mreÅe"
-#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
msgid "Available"
msgstr "Dostupno"
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
+#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
#, c-format
msgid "You are now connected to '%s'."
msgstr "Povezani ste na â%sâ."
-#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
+#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
msgid "Connection Established"
msgstr "Veza uspostavljena"
-#: ../src/applet-device-bt.c:204
+#: ../src/applet-device-bt.c:200
msgid "You are now connected to the mobile broadband network."
msgstr "Povezani ste mobilnom Åirokopojasnom mreÅom."
-#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:606
#, c-format
msgid "Preparing mobile broadband connection '%s'..."
msgstr "Pripremam mobilnu, Åirokopojasnu vezu â%sâ..."
-#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:609
#, c-format
msgid "Configuring mobile broadband connection '%s'..."
msgstr "PodeÅavam mobilnu, Åirokopojasnu vezu â%sâ..."
-#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:612
#, 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:243 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "Povezani ste preko mobilne Åirokopojasne veze â%sâ"
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
-
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "Mobilna veza (%s)"
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/new-connection.c:85
-#: ../src/connection-editor/page-mobile.c:379
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "Mobilna"
#. Default connection item
-#: ../src/applet-device-cdma.c:409
+#: ../src/applet-device-cdma.c:316
msgid "New Mobile Broadband (CDMA) connection..."
msgstr "Nova mobilna Åirokopojasna (CDMA) veza..."
-#: ../src/applet-device-cdma.c:443
+#: ../src/applet-device-cdma.c:350
msgid "You are now connected to the CDMA network."
msgstr "Sada ste povezani na CDMA mreÅu."
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Povezani ste na mobilnu Åirokopojasnu vezu â%sâ: (%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "roming"
-
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
msgid "CDMA network."
msgstr "CDMA mreÅa."
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
+#: ../src/applet-device-gsm.c:677
msgid "You are now registered on the home network."
msgstr "Sada ste registrovani na kuÄnu mreÅu."
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
+#: ../src/applet-device-gsm.c:683
msgid "You are now registered on a roaming network."
msgstr "Sada ste registrovani na mreÅu prebacivanja."
@@ -571,201 +554,122 @@ msgstr "Sada ste registrovani na mreÅu prebacivanja."
msgid "Auto Ethernet"
msgstr "Automatska ÅiÄana veza"
-#: ../src/applet-device-ethernet.c:205
+#: ../src/applet-device-ethernet.c:202
#, c-format
-#| msgid "Wired Networks (%s)"
msgid "Ethernet Networks (%s)"
msgstr "ÅiÄane mreÅe (%s)"
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:204
#, c-format
-#| msgid "Wired Network (%s)"
msgid "Ethernet Network (%s)"
msgstr "ÅiÄana mreÅa (%s)"
-#: ../src/applet-device-ethernet.c:210
-#| msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:207
msgid "Ethernet Networks"
msgstr "ÅiÄane mreÅe"
-#: ../src/applet-device-ethernet.c:212
-#| msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:209
msgid "Ethernet Network"
msgstr "ÅiÄana mreÅa"
-#: ../src/applet-device-ethernet.c:274
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:271
msgid "You are now connected to the ethernet network."
msgstr "Povezani ste na ÅiÄanu mreÅu."
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:297
#, c-format
-#| msgid "Preparing wired network connection '%s'..."
msgid "Preparing ethernet network connection '%s'..."
msgstr "Pripremam vezu preko ÅiÄane mreÅu â%sâ..."
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:300
#, c-format
-#| msgid "Configuring wired network connection '%s'..."
msgid "Configuring ethernet network connection '%s'..."
msgstr "PodeÅavam vezu preko ÅiÄane mreÅu â%sâ..."
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:303
#, c-format
-#| msgid "User authentication required for wired network connection '%s'..."
msgid "User authentication required for ethernet network connection '%s'..."
msgstr "Potrebna je prijava korisnika za uspostavljanje ÅiÄane veze â%sâ..."
-#: ../src/applet-device-ethernet.c:309
+#: ../src/applet-device-ethernet.c:306
#, c-format
-#| msgid "Requesting a wired network address for '%s'..."
msgid "Requesting an ethernet network address for '%s'..."
msgstr "Zahtevam adresu za ÅiÄanu mreÅu â%sâ..."
-#: ../src/applet-device-ethernet.c:313
+#: ../src/applet-device-ethernet.c:310
#, c-format
-#| msgid "Wired network connection '%s' active"
msgid "Ethernet network connection '%s' active"
msgstr "Povezani ste preko ÅiÄane veze â%sâ"
-#: ../src/applet-device-ethernet.c:494
+#: ../src/applet-device-ethernet.c:491
msgid "DSL authentication"
msgstr "PotvrÄivanje identiteta DSL-a"
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:702
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nova mobilna, Åirokopojasna mreÅa..."
-
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "Povezani ste na GSM mreÅu."
-
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "Potreban je PIN kÃd"
-
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Potreban je PIN kod za povezivanje mobilnog Åirokopojasnog ureÄaja"
-
-#: ../src/applet-device-gsm.c:781
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "PIN kod za SIM karticu â%sâ na â%sâ"
+#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PogreÅan PUK kod, kontaktirajte vaÅeg provajdera."
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
msgid "Wrong PIN code; please contact your provider."
msgstr "PogreÅan PIN kod, kontaktirajte vaÅeg provajdera."
-#: ../src/applet-device-gsm.c:896
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PogreÅan PUK kod, kontaktirajte vaÅeg provajdera."
-
#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:923
+#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
msgid "Sending unlock code..."
msgstr "Åaljem kod za otkljuÄavanje..."
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "Potrebno je otkljuÄati SIM PIN"
-
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "Potrebno je otkljuÄati SIM PIN"
-
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, 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."
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "PIN kÃd:"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "PrikaÅi PIN kÃd"
-
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "Potrebno je otkljuÄati SIM PUK"
-
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "Potrebno je otkljuÄati SIM PUK"
-
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, 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 kÃd."
-
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "PUK kÃd:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:780
+#| msgid "New Mobile Broadband Connection"
+msgid "New Mobile Broadband connection..."
+msgstr "Nova mobilna, Åirokopojasna veza..."
+
+#: ../src/applet-device-broadband.c:816
+#| msgid "You are now connected to the mobile broadband network."
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Povezani ste mobilnom Åirokopojasnom mreÅom."
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "Novi PIN kÃd:"
+#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
+#| msgid "Mobile broadband network password"
+msgid "Mobile Broadband network."
+msgstr "Mobilna Åirokopojasna mreÅa."
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "Ponovo unesite PIN kÃd:"
+#. Default connection item
+#: ../src/applet-device-gsm.c:370
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "Nova mobilna, Åirokopojasna mreÅa..."
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "PrikaÅi PIN/PUK kÃdove"
+#: ../src/applet-device-gsm.c:404
+msgid "You are now connected to the GSM network."
+msgstr "Povezani ste na GSM mreÅu."
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
msgid "GSM network."
msgstr "GSM mreÅa."
-#: ../src/applet-device-wifi.c:97
-#| msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:98
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "PoveÅi se na _skrivenu beÅiÄnu mreÅu..."
-#: ../src/applet-device-wifi.c:148
-#| msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:149
msgid "Create _New Wi-Fi Network..."
msgstr "Napravi _novu beÅiÄnu mreÅu..."
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:293
msgid "(none)"
msgstr "(niÅta)"
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:787
#, c-format
-#| msgid "Wired Networks (%s)"
msgid "Wi-Fi Networks (%s)"
msgstr "BeÅiÄne mreÅe (%s)"
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:789
#, c-format
-#| msgid "Wired Network (%s)"
msgid "Wi-Fi Network (%s)"
msgstr "BeÅiÄna mreÅa (%s)"
-#: ../src/applet-device-wifi.c:794
-#| msgid "Wired Network"
+#: ../src/applet-device-wifi.c:791
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "BeÅiÄna mreÅa"
@@ -773,109 +677,107 @@ msgstr[1] "BeÅiÄne mreÅe"
msgstr[2] "BeÅiÄne mreÅe"
msgstr[3] "ÅiÄana mreÅa"
-#: ../src/applet-device-wifi.c:827
-#| msgid "WiMAX is disabled"
+#: ../src/applet-device-wifi.c:824
msgid "Wi-Fi is disabled"
msgstr "BeÅiÄna mreÅa je iskljuÄena"
-#: ../src/applet-device-wifi.c:828
-#| msgid "WiMAX is disabled by hardware switch"
+#: ../src/applet-device-wifi.c:825
msgid "Wi-Fi is disabled by hardware switch"
msgstr "BeÅiÄna mreÅa je iskljuÄena fiziÄkim prekidaÄem"
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:886
msgid "More networks"
msgstr "JoÅ mreÅa"
# bug: no plural forms
-#: ../src/applet-device-wifi.c:1068
-#| msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1065
msgid "Wi-Fi Networks Available"
msgstr "Dostupne su beÅiÄne mreÅe"
-#: ../src/applet-device-wifi.c:1069
-#| msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1066
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "Koristite izbornik mreÅe da se poveÅete na beÅiÄnu mreÅu"
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1260
#, c-format
-#| msgid "You are now connected to the wireless network '%s'."
msgid "You are now connected to the Wi-Fi network '%s'."
msgstr "Povezani ste na beÅiÄnu mreÅu â%sâ."
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1291
#, c-format
-#| msgid "Preparing network connection '%s'..."
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "Pripremam beÅiÄnu mreÅnu vezu â%sâ..."
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1294
#, c-format
-#| msgid "Configuring wired network connection '%s'..."
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "PodeÅavam vezu preko beÅiÄne mreÅe â%sâ..."
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1297
#, c-format
-#| msgid "User authentication required for wireless network '%s'..."
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "Potrebna je prijava korisnika za uspostavljanje beÅiÄne veze â%sâ..."
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1300
#, c-format
-#| msgid "Requesting a network address for '%s'..."
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "Zahtevam adresu beÅiÄne mreÅe za â%sâ..."
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-wifi.c:1321
#, c-format
-#| msgid "Wireless network connection '%s' active: %s (%d%%)"
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "Povezani ste preko beÅiÄne veze â%sâ : %s (%d%%)"
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-wifi.c:1326
#, c-format
-#| msgid "Wired network connection '%s' active"
msgid "Wi-Fi network connection '%s' active"
msgstr "Povezani ste preko beÅiÄne veze â%sâ"
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1374
msgid "Failed to activate connection"
msgstr "Nisam uspeo da aktiviram vezu"
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1393
msgid "Failed to add new connection"
msgstr "Nisam uspeo da dodam novu vezu"
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wimax.c:227
#, c-format
msgid "WiMAX Mobile Broadband (%s)"
msgstr "ViMAKS Mobilna Åirokopojasna (%s)"
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
msgid "WiMAX Mobile Broadband"
msgstr "ViMAKS Mobilna Åirokopojasna"
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
msgid "WiMAX is disabled"
msgstr "ViMAKS je iskljuÄena"
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
msgid "WiMAX is disabled by hardware switch"
msgstr "ViMAKS je iskljuÄena fiziÄkim prekidaÄem"
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
msgid "You are now connected to the WiMAX network."
msgstr "Sada ste povezani na ViMAKS mreÅu."
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
+#, 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-wimax.c:481 ../src/mobile-helpers.c:630
+msgid "roaming"
+msgstr "roming"
+
#: ../src/applet-dialogs.c:57
msgid "Error displaying connection information:"
msgstr "GreÅka pri prikazivanju podataka o vezi:"
#: ../src/applet-dialogs.c:109
#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:929
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
#: ../src/wireless-security/wireless-security.c:406
msgid "LEAP"
msgstr "LEAP"
@@ -894,7 +796,7 @@ msgid "WEP"
msgstr "VEP"
#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:886
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
msgctxt "Wifi/wired security"
msgid "None"
msgstr "NiÅta"
@@ -956,6 +858,7 @@ msgstr "ViMAKS (%s)"
#. --- General ---
#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:345
msgid "General"
msgstr "OpÅte"
@@ -1062,7 +965,7 @@ msgstr "VPN baner:"
msgid "Base Connection:"
msgstr "Veza osnove:"
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
msgid "Unknown"
msgstr "Nepoznato"
@@ -1107,6 +1010,68 @@ msgstr "Potrebna je lozinka za povezivanje na â%sâ."
msgid "Password:"
msgstr "Lozinka:"
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "Potrebno je otkljuÄati SIM PIN"
+
+#: ../src/applet-dialogs.c:1311
+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-dialogs.c:1313
+#, 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."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN kÃd:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "PrikaÅi PIN kÃd"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "Potrebno je otkljuÄati SIM PUK"
+
+#: ../src/applet-dialogs.c:1322
+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-dialogs.c:1324
+#, 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 kÃd."
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK kÃd:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "Novi PIN kÃd:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "Ponovo unesite PIN kÃd:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "PrikaÅi PIN/PUK kÃdove"
+
#: ../src/connection-editor/ce-ip4-routes.ui.h:1
#: ../src/connection-editor/ce-ip6-routes.ui.h:1
#: ../src/connection-editor/ce-page-ip4.ui.h:8
@@ -1167,16 +1132,160 @@ msgstr ""
msgid "Createâ"
msgstr "Napraviâ"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "KruÅno menjanje"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "Radna rezerva"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "IksOR"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#| msgid "Broadcast Address:"
+msgid "Broadcast"
+msgstr "Emitovanje"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "Prilagodljivo uravnoteÅenje uÄitavanja prenosa"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "Prilagodljivo uravnoteÅenje uÄitavanja"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (preporuÄeno)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#| msgid "EAP"
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#| msgid "Base Connection:"
+msgid "Bonded _connections:"
+msgstr "Privezane _veze:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#| msgid "M_ode:"
+msgid "_Mode:"
+msgstr "_ReÅim:"
+
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "_Edit"
+msgstr "_UreÄivanje"
+
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "_Delete"
+msgstr "_ObriÅi"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr "UÄestalost _praÄenja:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr "ms"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#| msgid "Interface:"
+msgid "_Interface name:"
+msgstr "_UreÄaj:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr "_PraÄenje veze:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr "ARP _mete:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
+"IP adresa, ili spisak zarezom razdvojenih IP adresa, koje Äe biti potraÅene "
+"prilikom provere stanja veze."
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr "Zastoj _povezivanja:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr "Zastoj _razvezivanja:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr "TroÅak _putanje:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#| msgid "S_ecurity:"
+msgid "_Priority:"
+msgstr "_VaÅnost:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#| msgid "_Transport mode:"
+msgid "_Hairpin mode:"
+msgstr "_ReÅim ukosnice:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#| msgid "Base Connection:"
+msgid "Bridged _connections:"
+msgstr "PremoÅÄene _veze:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr "Zastoj _prosleÄivanja:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr "_Vreme pozdrava:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "s"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr "UkljuÄi _STP (Protokol obuhvatnog drveta)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr "_NajveÄe vreme:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr "Vreme _starenja:"
+
#: ../src/connection-editor/ce-page.c:72
msgid "automatic"
msgstr "automatski"
-#: ../src/connection-editor/ce-page.c:288
+#: ../src/connection-editor/ce-page.c:356
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.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
#: ../src/wireless-security/eap-method-leap.ui.h:1
#: ../src/wireless-security/eap-method-simple.ui.h:1
#: ../src/wireless-security/ws-leap.ui.h:1
@@ -1197,7 +1306,7 @@ msgid "Sho_w password"
msgstr "PrikaÅi _lozinku"
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
@@ -1286,16 +1395,35 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:17
#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
#: ../src/connection-editor/ce-page-wifi.ui.h:7
msgid "_MTU:"
msgstr "_MTU:"
#: ../src/connection-editor/ce-page-ethernet.ui.h:18
#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
#: ../src/connection-editor/ce-page-wifi.ui.h:6
msgid "bytes"
msgstr "bajta"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "Sam se poveÅi na _VPN kada koristiÅ ovu vezu"
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#| msgid "You are now connected to the WiMAX network."
+msgid "All _users may connect to this network"
+msgstr "Svi _korisnici mogu da se poveÅu na ovu mreÅu"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "_Automatically connect to this network when it is available"
+msgstr "_Sam se poveÅi na ovu mreÅu kada je dostupna"
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+msgstr "Oblast _mreÅne barijere:"
+
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
msgid "_Transport mode:"
msgstr "ReÅim _prenosa:"
@@ -1440,43 +1568,52 @@ msgid "Prefer 2G (GPRS/EDGE)"
msgstr "Najpre 2G (GPRS/EDGE)"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#| msgid "Prefer 3G (UMTS/HSPA)"
+msgid "Prefer 4G (LTE)"
+msgstr "Najpre 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr "Samo 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
msgid "Basic"
msgstr "Osnovno"
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
msgid "Nu_mber:"
msgstr "_Broj:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
msgid "Advanced"
msgstr "Napredno"
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
msgid "_APN:"
msgstr "_APN:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
msgid "N_etwork ID:"
msgstr "_IB mreÅe:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type:"
msgstr "_Vrsta:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
msgid "Change..."
msgstr "Izmeni..."
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
msgid "P_IN:"
msgstr "_PIN:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
msgid "Allow _roaming if home network is not available"
msgstr "Dozvoli _roming ukoliko nema domaÄe mreÅe"
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
msgid "Sho_w passwords"
msgstr "PrikaÅi _lozinke"
@@ -1528,6 +1665,34 @@ msgstr "Eho"
msgid "Send PPP _echo packets"
msgstr "Åalji PPP _eho pakete"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#| msgid "Interface:"
+msgid "_Parent interface:"
+msgstr "_Roditeljski ureÄaj:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr "Naziv _VLAN ureÄaja:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#| msgid "C_loned MAC address:"
+msgid "_Cloned MAC address:"
+msgstr "_Klonirana MAK adresa:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "_IB VLAN-a:"
+
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr "Naziv ureÄaja + broj"
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number
together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr "âvlanâ + broj"
+
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
msgid "S_ecurity:"
msgstr "B_ezbednost:"
@@ -1565,35 +1730,24 @@ msgid "_Rate:"
msgstr "_Protok:"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-#| msgid ""
-#| "This option locks this connection to the wireless access point (AP) "
-#| "specified by the BSSID entered here. Example: 00:11:22:33:44:55"
-msgid ""
-"This option locks this connection to the Wi-Fi access point (AP) specified "
-"by the BSSID entered here. Example: 00:11:22:33:44:55"
-msgstr ""
-"Ova opcija dodeljuje ovu vezu taÄki beÅiÄnog pristupa (AP) koja je navedena "
-"ovde unetim BSSID-om. Npr: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "_BSSID:"
msgstr "_BSSID:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "C_hannel:"
msgstr "_Kanal:"
# Valjda se odnosi na opseg, a?
# ~MiloÅ
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
msgid "Ban_d:"
msgstr "_Opseg:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
msgid "M_ode:"
msgstr "_ReÅim:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
msgid "SS_ID:"
msgstr "SS_ID:"
@@ -1651,80 +1805,130 @@ 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/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
msgid "Address"
msgstr "Adresa"
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
msgid "Netmask"
msgstr "MreÅna maska"
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
msgid "Gateway"
msgstr "MreÅni prolaz"
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
msgid "Metric"
msgstr "MetriÄki"
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
msgid "Prefix"
msgstr "Prefiks"
-#: ../src/connection-editor/new-connection.c:75
-#: ../src/connection-editor/page-ethernet.c:273
-#| msgid "Auto Ethernet"
+#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Ethernet"
msgstr "ÅiÄana veza"
-#: ../src/connection-editor/new-connection.c:80
-#: ../src/connection-editor/page-wifi.c:462
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Wi-Fi"
msgstr "BeÅiÄna"
-#: ../src/connection-editor/new-connection.c:90
-#: ../src/connection-editor/page-wimax.c:157 ../src/mb-menu-item.c:73
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
msgid "WiMAX"
msgstr "ViMAKS"
-#: ../src/connection-editor/new-connection.c:95
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:100
-#: ../src/connection-editor/page-infiniband.c:189
+#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
msgid "InfiniBand"
msgstr "Infini band"
-#: ../src/connection-editor/new-connection.c:112
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
+msgid "Bond"
+msgstr "Veza"
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+msgid "Bridge"
+msgstr "Most"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/new-connection.c:252
+#| msgid "Hardware Address:"
+msgid "Hardware"
+msgstr "Hardver"
+
+#: ../src/connection-editor/new-connection.c:272
+msgid "Virtual"
+msgstr "Virtuelno"
+
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
msgid "Import a saved VPN configuration..."
msgstr "Uvezi saÄuvna VPN podeÅavanja..."
-#: ../src/connection-editor/nm-connection-editor.c:106
+#: ../src/connection-editor/new-connection.c:371
+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/new-connection.c:380
+msgid "Could not create new connection"
+msgstr "Ne mogu da napravim novu vezu"
+
+#: ../src/connection-editor/new-connection.c:515
+msgid "Connection delete failed"
+msgstr "Ne mogu da obriÅem vezu"
+
+#: ../src/connection-editor/new-connection.c:562
+#, 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-editor.c:118
#, c-format
msgid "Editing %s"
msgstr "UreÄujem %s"
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: ../src/connection-editor/nm-connection-editor.c:122
msgid "Editing un-named connection"
msgstr "UreÄujem neimenovanu vezu"
-#: ../src/connection-editor/nm-connection-editor.c:297
+#: ../src/connection-editor/nm-connection-editor.c:282
msgid ""
"The connection editor could not find some required resources (the .ui file "
"was not found)."
@@ -1732,53 +1936,72 @@ msgstr ""
"Program za ureÄivanje veza ne moÅe da pronaÄe neke od potrebnih resursa (nije "
"naÄena â.uiâ datoteka)."
-#: ../src/connection-editor/nm-connection-editor.c:401
-msgid "Error creating connection editor dialog."
-msgstr "GreÅka u obrazovanju prozorÄeta za ureÄivanje veza."
-
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:408
msgid "_Save"
msgstr "_SaÄuvaj"
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:409
msgid "Save any changes made to this connection."
msgstr "SaÄuvaj sve promene u ovoj vezi."
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:410
msgid "_Save..."
msgstr "_SaÄuvaj..."
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:411
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.c:427
+#| msgid "Could not create new connection"
+msgid "Could not create connection"
+msgstr "Ne mogu da napravim vezu"
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+msgid "Could not edit connection"
+msgstr "Ne mogu da uredim vezu"
+
+#: ../src/connection-editor/nm-connection-editor.c:429
+#| msgid "Error creating connection editor dialog."
+msgid "Unknown error creating connection editor dialog."
+msgstr "Nepoznata greÅka stvaranja prozorÄeta za ureÄivanje veza."
+
+#: ../src/connection-editor/nm-connection-editor.c:536
+msgid "Error saving connection"
+msgstr "GreÅka prilikom Äuvanja veze"
+
+#: ../src/connection-editor/nm-connection-editor.c:537
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "Svojstvo â%sâ/ â%sâ je nevaÅeÄe: â%dâ"
+
+#: ../src/connection-editor/nm-connection-editor.c:631
+msgid "Error initializing editor"
+msgstr "GreÅka u pokretanju ureÄivaÄa"
+
+#: ../src/connection-editor/nm-connection-editor.c:952
+msgid "Connection add failed"
+msgstr "Nije uspelo dodavanje veze"
+
#: ../src/connection-editor/nm-connection-editor.ui.h:2
msgid "Connection _name:"
msgstr "Ime _veze:"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connect _automatically"
-msgstr "_Sam se poveÅi"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "A_vailable to all users"
-msgstr "_Dostupno svim korisnicima"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
msgid "_Export..."
msgstr "_Izvezi..."
-#: ../src/connection-editor/nm-connection-list.c:169
+#: ../src/connection-editor/nm-connection-list.c:143
msgid "never"
msgstr "nikad"
-#: ../src/connection-editor/nm-connection-list.c:180
-#: ../src/connection-editor/nm-connection-list.c:191
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
msgid "now"
msgstr "sada"
#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:172
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
@@ -1787,7 +2010,7 @@ msgstr[1] "pre %d minuta"
msgstr[2] "pre %d minuta"
msgstr[3] "pre %d minut"
-#: ../src/connection-editor/nm-connection-list.c:202
+#: ../src/connection-editor/nm-connection-list.c:176
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
@@ -1796,7 +2019,7 @@ msgstr[1] "pre %d sata"
msgstr[2] "pre %d sati"
msgstr[3] "pre %d sat"
-#: ../src/connection-editor/nm-connection-list.c:214
+#: ../src/connection-editor/nm-connection-list.c:188
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -1805,7 +2028,7 @@ msgstr[1] "pre %d dana"
msgstr[2] "pre %d dana"
msgstr[3] "pre %d dan"
-#: ../src/connection-editor/nm-connection-list.c:220
+#: ../src/connection-editor/nm-connection-list.c:194
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
@@ -1814,7 +2037,7 @@ msgstr[1] "pre %d meseca"
msgstr[2] "pre %d meseci"
msgstr[3] "pre %d mesec"
-#: ../src/connection-editor/nm-connection-list.c:224
+#: ../src/connection-editor/nm-connection-list.c:198
#, c-format
msgid "%d year ago"
msgid_plural "%d years ago"
@@ -1823,142 +2046,114 @@ msgstr[1] "pre %d godine"
msgstr[2] "pre %d godina"
msgstr[3] "pre %d godine"
-#: ../src/connection-editor/nm-connection-list.c:443
-msgid "Connection add failed"
-msgstr "Nije uspelo dodavanje veze"
-
-#: ../src/connection-editor/nm-connection-list.c:472
-msgid "Error saving connection"
-msgstr "GreÅka prilikom Äuvanja veze"
-
-#: ../src/connection-editor/nm-connection-list.c:473
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Svojstvo â%sâ/ â%sâ je nevaÅeÄe: â%dâ"
-
-#: ../src/connection-editor/nm-connection-list.c:480
-#: ../src/connection-editor/nm-connection-list.c:598
-msgid "An unknown error occurred."
-msgstr "DoÅlo je do nepoznate greÅke."
-
-#: ../src/connection-editor/nm-connection-list.c:485
-#: ../src/connection-editor/nm-connection-list.c:638
-msgid "Error initializing editor"
-msgstr "GreÅka u pokretanju ureÄivaÄa"
-
-#: ../src/connection-editor/nm-connection-list.c:503
-#: ../src/connection-editor/nm-connection-list.c:655
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "Ne mogu da pokrenem prozorÄe za izmenu veze zbog nepoznate greÅke."
-
-#: ../src/connection-editor/nm-connection-list.c:512
-msgid "Could not create new connection"
-msgstr "Ne mogu da napravim novu vezu"
-
-#: ../src/connection-editor/nm-connection-list.c:524
-msgid "Could not edit new connection"
-msgstr "Ne mogu da uredim novu vezu"
-
-#: ../src/connection-editor/nm-connection-list.c:669
-msgid "Could not edit connection"
-msgstr "Ne mogu da uredim vezu"
-
-#: ../src/connection-editor/nm-connection-list.c:699
-msgid "Connection delete failed"
-msgstr "Ne mogu da obriÅem vezu"
-
-#: ../src/connection-editor/nm-connection-list.c:731
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Da li da zaista obriÅem vezu %s?"
-
-#: ../src/connection-editor/nm-connection-list.c:972
+#: ../src/connection-editor/nm-connection-list.c:631
msgid "Name"
msgstr "Naziv"
-#: ../src/connection-editor/nm-connection-list.c:985
+#: ../src/connection-editor/nm-connection-list.c:644
msgid "Last Used"
msgstr "Upotrbljena"
-#. Edit
-#: ../src/connection-editor/nm-connection-list.c:1026
-msgid "_Edit"
-msgstr "_UreÄivanje"
-
-#: ../src/connection-editor/nm-connection-list.c:1027
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "Edit the selected connection"
msgstr "UreÄuje podatke za izabranu vezu"
-#: ../src/connection-editor/nm-connection-list.c:1028
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "_Edit..."
msgstr "_Uredi..."
-#: ../src/connection-editor/nm-connection-list.c:1029
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "Authenticate to edit the selected connection"
msgstr "Prijavite se kako bi izmenili izabranu vezu"
-#. Delete
-#: ../src/connection-editor/nm-connection-list.c:1043
-msgid "_Delete"
-msgstr "_ObriÅi"
-
-#: ../src/connection-editor/nm-connection-list.c:1044
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "Delete the selected connection"
msgstr "BriÅe izabranu vezu"
-#: ../src/connection-editor/nm-connection-list.c:1045
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "_Delete..."
msgstr "_ObriÅi..."
-#: ../src/connection-editor/nm-connection-list.c:1046
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "Authenticate to delete the selected connection"
msgstr "Prijavite se kako bi obrisali izabranu vezu"
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:942
msgid "Error creating connection"
msgstr "GreÅka prilikom stvaranja veze"
-#: ../src/connection-editor/nm-connection-list.c:1286
+#: ../src/connection-editor/nm-connection-list.c:943
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "Ne znam kako da napravim â%sâ vezu"
-#: ../src/connection-editor/nm-connection-list.c:1341
+#: ../src/connection-editor/nm-connection-list.c:998
msgid "Error editing connection"
msgstr "GreÅka prilikom ureÄivanja veze"
-#: ../src/connection-editor/nm-connection-list.c:1342
+#: ../src/connection-editor/nm-connection-list.c:999
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "Nisam naÅao vezu koja ima UUID â%sâ"
-#: ../src/connection-editor/page-8021x-security.c:119
+#: ../src/connection-editor/page-8021x-security.c:121
msgid "802.1x Security"
msgstr "Bezbednost 802.1x"
-#: ../src/connection-editor/page-8021x-security.c:121
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-8021x-security.c:123
msgid "Could not load 802.1x Security user interface."
msgstr "Ne mogu da uÄitam bezbednosno korisniÄko suÄelje za 802.1x."
-#: ../src/connection-editor/page-8021x-security.c:139
+#: ../src/connection-editor/page-8021x-security.c:141
msgid "Use 802.1_X security for this connection"
msgstr "Koristi 802.1_X bezbednost za ovu vezu"
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-bond.c:422
+#| msgid "Could not load DSL user interface."
+msgid "Could not load bond user interface."
+msgstr "Ne mogu da uÄitam korisniÄko suÄelje sveze."
+
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
+#| msgid "InfiniBand connection %d"
+msgid "Bond connection %d"
+msgstr "Veza sveze %d"
+
+#: ../src/connection-editor/page-bridge.c:214
+#| msgid "Could not load Wi-Fi user interface."
+msgid "Could not load bridge user interface."
+msgstr "Ne mogu da uÄitam korisniÄko suÄelje mosta."
+
+#: ../src/connection-editor/page-bridge.c:309
+#, c-format
+#| msgid "Wi-Fi connection %d"
+msgid "Bridge connection %d"
+msgstr "Veza mosta %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr "PrikljuÄnik mosta"
+
+#: ../src/connection-editor/page-bridge-port.c:117
+#| msgid "Could not load ethernet user interface."
+msgid "Could not load bridge port user interface."
+msgstr "Ne mogu da uÄitam korisniÄko suÄelje prikljuÄnika mosta."
+
+#: ../src/connection-editor/page-dsl.c:143
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:233
+#: ../src/connection-editor/page-dsl.c:235
#, c-format
msgid "DSL connection %d"
msgstr "DSL veza â%dâ"
-#: ../src/connection-editor/page-ethernet.c:89
+#: ../src/connection-editor/page-ethernet.c:90
#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wifi.c:113
#: ../src/connection-editor/page-wimax.c:70
msgid ""
"This option locks this connection to the network device specified by its "
@@ -1967,22 +2162,46 @@ msgstr ""
"Ova opcija zakljuÄava vezu sa mreÅnim ureÄajem koji je odreÄen trajnom MAK "
"adresom. Npr: 00:11:22:33:44:55"
-#: ../src/connection-editor/page-ethernet.c:275
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-ethernet.c:253
msgid "Could not load ethernet user interface."
msgstr "Ne mogu da uÄitam korisniÄko suÄelje za ÅiÄanu mreÅu."
-#: ../src/connection-editor/page-ethernet.c:451
+#: ../src/connection-editor/page-ethernet.c:396
#, c-format
-#| msgid "Wired connection %d"
msgid "Ethernet connection %d"
msgstr "ÅiÄana veza %d"
-#: ../src/connection-editor/page-infiniband.c:192
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:59
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "Podrazumevana"
+
+#: ../src/connection-editor/page-general.c:60
+msgid ""
+"The zone defines the trust level of the connection. Default is not a regular "
+"zone, selecting it results in the use of the default zone set in the "
+"firewall. Only usable if firewalld is active."
+msgstr ""
+"Oblast odreÄuje nivo pouzdanosti veze. Zadata nije uobiÄajena oblast, njeno "
+"biranje dovodi do koriÅÄenja zadate oblasti podeÅene u mreÅnoj barijeri. MoÅe "
+"se koristiti samo ako je pokrenut demon mreÅne barijere (firewalld)."
+
+#: ../src/connection-editor/page-general.c:61
+#| msgid "NetworkManager is not running..."
+msgid "FirewallD is not running."
+msgstr "Demon mreÅne barijere nije pokrenut."
+
+#: ../src/connection-editor/page-general.c:348
+#| msgid "Could not load ethernet user interface."
+msgid "Could not load General user interface."
+msgstr "Ne mogu da uÄitam opÅte korisniÄko suÄelje."
+
+#: ../src/connection-editor/page-infiniband.c:171
msgid "Could not load InfiniBand user interface."
msgstr "Ne mogu da uÄitam korisniÄko suÄelje Infini banda."
-#: ../src/connection-editor/page-infiniband.c:317
+#: ../src/connection-editor/page-infiniband.c:263
#, c-format
msgid "InfiniBand connection %d"
msgstr "Infini band veza %d"
@@ -2044,16 +2263,16 @@ msgstr "Dodatni _DNS serveri:"
msgid "Additional s_earch domains:"
msgstr "Dodatni domeni _pretrage:"
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "UreÄujem IPv4 rute za %s"
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1011
msgid "IPv4 Settings"
msgstr "IPv4 podeÅavanja"
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1013
msgid "Could not load IPv4 user interface."
msgstr "Ne mogu da uÄitam IPv4 korisniÄko suÄelje."
@@ -2070,33 +2289,38 @@ msgstr "Zanemari"
msgid "Automatic, DHCP only"
msgstr "Automatski, samo DHCP"
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "UreÄujem IPv6 rute za %s"
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:975
msgid "IPv6 Settings"
msgstr "IPv6 podeÅavanja"
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:977
msgid "Could not load IPv6 user interface."
msgstr "Ne mogu da uÄitam IPv6 korisniÄko suÄelje."
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr "%s podanik %d"
+
+#: ../src/connection-editor/page-mobile.c:391
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:398
+#: ../src/connection-editor/page-mobile.c:408
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:642
+#: ../src/connection-editor/page-mobile.c:658
msgid "Select Mobile Broadband Provider Type"
msgstr "Izaberite vrstu mobilnog Åirokopojasnog izdavaÄa"
-#: ../src/connection-editor/page-mobile.c:677
+#: ../src/connection-editor/page-mobile.c:693
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
@@ -2104,14 +2328,24 @@ msgstr ""
"Izaberite tehnologiju koju koristi vaÅ izdavaÄ mobilnih Åirokopojasnih "
"usluga. Ukoliko niste sigurni, pitajte izdavaÄa."
-#: ../src/connection-editor/page-mobile.c:682
+#: ../src/connection-editor/page-mobile.c:698
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:689
+#: ../src/connection-editor/page-mobile.c:705
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-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:268
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:266
+msgid "GSM"
+msgstr "GSM"
+
#: ../src/connection-editor/page-ppp.c:134
msgid "EAP"
msgstr "EAP"
@@ -2148,30 +2382,41 @@ msgstr "niÅta"
msgid "Editing PPP authentication methods for %s"
msgstr "UreÄujem PPP naÄine prijave za %s"
-#: ../src/connection-editor/page-ppp.c:282
+#: ../src/connection-editor/page-ppp.c:284
msgid "PPP Settings"
msgstr "PPP podeÅavanja"
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:286
msgid "Could not load PPP user interface."
msgstr "Ne mogu da uÄitam PPP korisniÄko suÄelje."
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/page-vlan.c:482
+#| msgid "Could not load IPv4 user interface."
+msgid "Could not load vlan user interface."
+msgstr "Ne mogu da uÄitam korisniÄko suÄelje vlan-a."
+
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+#| msgid "VPN connection %d"
+msgid "VLAN connection %d"
+msgstr "VLAN veza %d"
+
+#: ../src/connection-editor/page-vpn.c:115
msgid "Could not load VPN user interface."
msgstr "Ne mogu da uÄitam VPN korisniÄko suÄelje."
-#: ../src/connection-editor/page-vpn.c:128
+#: ../src/connection-editor/page-vpn.c:130
#, c-format
msgid "Could not find VPN plugin service for '%s'."
msgstr "Ne mogu da naÄem uslugu VPN prikljuÄka za â%sâ."
-#: ../src/connection-editor/page-vpn.c:222
-#: ../src/connection-editor/page-vpn.c:305
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
#, c-format
msgid "VPN connection %d"
msgstr "VPN veza %d"
-#: ../src/connection-editor/page-vpn.c:248
+#: ../src/connection-editor/page-vpn.c:250
msgid ""
"The VPN plugin failed to import the VPN connection correctly\n"
"\n"
@@ -2181,11 +2426,11 @@ msgstr ""
"\n"
"GreÅka: nije izabrana vrsta VPN servisa."
-#: ../src/connection-editor/page-vpn.c:273
+#: ../src/connection-editor/page-vpn.c:275
msgid "Choose a VPN Connection Type"
msgstr "Izbor vrste VPN veze"
-#: ../src/connection-editor/page-vpn.c:274
+#: ../src/connection-editor/page-vpn.c:276
msgid ""
"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 "
@@ -2195,83 +2440,84 @@ msgstr ""
"vrsta VPN veze koju Åelite da napravite ne pojavi na spisku, moÅda nemate "
"instaliran ispravan VPN prikljuÄak."
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:98
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here. Example: 00:11:22:33:44:55"
+msgstr ""
+"Ova opcija dodeljuje ovu vezu taÄki beÅiÄnog pristupa (AP) koja je navedena "
+"ovde unetim BSSID-om. Npr: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
#, c-format
msgid "default"
msgstr "osnovno"
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:219
#, c-format
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:464
-#| msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:473
msgid "Could not load Wi-Fi user interface."
msgstr "Ne mogu da uÄitam korisniÄko suÄelje za beÅiÄnu mreÅu."
-#: ../src/connection-editor/page-wifi.c:669
+#: ../src/connection-editor/page-wifi.c:650
#, c-format
-#| msgid "WiMAX connection %d"
msgid "Wi-Fi connection %d"
msgstr "BeÅiÄna veza %d"
#: ../src/connection-editor/page-wifi-security.c:265
-#| msgctxt "Wifi/wired security"
-#| msgid "None"
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "NiÅta"
#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:903
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "VEP 40/128-bitni kljuÄ"
#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:912
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
msgid "WEP 128-bit Passphrase"
msgstr "VEP 128-bitna lozinka"
#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:942
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
msgid "Dynamic WEP (802.1x)"
msgstr "DinamiÄki VEP (802.1x)"
#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:956
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
msgid "WPA & WPA2 Personal"
msgstr "LiÄni VPA & VPA2"
#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:970
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
msgid "WPA & WPA2 Enterprise"
msgstr "Poslovni VPA & VPA2"
-#: ../src/connection-editor/page-wifi-security.c:395
-#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:396
msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
msgstr ""
"Ne mogu da uÄitam bezbednosno korisniÄko suÄelje za beÅiÄnu mreÅu; nedostaju "
"podeÅavanja beÅiÄne mreÅe."
-#: ../src/connection-editor/page-wifi-security.c:405
-#| msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:407
msgid "Wi-Fi Security"
msgstr "BeÅiÄna bezbednost"
-#: ../src/connection-editor/page-wifi-security.c:407
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:409
msgid "Could not load Wi-Fi security user interface."
msgstr "Ne mogu da uÄitam bezbednosno korisniÄko suÄelje za beÅiÄnu mreÅu."
-#: ../src/connection-editor/page-wimax.c:160
+#: ../src/connection-editor/page-wimax.c:137
msgid "Could not load WiMAX user interface."
msgstr "Ne mogu da uÄitam korisniÄko suÄelje za ViMAKS."
-#: ../src/connection-editor/page-wimax.c:289
+#: ../src/connection-editor/page-wimax.c:233
#, c-format
msgid "WiMAX connection %d"
msgstr "ViMAKS veza %d"
@@ -2340,18 +2586,14 @@ msgstr ""
#: ../src/gnome-bluetooth/bt-widget.c:321
#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
msgid ""
"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
msgstr ""
-"Nije moguÄe podeÅavanje Blututa (nisam uspeo da se poveÅem na D-sabirnicu: (%"
-"s) %s)."
+"Nije moguÄe podeÅavanje Blututa (nisam uspeo da se poveÅem na D-sabirnicu: "
+"(%s) %s)."
#: ../src/gnome-bluetooth/bt-widget.c:330
#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
msgid ""
"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
msgstr ""
@@ -2365,63 +2607,68 @@ msgstr "Upotrebite mobilni telefon kao mreÅni ureÄaj (PAN/NAP)"
msgid "Access the Internet using your mobile phone (DUN)"
msgstr "Pristupite Internetu preko mobilnog telefona (DUN)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
#, c-format
msgid "Error: %s"
msgstr "GreÅka: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
#, c-format
msgid "Failed to create DUN connection: %s"
msgstr "Nisam uspeo da napravim DUN vezu: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:959
msgid "Your phone is now ready to use!"
msgstr "VaÅ telefon je spreman za upotrebu!"
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
msgid "Mobile wizard was canceled"
msgstr "Äarobnjak za mobilne ureÄaje je otkazan"
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
msgid "Unknown phone device type (not GSM or CDMA)"
msgstr "Nepoznat tip telefona (nije GSM ni CDMA)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
msgid "unknown modem type."
msgstr "nepoznat modem."
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
msgid "failed to connect to the phone."
msgstr "ne mogu da se poveÅem na telefon."
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
msgid "unexpectedly disconnected from the phone."
msgstr "neoÄekivan prekid veze sa telefonom."
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
msgid "timed out detecting phone details."
msgstr "isteklo je vreme za nalaÅenje podataka o telefonu."
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:791
msgid "Detecting phone configuration..."
msgstr "TraÅim podatke o telefonu..."
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:823
+#| msgid "Error editing connection"
+msgid "error getting bus connection"
+msgstr "greÅka dobavljanja veze sabirnice"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:920
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/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
#, c-format
msgid "Failed to create PAN connection: %s"
msgstr "Nisam uspeo da napravim PAN vezu: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:978
#, c-format
msgid "%s Network"
msgstr "%s mreÅa"
@@ -2442,27 +2689,27 @@ msgstr "Podaci o vezi"
msgid "Active Network Connections"
msgstr "Aktivne veze mreÅe"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
msgid ""
"Your mobile broadband connection is configured with the following settings:"
msgstr "VaÅa mobilna Åirokopojasna veza je podeÅena sa sledeÄim parametrima:"
#. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
msgid "Your Device:"
msgstr "VaÅ ureÄaj:"
#. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
msgid "Your Provider:"
msgstr "VaÅ povajder:"
#. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:236
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
msgid "Your Plan:"
msgstr "VaÅ plan:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
msgid ""
"A connection will now be made to your mobile broadband provider using the "
"settings you selected. If the connection fails or you cannot access network "
@@ -2475,23 +2722,23 @@ msgstr ""
"poveÅete na mreÅu, proverite ponovo uneta podeÅavanja. Za izmenu podeÅavanja, "
"izaberite âVeze sa mreÅomâ iz izbornika Sistem >> Postavke."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:273
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
msgid "Confirm Mobile Broadband Settings"
msgstr "Potvrdite mobilnu Åirokopojasnu vezu"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:337
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
msgid "Unlisted"
msgstr "Neizlistano"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:492
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
msgid "_Select your plan:"
msgstr "_Izaberi moj plan:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
msgid "Selected plan _APN (Access Point Name):"
msgstr "Izabrani _NTP plan (Naziv taÄke pristupa):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:540
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
"broadband account or may prevent connectivity.\n"
@@ -2504,67 +2751,67 @@ msgstr ""
"Ukoliko niste sigurni za naÄin plaÄanja zatraÅite APN plan od izdavaÄa "
"Internet usluge."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:547
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
msgid "Choose your Billing Plan"
msgstr "Izaberite plan naplate"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:596
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
msgid "My plan is not listed..."
msgstr "Moj plan nije na spisku..."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
msgid "Select your provider from a _list:"
msgstr "Izaberi izdavaÄa Internet usluga iz _spiska:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:766
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
msgid "Provider"
msgstr "DostavljaÄ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "Ne mogu da naÄem izdavaÄa i Åelim da ga unesem _ruÄno:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
msgid "Provider:"
msgstr "IzdavaÄ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "Moj izdavaÄ koristi GSM (GPRS, EDGE, UMTS, HSPA)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:832
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "Moj izdavaÄ koristi CDMA (1xRTT, EVDO)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:843
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
msgid "Choose your Provider"
msgstr "Izaberite izdavaÄa usluga"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
msgid "Country or Region List:"
msgstr "Spisak drÅava ili regiona:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
msgid "Country or region"
msgstr "DrÅava ili region"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
msgid "My country is not listed"
msgstr "Moja zemlja nije na spisku"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
msgid "Choose your Provider's Country or Region"
msgstr "Izaberite drÅavu ili region vaÅeg dostavljaÄa usluga"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
msgid "Installed GSM device"
msgstr "Instaliran GSM ureÄaj"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
msgid "Installed CDMA device"
msgstr "Instaliran CDMS ureÄaj"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
@@ -2572,97 +2819,120 @@ msgstr ""
"Ovaj Äarobnjak Äe vam pomoÄi da lako podesite mobilnu Åirokopojasnu vezi sa "
"3G mreÅom."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
msgid "You will need the following information:"
msgstr "Potrebni su vam sledeÄi podaci:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
msgid "Your broadband provider's name"
msgstr "Ime izdavaÄa Åirokopojasne usluge"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Your broadband billing plan name"
msgstr "Ime Åirokopojasnog plana naplate"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr ""
"(u nekim sluÄajevima) vaÅ plan Åirokopojasne naplate za APN (Naziv taÄke "
"pristupa)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1447
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
msgid "Create a connection for _this mobile broadband device:"
msgstr "Napravi vezu za _ovaj mobilni, Åirokopojasni ureÄaj:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
msgid "Any device"
msgstr "Bilo koji ureÄaj"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
msgid "Set up a Mobile Broadband Connection"
msgstr "Podesi mobilnu, Åirokopojasnu vezu"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
msgid "New Mobile Broadband Connection"
msgstr "Nova mobilna, Åirokopojasna veza"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:438
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+msgid "Wired"
+msgstr "ÅiÄana"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr "Blutut"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr "OLPC mreÅica"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:405
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:407
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
msgid "New..."
msgstr "Nova..."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
msgid "C_reate"
msgstr "_Napravi"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
#, c-format
-#| msgid ""
-#| "Passwords or encryption keys are required to access the wireless network "
-#| "'%s'."
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr ""
"Potrebne su lozinke ili kljuÄevi Åifrovanja za pristup beÅiÄnoj mreÅi â%sâ."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
-#| msgid "Wireless Network Authentication Required"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
msgid "Wi-Fi Network Authentication Required"
msgstr "Potrebno je potvrÄivanje identiteta za beÅiÄnu mreÅu"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
-#| msgid "Authentication required by wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
msgid "Authentication required by Wi-Fi network"
msgstr "BeÅiÄna mreÅa zahteva potvrÄivanje identiteta"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
-#| msgid "Create New Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
msgid "Create New Wi-Fi Network"
msgstr "Napravi novu beÅiÄnu mreÅu"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
-#| msgid "New wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
msgid "New Wi-Fi network"
msgstr "Nova beÅiÄna mreÅa"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
-#| msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "Unesite naziv za novu beÅiÄnu mreÅu."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
-#| msgid "Connect to Hidden Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
msgid "Connect to Hidden Wi-Fi Network"
msgstr "PoveÅi se na skrivenu beÅiÄnu mreÅu"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
-#| msgid "Hidden wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Hidden Wi-Fi network"
msgstr "Skrivena beÅiÄna mreÅa"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
-#| msgid ""
-#| "Enter the name and security details of the hidden wireless network you "
-#| "wish to connect to."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
msgid ""
"Enter the name and security details of the hidden Wi-Fi network you wish to "
"connect to."
@@ -2671,7 +2941,6 @@ msgstr ""
"da se poveÅete."
#: ../src/libnm-gtk/wifi.ui.h:2
-#| msgid "Wireless _security:"
msgid "Wi-Fi _security:"
msgstr "BeÅiÄna _bezbednost:"
@@ -2680,7 +2949,6 @@ msgid "C_onnection:"
msgstr "_Veza:"
#: ../src/libnm-gtk/wifi.ui.h:5
-#| msgid "Wireless _adapter:"
msgid "Wi-Fi _adapter:"
msgstr "BeÅiÄni _ureÄaj:"
@@ -2704,88 +2972,105 @@ msgstr ""
"Ovaj program nije namenjen za rad u liniji naredbi, veÄ je deo Gnomovog "
"radnog okruÅenja."
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
msgid "EVDO"
msgstr "EVDO"
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
msgid "GPRS"
msgstr "GPRS"
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
msgid "EDGE"
msgstr "EDGE"
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
msgid "UMTS"
msgstr "UMTS"
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
msgid "HSDPA"
msgstr "HSDPA"
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
msgid "HSUPA"
msgstr "HSUPA"
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
msgid "HSPA"
msgstr "HSPA"
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:72
+#| msgid "HSPA"
+msgid "HSPA+"
+msgstr "HSPA+"
+
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr "LTE"
+
+#: ../src/mb-menu-item.c:112
msgid "not enabled"
msgstr "nije omoguÄeno"
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
msgid "not registered"
msgstr "nije registrovan"
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
#, c-format
msgid "Home network (%s)"
msgstr "KuÄna mreÅa (%s)"
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
#, c-format
msgid "Home network"
msgstr "KuÄna mreÅa"
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
msgid "searching"
msgstr "pretraÅujem"
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
msgid "registration denied"
msgstr "registracija je odbijena"
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
#, c-format
msgid "%s (%s roaming)"
msgstr "%s (%s roming)"
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
#, c-format
msgid "%s (roaming)"
msgstr "%s (roming)"
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
#, c-format
msgid "Roaming network (%s)"
msgstr "MreÅa u romingu (%s)"
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
#, c-format
msgid "Roaming network"
msgstr "MreÅa u romingu"
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Podrazumevana"
+#: ../src/mobile-helpers.c:297
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "PIN kod za SIM karticu â%sâ na â%sâ"
+
+#: ../src/mobile-helpers.c:471
+msgid "PIN code required"
+msgstr "Potreban je PIN kÃd"
+
+#: ../src/mobile-helpers.c:479
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Potreban je PIN kod za povezivanje mobilnog Åirokopojasnog ureÄaja"
#. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:174
#, c-format
-#| msgid "Base Connection:"
msgid "%s connection"
msgstr "%s veza"
@@ -2794,10 +3079,6 @@ msgid "No Certificate Authority certificate chosen"
msgstr "Nije izabrano uverenje izdavaÄa ovlaÅÄenja"
#: ../src/wireless-security/eap-method.c:276
-#| msgid ""
-#| "Not using a Certificate Authority (CA) certificate can result in "
-#| "connections to insecure, rogue wireless networks. Would you like to "
-#| "choose a Certificate Authority certificate?"
msgid ""
"Not using a Certificate Authority (CA) certificate can result in connections "
"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate "
@@ -2874,7 +3155,7 @@ msgid "MD5"
msgstr "MD5"
#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
#: ../src/wireless-security/eap-method-ttls.c:350
msgid "Choose a Certificate Authority certificate..."
msgstr "Izaberite uverenje izdavaÄa ovlaÅÄenja..."
@@ -2901,11 +3182,11 @@ msgstr "PEAP _izdanje:"
msgid "As_k for this password every time"
msgstr "Uvek mi zatraÅi _lozinku"
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
msgid "Unencrypted private keys are insecure"
msgstr "NeÅifrovani privatni kljuÄevi nisu sigurni"
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
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 "
@@ -2919,11 +3200,11 @@ msgstr ""
"\n"
"(MoÅete zaÅtititi privatne kljuÄeve koristeÄi âopensslâ)"
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
msgid "Choose your personal certificate..."
msgstr "Izaberite liÄno uverenje..."
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
msgid "Choose your private key..."
msgstr "Izaberite liÄni kljuÄ..."
@@ -3012,60 +3293,3 @@ msgstr "P_rikaÅi kljuÄ"
#: ../src/wireless-security/ws-wep-key.ui.h:10
msgid "WEP inde_x:"
msgstr "VEP i_ndeks:"
-
-# bug: no plural forms
-#~ msgid "Wireless Networks (%s)"
-#~ msgstr "BeÅiÄne mreÅe (%s)"
-
-# bug: no plural forms
-#~ msgid "Wireless Network (%s)"
-#~ msgstr "BeÅiÄna mreÅa (%s)"
-
-# bug: no plural forms
-#~ msgid "Wireless Network"
-#~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "BeÅiÄna mreÅa"
-#~ msgstr[1] "BeÅiÄne mreÅe"
-#~ msgstr[2] "BeÅiÄne mreÅe"
-#~ msgstr[3] "BeÅiÄna mreÅa"
-
-#~ msgid "wireless is disabled"
-#~ msgstr "beÅiÄna mreÅa je onemoguÄena"
-
-#~ msgid "wireless is disabled by hardware switch"
-#~ msgstr "beÅiÄna mreÅa je iskljuÄena fiziÄkim prekidaÄem"
-
-#~ msgid "Preparing wireless network connection '%s'..."
-#~ msgstr "Pripremam vezu preko beÅiÄne mreÅe â%sâ..."
-
-#~ msgid "Configuring wireless network connection '%s'..."
-#~ msgstr "PodeÅavam vezu preko beÅiÄne mreÅe â%sâ..."
-
-#~ msgid "Requesting a wireless network address for '%s'..."
-#~ msgstr "Zahtevam adresu za beÅiÄnu mreÅu â%sâ..."
-
-#~ msgid "Wireless network connection '%s' active"
-#~ msgstr "Povezani ste preko beÅiÄne veze â%sâ"
-
-#~ msgid "Wired"
-#~ msgstr "ÅiÄana"
-
-#~ msgid "Wireless"
-#~ msgstr "BeÅiÄna"
-
-#~ msgid "Could not load Wired Security security user interface."
-#~ msgstr "Ne mogu da uÄitam bezbedno korisniÄko suÄelje ÅiÄane sigurnosti."
-
-#~ msgid "Wireless connection %d"
-#~ msgstr "BeÅiÄna veza %d"
-
-#~ msgid ""
-#~ "failed to find Bluetooth device (unknown gnome-bluetooth proxy object "
-#~ "type)."
-#~ msgstr ""
-#~ "nisam uspeo da pronaÄem blutut ureÄaj (nepoznata vrsta objekta posrednika "
-#~ "gnomovog blututa)."
-
-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr ""
-#~ "Nije moguÄe Blutut podeÅavanje (ne mogu da obrazujem D-Bas posrednika)."
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
