[network-manager-applet/nm-1-4] Update Russian translation



commit 6b43beb31b7d278e3dfe1b91ee8ff899d4adc652
Author: Stas Solovey <whats_up tut by>
Date:   Wed Mar 29 23:13:16 2017 +0000

    Update Russian translation

 po/ru.po | 2807 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1912 insertions(+), 895 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 4250f25..ee51f35 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,9 +12,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2014-09-23 01:32+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2017-03-24 14:31+0000\n"
+"PO-Revision-Date: 2017-03-30 01:39+0300\n"
 "Last-Translator: Stas Solovey <whats_up tut by>\n"
 "Language-Team: Русский <gnome-cyr gnome org>\n"
 "Language: ru\n"
@@ -22,10 +23,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3132
 msgid "Network"
 msgstr "Сеть"
 
@@ -132,70 +133,109 @@ msgstr ""
 "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
 "второго этапа аутентификации EAP."
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
-#, fuzzy
+#: ../nm-connection-editor.appdata.xml.in.h:1
 msgid "NetworkManager"
-msgstr "Апплет NetworkManager"
+msgstr "NetworkManager"
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-#, fuzzy
-msgid "NetworkManager for GNOME"
-msgstr "Апплет NetworkManager"
+#: ../nm-connection-editor.appdata.xml.in.h:2
+msgid "NetworkManager connection editor"
+msgstr "Редактор подключений NetworkManager"
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+#: ../nm-connection-editor.appdata.xml.in.h:3
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
+"NetworkManager — системная служба для управления и настройки сетевых "
+"подключений и устройств."
 
-#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+#: ../nm-connection-editor.appdata.xml.in.h:4
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
+"Программа nm-connection-editor работает с NetworkManager для создания и "
+"редактирования существующих профилей подключений для NetworkManager."
+
+#: ../nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Разработчики NetworkManager"
+
+#: ../shared/nm-utils/nm-shared-utils.c:185
+#, c-format
+msgid "object class '%s' has no property named '%s'"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:192
+#, c-format
+msgid "property '%s' of object class '%s' is not writable"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:199
+#, c-format
+msgid ""
+"construct property \"%s\" for object '%s' can't be set after construction"
+msgstr ""
 
+#: ../shared/nm-utils/nm-shared-utils.c:207
+#, c-format
+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:216
+#, c-format
+msgid "unable to set property '%s' of type '%s' from value of type '%s'"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:227
+#, c-format
+msgid ""
+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
+"type '%s'"
+msgstr ""
+
+#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Аутентификация 802.1X"
 
 #: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-new-connection.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-new-connection.ui.h:1
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отменить"
 
 #: ../src/8021x.ui.h:3
 msgid "C_onnect"
 msgstr "П_одключиться"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "_Network name:"
 msgstr "_Имя сети:"
 
 #: ../src/ap-menu-item.c:82
-#, fuzzy
 msgid "ad-hoc"
-msgstr "Ad-hoc"
+msgstr "ad-hoc"
 
 #: ../src/ap-menu-item.c:87
 msgid "secure."
-msgstr ""
+msgstr "безопасный."
 
 #: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Не удалось создать/включить соединение"
 
 #: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
-#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#: ../src/applet-device-wifi.c:1386 ../src/applet-device-wifi.c:1409
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
-#: ../src/applet-device-wifi.c:1470
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1389 ../src/applet-device-wifi.c:1412
 msgid "Connection failure"
 msgstr "Сбой подключения"
 
@@ -211,15 +251,15 @@ msgstr "Сбой при отключении"
 msgid "Connection activation failed"
 msgstr "Сбой при включении соединения"
 
-#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
-msgid "Don't show this message again"
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1126
+msgid "Don’t show this message again"
 msgstr "Больше не показывать это сообщение"
 
 #: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was "
+"The VPN connection “%s” failed because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
@@ -230,7 +270,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN неожиданно "
@@ -240,7 +280,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
+"The VPN connection “%s” failed because the VPN service returned invalid "
 "configuration."
 msgstr ""
 "\n"
@@ -251,7 +291,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку превышено время ожидания."
@@ -260,7 +300,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN не запустилась "
@@ -270,7 +310,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку не удалось запустить службу "
@@ -280,36 +320,35 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
 "Произошёл сбой соединения VPN «%s», поскольку не удалось найти подходящий "
-"ключ для VPN."
+"ключ VPN."
 
 #: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 "\n"
-"Не удалось установить VPN-соединение «%s», поскольку неверный ключ доступа к "
-"VPN."
+"Не удалось установить VPN-соединение «%s», неверный ключ доступа VPN."
 
 #: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed."
+"The VPN connection “%s” failed."
 msgstr ""
 "\n"
-"Произошёл сбой VPN-соединения «%s»."
+"Сбой VPN-соединения «%s»."
 
 #: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was "
+"The VPN connection “%s” disconnected because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
@@ -319,7 +358,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+"The VPN connection “%s” disconnected because the VPN service stopped."
 msgstr ""
 "\n"
 "VPN-соединение «%s» разорвано, поскольку служба VPN была остановлена."
@@ -328,7 +367,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected."
+"The VPN connection “%s” disconnected."
 msgstr ""
 "\n"
 "VPN-соединение «%s» разорвано."
@@ -360,7 +399,7 @@ msgstr "Сбой соединения VPN"
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"The VPN connection “%s” failed because the VPN service failed to start.\n"
 "\n"
 "%s"
 msgstr ""
@@ -374,7 +413,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed to start.\n"
+"The VPN connection “%s” failed to start.\n"
 "\n"
 "%s"
 msgstr ""
@@ -383,200 +422,201 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1280
+#: ../src/applet.c:1281
 msgid "device not ready (firmware missing)"
 msgstr "устройство не готово (нет прошивки)"
 
-#: ../src/applet.c:1282
+#: ../src/applet.c:1283
 msgid "device not ready"
 msgstr "устройство не готово"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1293 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "соединение разорвано"
 
-#: ../src/applet.c:1308
+#: ../src/applet.c:1309
 msgid "Disconnect"
 msgstr "Отключиться"
 
-#: ../src/applet.c:1322
+#: ../src/applet.c:1323
 msgid "device not managed"
 msgstr "устройство не управляется"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1396
 msgid "No network devices available"
 msgstr "Нет доступных сетевых устройств"
 
-#: ../src/applet.c:1449
+#: ../src/applet.c:1450
 msgid "_VPN Connections"
 msgstr "Соединения _VPN"
 
-#: ../src/applet.c:1503
-msgid "_Configure VPN..."
+#: ../src/applet.c:1494
+msgid "_Configure VPN…"
 msgstr "_Настроить VPN…"
 
-#: ../src/applet.c:1508
-msgid "_Disconnect VPN"
-msgstr "_Отключить VPN"
+#: ../src/applet.c:1497
+msgid "_Add a VPN connection…"
+msgstr "_Добавить VPN-соединение…"
 
-#: ../src/applet.c:1615
-msgid "NetworkManager is not running..."
+#: ../src/applet.c:1603
+msgid "NetworkManager is not running…"
 msgstr "Служба NetworkManager не запущена…"
 
-#: ../src/applet.c:1620 ../src/applet.c:2612
+#: ../src/applet.c:1608 ../src/applet.c:2632
 msgid "Networking disabled"
 msgstr "Поддержка сети отключена"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1830
+#: ../src/applet.c:1816
 msgid "Enable _Networking"
-msgstr "Управление _сетью"
+msgstr "Включить поддержку сети"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1839
+#: ../src/applet.c:1825
 msgid "Enable _Wi-Fi"
 msgstr "Включить _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1848
+#: ../src/applet.c:1834
 msgid "Enable _Mobile Broadband"
-msgstr "_Мобильная связь"
+msgstr "Включить _мобильную связь"
 
 #. Toggle notifications item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1846
 msgid "Enable N_otifications"
-msgstr "_Уведомлять о подключении"
+msgstr "Включить _уведомления"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1858
 msgid "Connection _Information"
 msgstr "C_ведения о соединении"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1880
-msgid "Edit Connections..."
+#: ../src/applet.c:1866
+msgid "Edit Connections…"
 msgstr "Изменить соединения…"
 
-#: ../src/applet.c:1894
+#: ../src/applet.c:1880
 msgid "_About"
 msgstr "_О программе"
 
-#: ../src/applet.c:2179
+#: ../src/applet.c:2165
 #, c-format
-msgid "You are now connected to '%s'."
+msgid "You are now connected to “%s”."
 msgstr "Вы подключены к сети «%s»."
 
-#: ../src/applet.c:2222
+#: ../src/applet.c:2208
 msgid "Disconnected"
 msgstr "Соединение разорвано"
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2209
 msgid "The network connection has been disconnected."
 msgstr "Сетевое соединение было разорвано."
 
-#: ../src/applet.c:2474
+#: ../src/applet.c:2495
 #, c-format
-msgid "Preparing network connection '%s'..."
+msgid "Preparing network connection “%s”…"
 msgstr "Подготовка сетевого соединения «%s»…"
 
-#: ../src/applet.c:2477
+#: ../src/applet.c:2498
 #, c-format
-msgid "User authentication required for network connection '%s'..."
+msgid "User authentication required for network connection “%s”…"
 msgstr "Для сетевого соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2501 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
-msgid "Requesting a network address for '%s'..."
+msgid "Requesting a network address for “%s”…"
 msgstr "Получение сетевого адреса для «%s»…"
 
-#: ../src/applet.c:2483
+#: ../src/applet.c:2504
 #, c-format
-msgid "Network connection '%s' active"
-msgstr "Сетевое соединение «%s» установлено"
+msgid "Network connection “%s” active"
+msgstr "Сетевое соединение «%s» активно"
 
-#: ../src/applet.c:2557
+#: ../src/applet.c:2577
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Устанавливается соединение VPN «%s»…"
+msgid "Starting VPN connection “%s”…"
+msgstr "Устанавливается VPN-соединение «%s»…"
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
+#: ../src/applet.c:2580
+#, fuzzy, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for VPN connection “%s”…"
 msgstr "Для VPN-соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2583
 #, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Получение адреса VPN для «%s»…"
+msgid "Requesting a VPN address for “%s”…"
+msgstr "Запрос адреса VPN для «%s»…"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2586
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN-соединение «%s» установлено"
+msgid "VPN connection active"
+msgstr "VPN-соединение активно"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2636
 msgid "No network connection"
 msgstr "Нет подключения к сети"
 
-#: ../src/applet.c:3204
+#: ../src/applet.c:3231
 msgid "NetworkManager Applet"
 msgstr "Апплет NetworkManager"
 
-#: ../src/applet-device-broadband.c:159
+#: ../src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Неправильный PUK-код, обратитесь к оператору сети."
 
-#: ../src/applet-device-broadband.c:201
+#: ../src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Неправильный PIN-код, обратитесь к оператору сети."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:252
-msgid "Sending unlock code..."
+#: ../src/applet-device-broadband.c:254
+msgid "Sending unlock code…"
 msgstr "Отправка кода разблокировки…"
 
-#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
-msgstr "Мобильное (%s)"
+msgstr "Мобильная связь (%s)"
 
-#: ../src/applet-device-broadband.c:736
-#: ../src/connection-editor/connection-helpers.c:100
+#: ../src/applet-device-broadband.c:738
+#: ../src/connection-editor/connection-helpers.c:107
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
-msgstr "Мобильные"
+msgstr "Мобильная связь"
 
-#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
 msgid "Available"
-msgstr "Доступные"
+msgstr "Доступно"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:801
-msgid "New Mobile Broadband connection..."
-msgstr "Новое мобильное соединение…"
+#: ../src/applet-device-broadband.c:803
+msgid "New Mobile Broadband connection…"
+msgstr "Создать подключение мобильной связи…"
 
-#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1307
 msgid "Connection Established"
 msgstr "Соединение установлено"
 
-#: ../src/applet-device-broadband.c:816
+#: ../src/applet-device-broadband.c:818
 msgid "You are now connected to the Mobile Broadband network."
-msgstr "Вы подключены к мобильной сети."
+msgstr "Вы подключены к сети мобильной связи."
 
-#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
 msgid "Mobile Broadband network."
-msgstr "Мобильная сеть"
+msgstr "Сеть мобильной связи."
 
-#: ../src/applet-device-broadband.c:957
+#: ../src/applet-device-broadband.c:959
 msgid "You are now registered on the home network."
 msgstr "Вы зарегистрированы в домашней сети."
 
-#: ../src/applet-device-broadband.c:963
+#: ../src/applet-device-broadband.c:965
 msgid "You are now registered on a roaming network."
 msgstr "Вы зарегистрированы в роуминговой сети."
 
@@ -585,179 +625,186 @@ msgid "You are now connected to the mobile broadband network."
 msgstr "Вы подключены к мобильной сети."
 
 #: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
-#, c-format
-msgid "Preparing mobile broadband connection '%s'..."
+#, fuzzy, c-format
+#| msgid "Preparing mobile broadband connection '%s'..."
+msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Подготовка мобильного соединения «%s»…"
 
 #: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
-#, c-format
-msgid "Configuring mobile broadband connection '%s'..."
+#, fuzzy, c-format
+#| msgid "Configuring mobile broadband connection '%s'..."
+msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Настройка мобильного соединения «%s»…"
 
 #: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
-#, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+#, fuzzy, c-format
+#| msgid "User authentication required for mobile broadband connection '%s'..."
+msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Для мобильного соединения «%s» требуется аутентификация…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
-#, c-format
-msgid "Mobile broadband connection '%s' active"
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#, fuzzy, c-format
+#| msgid "Mobile broadband connection '%s' active"
+msgid "Mobile broadband connection “%s” active"
 msgstr "Мобильное соединение «%s» установлено"
 
 #: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
-msgstr "Проводное (автоматически)"
+msgstr "Автоматический Ethernet"
 
 #: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
-msgstr "Проводные сети (%s)"
+msgstr "Сети Ethernet (%s)"
 
 #: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
-msgstr "Проводная сеть (%s)"
+msgstr "Сеть Ethernet (%s)"
 
 #: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
-msgstr "Проводные сети"
+msgstr "Сети Ethernet"
 
 #: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
-msgstr "Проводная сеть"
+msgstr "Сеть Ethernet"
 
 #: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
-msgstr "Вы подключены к проводной сети."
+msgstr "Вы подключены к сети ethernet."
 
 #: ../src/applet-device-ethernet.c:161
 #, c-format
-msgid "Preparing ethernet network connection '%s'..."
-msgstr "Подготовка проводного сетевого соединения «%s»…"
+msgid "Preparing ethernet network connection “%s”…"
+msgstr "Подготовка сетевого соединения ethernet «%s»…"
 
 #: ../src/applet-device-ethernet.c:164
 #, c-format
-msgid "Configuring ethernet network connection '%s'..."
-msgstr "Настройка проводного сетевого соединения «%s»…"
+msgid "Configuring ethernet network connection “%s”…"
+msgstr "Настройка сетевого соединения ethernet «%s»…"
 
 #: ../src/applet-device-ethernet.c:167
 #, c-format
-msgid "User authentication required for ethernet network connection '%s'..."
-msgstr "Для проводного сетевого соединения «%s» требуется аутентификация…"
+msgid "User authentication required for ethernet network connection “%s”…"
+msgstr "Для сетевого соединения ethernet «%s» требуется аутентификация…"
 
 #: ../src/applet-device-ethernet.c:170
 #, c-format
-msgid "Requesting an ethernet network address for '%s'..."
-msgstr "Получение адреса в проводной сети для «%s»…"
+msgid "Requesting an ethernet network address for “%s”…"
+msgstr "Получение адреса сетевого соединения ethernet для «%s»…"
 
 #: ../src/applet-device-ethernet.c:174
 #, c-format
-msgid "Ethernet network connection '%s' active"
-msgstr "Проводное сетевое соединение «%s» установлено"
+msgid "Ethernet network connection “%s” active"
+msgstr "Сетевое соединение ethernet «%s» активно"
 
 #: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Аутентификация DSL"
 
-#: ../src/applet-device-wifi.c:230
-msgid "_Connect to Hidden Wi-Fi Network..."
+#: ../src/applet-device-wifi.c:225
+msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Подключиться к скрытой сети Wi-Fi…"
 
-# перевод wifi как "беспроводная сеть" не подходит, так как bluetooth тоже беспроводная сеть
-#: ../src/applet-device-wifi.c:281
-msgid "Create _New Wi-Fi Network..."
+#: ../src/applet-device-wifi.c:276
+msgid "Create _New Wi-Fi Network…"
 msgstr "Создать _новую сеть Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:431
+#: ../src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../src/applet-device-wifi.c:901
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1407
+msgid "Failed to add new connection"
+msgstr "Не удалось добавить новое соединение"
+
+#: ../src/applet-device-wifi.c:537
+msgid "Insufficient privileges."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:838
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Сети Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:903
+#: ../src/applet-device-wifi.c:840
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Сеть Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:905
+#: ../src/applet-device-wifi.c:842
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Сеть Wi-Fi"
 msgstr[1] "Сети Wi-Fi"
-msgstr[2] "Сети Wi-Fi"
+msgstr[2] "Сетей Wi-Fi"
 
-#: ../src/applet-device-wifi.c:934
+#: ../src/applet-device-wifi.c:871
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi выключен"
 
-#: ../src/applet-device-wifi.c:935
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled by hardware switch"
-msgstr "Wi-Fi выключен аппаратно"
+msgstr "Wi-Fi выключен механическим переключателем"
 
-#: ../src/applet-device-wifi.c:996
+#: ../src/applet-device-wifi.c:933
 msgid "More networks"
 msgstr "Ещё сети"
 
-#: ../src/applet-device-wifi.c:1180
+#: ../src/applet-device-wifi.c:1122
 msgid "Wi-Fi Networks Available"
 msgstr "Доступны сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1181
+#: ../src/applet-device-wifi.c:1123
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Используйте меню сети для подключения к сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1364
+#: ../src/applet-device-wifi.c:1306
 #, c-format
-msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "Подключено к сети Wi-Fi «%s»."
+msgid "You are now connected to the Wi-Fi network “%s”."
+msgstr "Вы подключены к сети Wi-Fi «%s»."
 
-#: ../src/applet-device-wifi.c:1399
+#: ../src/applet-device-wifi.c:1341
 #, c-format
-msgid "Preparing Wi-Fi network connection '%s'..."
+msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Подготовка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1402
+#: ../src/applet-device-wifi.c:1344
 #, c-format
-msgid "Configuring Wi-Fi network connection '%s'..."
+msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Настройка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1405
+#: ../src/applet-device-wifi.c:1347
 #, c-format
-msgid "User authentication required for Wi-Fi network '%s'..."
-msgstr "Для соединения по Wi-Fi «%s» требуется аутентификация…"
+msgid "User authentication required for Wi-Fi network “%s”…"
+msgstr "Для соединения Wi-Fi «%s» требуется аутентификация…"
 
-#: ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:1350
 #, c-format
-msgid "Requesting a Wi-Fi network address for '%s'..."
-msgstr "Получение адреса в сети Wi-Fi для «%s»…"
+msgid "Requesting a Wi-Fi network address for “%s”…"
+msgstr "Запрос адреса сети Wi-Fi для «%s»…"
 
-#: ../src/applet-device-wifi.c:1419
+#: ../src/applet-device-wifi.c:1361
 #, c-format
-msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
-msgstr "Установлено сетевое соединение Wi-Fi «%s»: %s (%d%%)"
+msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
+msgstr "Сетевое соединение Wi-Fi «%s» активно: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1423
+#: ../src/applet-device-wifi.c:1365
 #, c-format
-msgid "Wi-Fi network connection '%s' active"
-msgstr "Установлено сетевое соединение Wi-Fi «%s»"
+msgid "Wi-Fi network connection “%s” active"
+msgstr "Сетевое соединение Wi-Fi «%s» активно"
 
-#: ../src/applet-device-wifi.c:1442
+#: ../src/applet-device-wifi.c:1384
 msgid "Failed to activate connection"
 msgstr "Не удалось включить соединение"
 
-#: ../src/applet-device-wifi.c:1465
-msgid "Failed to add new connection"
-msgstr "Не удалось добавить новое соединение"
-
 #: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Ошибка показа сведений о соединении:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
@@ -773,19 +820,18 @@ msgstr "WPA/WPA2"
 
 #. Create the expander
 #: ../src/applet-dialogs.c:151
-#, fuzzy
 msgid "More addresses"
-msgstr "Адреса"
+msgstr "Дополнительные адреса"
 
 #: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
 #: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:283
+#: ../src/connection-editor/page-wifi-security.c:330
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
-msgstr "Без проверки подлинности"
+msgstr "Нет"
 
 #: ../src/applet-dialogs.c:260
 #, c-format
@@ -848,9 +894,11 @@ msgstr "CDMA (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../src/connection-editor/page-general.c:347
+#: ../src/connection-editor/ce-page-team-port.ui.h:23
+#: ../src/connection-editor/ce-page-team.ui.h:48
+#: ../src/connection-editor/page-general.c:367
 msgid "General"
-msgstr "Общий"
+msgstr "Основное"
 
 #: ../src/applet-dialogs.c:516
 msgid "Interface:"
@@ -858,7 +906,7 @@ msgstr "Интерфейс:"
 
 #: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
-msgstr "MAC-адрес:"
+msgstr "Аппаратный адрес:"
 
 #. Driver
 #: ../src/applet-dialogs.c:550
@@ -875,6 +923,7 @@ msgstr "Защита:"
 
 #. --- IPv4 ---
 #: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -884,12 +933,13 @@ msgstr "Шлюз по умолчанию:"
 
 #. --- IPv6 ---
 #: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
 #: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
-msgstr "Игнорировать"
+msgstr "Игнорируется"
 
 #: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
@@ -921,14 +971,13 @@ msgid "No valid active connections found!"
 msgstr "Активные соединения отсутствуют!"
 
 #: ../src/applet-dialogs.c:985
-#, fuzzy
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"© 2004-2011 Red Hat, Inc.\n"
-"© 2005-2008 Novell, Inc.\n"
+"Авторское право © 2004-2014 Red Hat, Inc.\n"
+"Авторское право © 2005-2008 Novell, Inc.\n"
 "и многие другие участники сообщества и переводчики"
 
 #: ../src/applet-dialogs.c:988
@@ -942,135 +991,142 @@ msgstr ""
 msgid "NetworkManager Website"
 msgstr "Веб-сайт NetworkManager"
 
-#: ../src/applet-dialogs.c:1005
+#: ../src/applet-dialogs.c:1001
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"Апплет NetworkManager не смог найти некоторые необходимые ресурсы (не "
+"найден .ui-файл интерфейса)."
+
+#: ../src/applet-dialogs.c:1006
 msgid "Missing resources"
-msgstr "Компоненты приложения отсутствуют"
+msgstr "Отсутствуют ресурсы"
 
-#: ../src/applet-dialogs.c:1030
+#: ../src/applet-dialogs.c:1031
 msgid "Mobile broadband network password"
-msgstr "Пароль мобильной сети"
+msgstr "Пароль сети мобильной связи"
 
-#: ../src/applet-dialogs.c:1039
+#: ../src/applet-dialogs.c:1040
 #, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "Для подключения к сети «%s» требуется пароль."
+msgid "A password is required to connect to “%s”."
+msgstr "Для подключения к «%s» требуется пароль."
 
-#: ../src/applet-dialogs.c:1054
+#: ../src/applet-dialogs.c:1055
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN unlock required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1338
 msgid "SIM PIN Unlock Required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1340
 #, c-format
 msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"The mobile broadband device “%s” requires a SIM PIN code before it can be "
 "used."
-msgstr "Для работы мобильного устройства «%s» требуется PIN-код SIM."
+msgstr "Для работы устройства мобильной связи «%s» требуется PIN-код SIM."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1342
 msgid "PIN code:"
 msgstr "PIN-код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1346
 msgid "Show PIN code"
 msgstr "Показывать PIN-код"
 
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK unlock required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1349
 msgid "SIM PUK Unlock Required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1351
 #, c-format
 msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"The mobile broadband device “%s” requires a SIM PUK code before it can be "
 "used."
-msgstr "Для работы мобильного устройства «%s» требуется PUK-код SIM."
+msgstr "Для работы устройства мобильной связи «%s» требуется PUK-код SIM."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1352
+#: ../src/applet-dialogs.c:1353
 msgid "PUK code:"
 msgstr "PUK-код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1356
 msgid "New PIN code:"
 msgstr "Новый PIN-код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1357
+#: ../src/applet-dialogs.c:1358
 msgid "Re-enter new PIN code:"
 msgstr "Введите новый PIN-код ещё раз:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1362
+#: ../src/applet-dialogs.c:1363
 msgid "Show PIN/PUK codes"
-msgstr "Показывать PIN/PUK-коды:"
+msgstr "Показывать PIN/PUK-коды"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:2
 #: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
 msgid "_OK"
-msgstr ""
+msgstr "_ОК"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page.h:114
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"IP addresses identify your computer on the network. Click the “Add” button "
+"to add an IP address."
 msgstr ""
-"IP-адреса вашего компьютера в сети. Нажмите кнопку «Добавить» для добавления "
-"IP-адреса."
+"IP-адреса определяют ваш компьютер в сети. Нажмите кнопку «Добавить», чтобы "
+"добавить IP-адрес."
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:4
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
-msgstr ""
+msgstr "_Добавить"
 
 #. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-team.ui.h:15
+#: ../src/connection-editor/nm-connection-list.c:711
 msgid "_Delete"
 msgstr "_Удалить"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:6
 #: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
-msgstr "И_гнорировать автоматически полученные маршруты"
+msgstr "_Игнорировать автоматически полученные маршруты"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:7
 #: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
-msgstr "Использовать это соединение только для _ресурсов в этой сети"
+msgstr "Ис_пользовать это соединение только для ресурсов в этой сети"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:8
 #: ../src/connection-editor/ce-ip6-routes.ui.h:8
@@ -1081,24 +1137,15 @@ msgstr ""
 "Если включено, то это соединение никогда не будет использоваться как сетевое "
 "соединение по умолчанию."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1 ../src/libnma/wifi.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1 ../src/wireless-security/eap-method-fast.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
+#: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "C_reate…"
+msgstr "_Создать…"
 
 #: ../src/connection-editor/ce-new-connection.ui.h:3
-msgid "Create…"
-msgstr "Создать…"
-
-#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Выберите тип соединения"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:5
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1107,14 +1154,16 @@ msgid ""
 msgstr ""
 "Выберите тип создаваемого соединения.\n"
 "\n"
-"Отсутствие необходимого типа соединения может говорить о том, что в системе "
-"не установлен модуль VPN."
+"Если при создании VPN-соединения, оно не отображается в списке, возможно, не "
+"установлен соответствующий модуль VPN."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:21
 msgid "Round-robin"
 msgstr "Round-robin"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:22
 msgid "Active backup"
 msgstr "Active backup"
 
@@ -1123,6 +1172,7 @@ msgid "XOR"
 msgstr "XOR"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:20
 msgid "Broadcast"
 msgstr "Broadcast"
 
@@ -1152,15 +1202,15 @@ msgid "Bonded _connections:"
 msgstr "Агрегированные (bond) _соединения:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
 msgstr "_Режим:"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:5
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/ce-page-team.ui.h:14
+#: ../src/connection-editor/nm-connection-list.c:695
 msgid "_Edit"
 msgstr "_Изменить"
 
@@ -1174,7 +1224,7 @@ msgstr "мс"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: ../src/connection-editor/ce-page-team.ui.h:16
 msgid "_Interface name:"
 msgstr "_Интерфейс:"
 
@@ -1215,7 +1265,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
@@ -1224,7 +1274,7 @@ msgstr "_MTU:"
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
 #: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
@@ -1260,9 +1310,8 @@ msgid "s"
 msgstr "с"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
-#, fuzzy
 msgid "Enable I_GMP snooping"
-msgstr "Управление _сетью"
+msgstr "Включить I_GMP snooping"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
@@ -1276,11 +1325,11 @@ msgstr "_Максимальное время жизни сообщения:"
 msgid "_Aging time:"
 msgstr "_Время жизни сообщения:"
 
-#: ../src/connection-editor/ce-page.c:78
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматически"
 
-#: ../src/connection-editor/ce-page.c:86
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1289,53 +1338,105 @@ msgstr "автоматически"
 msgid "default"
 msgstr "по умолчанию"
 
-#: ../src/connection-editor/ce-page.c:132
+#: ../src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:294
+msgid "Preserve"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:295
+msgid "Permanent"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:296
+msgid "Random"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:297
+#, fuzzy
+#| msgid "Enable"
+msgid "Stable"
+msgstr "Включить"
+
+#: ../src/connection-editor/ce-page.c:301
+#, fuzzy
+#| msgid ""
+#| "The MAC address entered here will be used as hardware address for the "
+#| "network device this connection is activated on.  This feature is known as "
+#| "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on. This feature is known as MAC "
+"cloning or spoofing. Example: 00:11:22:33:44:55"
+msgstr ""
+"Введённый MAC-адрес будет использоваться в качестве адреса сетевого "
+"устройства, на котором включено это соединение. Эта возможность известна как "
+"клонирование MAC-адреса или подмена (spoofing). Пример: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ce-page.c:248
+#: ../src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:252
-#: ../src/connection-editor/ce-page.c:484
+#: ../src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:268
+#: ../src/connection-editor/ce-page.c:388
 #, c-format
-msgid "invalid interface-name for %s (%s)"
+msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:272
-#, c-format
-msgid "invalid interface-name (%s)"
+#: ../src/connection-editor/ce-page.c:392
+#, fuzzy, c-format
+msgid "invalid interface-name (%s): "
+msgstr "_Имя интерфейса VLAN:"
+
+#: ../src/connection-editor/ce-page.c:571
+msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:485
+#: ../src/connection-editor/ce-page.c:589
 #, fuzzy
+#| msgid "Hardware Address:"
+msgid "invalid hardware address"
+msgstr "MAC-адрес:"
+
+#: ../src/connection-editor/ce-page.c:611
+#, c-format
+msgid "invalid %s (%s): "
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:612
+#: ../src/connection-editor/ce-page.c:617
 msgid "device"
-msgstr "Любое устройство"
+msgstr "устройство"
+
+#: ../src/connection-editor/ce-page.c:616
+#, c-format
+msgid "invalid %s (%s) "
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:591
+#: ../src/connection-editor/ce-page.c:725
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Внутренняя ошибка обновления ключей."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
 #, fuzzy
-msgid "Use Data Center Bridging (DCB) for this connection"
+msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Использовать защиту 802.1_X для этого соединения"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:2
@@ -1375,7 +1476,7 @@ msgid "Priority"
 msgstr "Приоритет"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:11
-msgid "Options..."
+msgid "Options…"
 msgstr "Параметры…"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:12
@@ -1383,138 +1484,99 @@ msgid "Priority Groups"
 msgstr "Группы приоритетов"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:14
-msgid "0"
-msgstr "0"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
-msgid "1"
-msgstr "1"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
-msgid "5"
-msgstr "5"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "6"
-msgstr "6"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "7"
-msgstr "7"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "Traffic Class:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "Strict Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 #, fuzzy
 msgid "Priority Bandwidth:"
 msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "Group Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "Group ID:"
 msgstr "ID группы:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:42
-msgid "15"
-msgstr "15"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 #, no-c-format
 msgid ""
-"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:47
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:48
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
@@ -1533,7 +1595,6 @@ msgstr "С_лужба:"
 #: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/eap-method-tls.ui.h:7
 #: ../src/wireless-security/ws-leap.ui.h:3
 #: ../src/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
@@ -1553,10 +1614,11 @@ msgstr "_Пароль:"
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:135
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:136
+#: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -1593,57 +1655,52 @@ msgid "10 Gb/s"
 msgstr "10 Гбит/с"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "Half"
+msgstr "Половина"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:11
-msgid "_Speed:"
-msgstr "_Скорость:"
+msgid "Full"
+msgstr "Полный"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-msgid "Full duple_x"
-msgstr "Полный _дуплекс"
+#: ../src/connection-editor/page-ip6.c:149
+msgid "Ignore"
+msgstr "Игнорировать"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "_Автосогласование"
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
+#: ../src/connection-editor/page-ip4.c:168
+#: ../src/connection-editor/page-ip6.c:185
+msgid "Manual"
+msgstr "Вручную"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:14
+msgid "_Port:"
+msgstr "_Порт:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
 #: ../src/connection-editor/ce-page-infiniband.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
-#, fuzzy
 msgid "_Device:"
-msgstr "С_лужба:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
-msgid "C_loned MAC address:"
-msgstr "_Клонированный MAC-адрес:"
+msgstr "_Устройство"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
 #: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid ""
-"The MAC address entered here will be used as hardware address for the "
-"network device this connection is activated on.  This feature is known as "
-"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
-msgstr ""
-"Введённый MAC-адрес будет использоваться в качестве адреса сетевого "
-"устройства, на котором включено это соединение. Эта возможность известна как "
-"клонирование MAC-адреса или подмена (spoofing). Пример: 00:11:22:33:44:55"
+msgid "C_loned MAC address:"
+msgstr "_Клонированный MAC-адрес:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:19
 msgid "Wake on LAN:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#, fuzzy
 msgid "De_fault"
-msgstr "По умолчанию"
+msgstr "По у_молчанию"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
-#, fuzzy
 msgid "_Ignore"
-msgstr "Игнорировать"
+msgstr "_Игнорировать"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
@@ -1680,6 +1737,39 @@ msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+msgid "Lin_k negotiation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+msgid ""
+"Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
+"will be forced without checking the device compatibility. If unsure, leave "
+"here “Ignore” or pick “Automatic”."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+msgid "_Speed:"
+msgstr "_Скорость:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+msgid ""
+"Speed value for static link negotiation, required only when “Ignore” and "
+"“Automatic” options are not selected. Before specifying a speed value be "
+"sure your device supports it."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+msgid "Duple_x:"
+msgstr "_Дуплекс:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+msgid ""
+"Duplex value for static link negotiation, required only when “Ignore” and "
+"“Automatic” options are not selected. Before specifying a duplex mode be "
+"sure your device supports it."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
 msgstr "Автоматически подключаться к _VPN при использовании этого соединения"
@@ -1693,8 +1783,55 @@ msgid "_Automatically connect to this network when it is available"
 msgstr "_Автоматически подключаться к этой сети, когда она доступна"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
+#, fuzzy
+#| msgid "Connection _Information"
+msgid "Connection _priority for auto-activation:"
+msgstr "C_ведения о соединении"
+
+#: ../src/connection-editor/ce-page-general.ui.h:5
+msgid ""
+"Connection priority for automatic activation. Connections with higher "
+"numbers are preferred when selecting profiles for automatic activation. "
+"Default value is 0."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:6
 msgid "Firewall _zone:"
-msgstr "_Зона брандмауэра:"
+msgstr "_Зона межсетевого экрана:"
+
+#: ../src/connection-editor/ce-page.h:111
+#, fuzzy
+#| msgid ""
+#| "IP addresses identify your computer on the network.  Click the \"Add\" "
+#| "button to add an IP address."
+msgid ""
+"IP addresses identify your computer on the network. Click the “Add” button "
+"to add static IP address to be configured in addition to the automatic ones."
+msgstr ""
+"IP-адреса вашего компьютера в сети. Нажмите кнопку «Добавить» для добавления "
+"IP-адреса."
+
+#: ../src/connection-editor/ce-page.h:116
+msgid ""
+"The IP address identify your computer on the network and determines the "
+"address range distributed to other computers. Click the “Add” button to add "
+"an IP address. If no address is provided, range will be determined "
+"automatically."
+msgstr ""
+
+#: ../src/connection-editor/ce-page.h:121
+#, fuzzy
+#| msgid "Automatic, addresses only"
+msgid "Additional static addresses"
+msgstr "Автоматически, только адреса"
+
+#: ../src/connection-editor/ce-page.h:122
+msgid "Addresses"
+msgstr "Адреса"
+
+#: ../src/connection-editor/ce-page.h:123
+msgid "Address (optional)"
+msgstr "Адрес (опционально)"
 
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
@@ -1710,18 +1847,80 @@ msgstr "Дейтаграмма"
 msgid "Connected"
 msgstr "Подключено"
 
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+msgid "IPIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+msgid "GRE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+msgid "SIT"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+msgid "ISATAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+msgid "VTI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+msgid "IP6IP6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+msgid "IPIP6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+msgid "IP6GRE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+msgid "VTI6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+msgid "Device name"
+msgstr "Имя устройства"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#, fuzzy
+msgid "Parent device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+msgid "Mode"
+msgstr "Режим"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+msgid "Local IP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+msgid "Remote IP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+msgid "Input key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+msgid "Output key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+msgid "MTU"
+msgstr "MTU"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
 msgstr "Автоматически, с ручными параметрами DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:166
-#: ../src/connection-editor/page-ip6.c:184
-msgid "Manual"
-msgstr "Вручную"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:4
 #: ../src/connection-editor/ce-page-ip6.ui.h:4
 msgid "Link-Local"
@@ -1729,8 +1928,8 @@ msgstr "Локальная связь"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:186
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:188
+#: ../src/connection-editor/page-ip6.c:205
 msgid "Shared to other computers"
 msgstr "Общий с другими компьютерами"
 
@@ -1739,23 +1938,23 @@ msgstr "Общий с другими компьютерами"
 msgid "_Method:"
 msgstr "_Способ настройки:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-msgid "Addresses"
-msgstr "Адреса"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#, fuzzy
+#| msgid ""
+#| "The DHCP client identifier allows the network administrator to customize "
+#| "your computer's configuration.  If you wish to use a DHCP client "
+#| "identifier, enter it here."
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
-"your computer's configuration.  If you wish to use a DHCP client identifier, "
+"your computer’s configuration. If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
 "Идентификатор клиента DHCP позволяет сетевому администратору определить "
 "настройки доступа к сети специально для вашего компьютера. Если у вас "
 "используется такой идентификатор, введите его."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1763,25 +1962,25 @@ msgstr ""
 "Домены, используемые для разрешения имён узлов. Можно указать несколько "
 "доменов через запятую."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
 msgstr "ID _клиента DHCP:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:308
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/page-ip4.c:372
+#: ../src/connection-editor/page-ip6.c:335
 msgid "S_earch domains:"
 msgstr "_Поисковый домен:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:297
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/page-ip4.c:363
+#: ../src/connection-editor/page-ip6.c:326
 msgid "DNS ser_vers:"
 msgstr "Серверы _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1789,11 +1988,11 @@ msgstr ""
 "IP-адреса DNS-серверов используются для разрешения имён узлов. Можно указать "
 "несколько DNS-серверов через запятую."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Требовать адресацию IPv_4 для этого соединения"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1801,13 +2000,13 @@ msgstr ""
 "При подключении к сетям с возможностями IPv6: разрешает установить "
 "соединение в случае сбоя конфигурации IPv4, но успеха конфигурации IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "_Routes…"
 msgstr "_Маршруты…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:196
+#: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Выключено"
 
@@ -1819,7 +2018,7 @@ msgstr ""
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1829,15 +2028,15 @@ msgstr ""
 "IP-адреса DNS-серверов используются для разрешения имён узлов. Можно указать "
 "несколько DNS-серверов через запятую."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "IPv6 _privacy extensions:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Требовать адресацию IPv_6 для этого соединения"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1846,6 +2045,7 @@ msgstr ""
 "соединение в случае сбоя конфигурации IPv6, но успеха конфигурации IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
 msgstr "Основные параметры"
 
@@ -1866,7 +2066,7 @@ msgid "N_etwork ID:"
 msgstr "Идентификатор с_ети:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "Change..."
+msgid "Change…"
 msgstr "Изменить…"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
@@ -1929,23 +2129,520 @@ msgstr "Эхо"
 msgid "Send PPP _echo packets"
 msgstr "Посылать _эхо-пакеты PPP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:2
-msgid "_JSON config:"
+#: ../src/connection-editor/ce-page-proxy.ui.h:1
+msgid "Method:"
+msgstr "Метод:"
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:25
+msgid "None"
+msgstr "Нет"
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
+msgid "For browser only"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
+msgid "Use this proxy configuration for only browser clients/schemes."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC URL:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:7
+msgid "URL from where the PAC script is to be obtained."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:8
+msgid "PAC script:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#, fuzzy
+#| msgid "_Import team configuration from a file..."
+msgid "Import script from a file…"
+msgstr "_Импортировать параметры агрегированного подключения (Team) из файла…"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:19
+msgid "Ad_vanced…"
+msgstr "_Дополнительно…"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-msgid "_Import team configuration from a file..."
+msgid "Set by master"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:9
+#, fuzzy
+#| msgid "Ethernet Networks"
+msgid "Ethernet port state"
+msgstr "Проводные сети"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:10
+msgid "ARP (IPv4)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:11
+msgid "NDP (IPv6)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:37
+msgid "Team Advanced Options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:7
+msgid "_Queue ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:42
+msgid ""
+"Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
+"port is enabled or disabled."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:9
+msgid "ID of queue which this port should be mapped to."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#, fuzzy
+#| msgid "_Priority:"
+msgid "_Port priority:"
+msgstr "_Приоритет:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
+msgid "Port _sticky"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:12
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: ../src/connection-editor/ce-page-team.ui.h:44
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of notify-peer packets."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port priority. The higher number means higher priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:15
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#, fuzzy
+#| msgid "_Priority:"
+msgid "_LACP port priority:"
+msgstr "_Приоритет:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#, fuzzy
+#| msgid "Private _key:"
+msgid "LACP port _key:"
+msgstr "Секретный _ключ:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team.ui.h:43
+msgid ""
+"Number of bursts of multicast group rejoin requests sent after port is "
+"enabled or disabled."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
+msgid ""
+"Port priority according to LACP standard. The lower number means higher "
+"priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team.ui.h:45
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of multicast group rejoin requests."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
+msgid ""
+"Port key according to LACP standard. It is only possible to aggregate ports "
+"with the same key."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:24
+#: ../src/connection-editor/ce-page-team.ui.h:70
+msgid "_Link watcher:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:25
+#: ../src/connection-editor/ce-page-team.ui.h:71
+#, fuzzy
+#| msgid "Link _up delay:"
+msgid "_Up delay:"
+msgstr "Задержка _установления соединения:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:26
+#: ../src/connection-editor/ce-page-team.ui.h:72
+#, fuzzy
+#| msgid "Link _down delay:"
+msgid "_Down delay:"
+msgstr "Задержка _разрыва соединения:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:27
+#: ../src/connection-editor/ce-page-team.ui.h:73
+#, fuzzy
+#| msgid "_Parent interface:"
+msgid "Send _interval:"
+msgstr "_Родительский интерфейс:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:28
+#: ../src/connection-editor/ce-page-team.ui.h:74
+msgid "Delay _before first send:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:29
+#: ../src/connection-editor/ce-page-team.ui.h:75
+msgid "_Maximum missed replies:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:30
+#: ../src/connection-editor/ce-page-team.ui.h:76
+msgid "_Source host:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:31
+#: ../src/connection-editor/ce-page-team.ui.h:77
+#, fuzzy
+#| msgid "ARP _targets:"
+msgid "_Target host:"
+msgstr "_Получатели ARP:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:32
+#: ../src/connection-editor/ce-page-team.ui.h:78
+msgid ""
+"Maximum number of missed replies. If this number is exceeded, link is "
+"reported as down."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:33
+#: ../src/connection-editor/ce-page-team.ui.h:79
+msgid ""
+"Hostname to be converted to IP address which will be filled into ARP request "
+"as source address."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:34
+#: ../src/connection-editor/ce-page-team.ui.h:80
+msgid ""
+"Hostname to be converted to IP address which will be filled into request as "
+"destination address."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:35
+#: ../src/connection-editor/ce-page-team.ui.h:81
+msgid "Ignore invalid packets from _active ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../src/connection-editor/ce-page-team.ui.h:83
+msgid "Ignore invalid packets from i_nactive ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team.ui.h:84
+msgid ""
+"Validate received ARP packets on inactive ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team.ui.h:85
+msgid "S_end on inactive ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team.ui.h:86
+msgid ""
+"By default, ARP requests are sent on active ports only. This option allows "
+"sending even on inactive ports."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team.ui.h:87
+msgid ""
+"The delay between the link coming up and the runner being notified about it."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team.ui.h:88
+msgid ""
+"The delay between the link going down and the runner being notified about it."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team.ui.h:89
+msgid "The interval between requests being sent."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team.ui.h:90
+msgid ""
+"The delay between link watch initialization and the first request being sent."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team.ui.h:91
+msgid "The link watcher to be used."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team.ui.h:92
+msgid "Link Watcher"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team.ui.h:93
+#, fuzzy
+msgid "Im_port team configuration from a file…"
 msgstr "_Импортировать параметры агрегированного подключения (Team) из файла…"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team.ui.h:94
+msgid "Edit _JSON configuration:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team.ui.h:95
+msgid "Raw Configuration"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "Highest priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "Highest priority (stable)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Bandwidth"
+msgstr "_Приоритет:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:4
+msgid "Highest number of ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#, fuzzy
+#| msgid "Priority"
+msgid "Port priority"
+msgstr "Приоритет"
+
+#: ../src/connection-editor/ce-page-team.ui.h:6
+#, fuzzy
+msgid "From the team device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/ce-page-team.ui.h:7
+msgid "From the active port"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:8
+msgid "From active to team device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
 msgstr "_Агрегированные подключения (Team):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:23
+msgid "Load balance"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:24
+msgid "LACP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:27
+#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/page-ethernet.c:351
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/ce-page-team.ui.h:28
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/ce-page-team.ui.h:31
+msgid "IP"
+msgstr "IP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:32
+msgid "Any L3 protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:33
+msgid "TCP"
+msgstr "TCP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:34
+msgid "UDP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:35
+msgid "SCTP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:36
+msgid "Any L4 protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:38
+msgid "_Peer notification count:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:39
+msgid "Peer _notification interval:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:40
+msgid "_Multicast rejoin count:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:41
+msgid "Multicast _rejoin interval:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:46
+msgid "_Hardware Address:"
+msgstr "_Аппаратный адрес:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:47
+msgid ""
+"Desired hardware address of new team device. Usual MAC address format is "
+"accepted."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:49
+msgid "_Runner:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:50
+msgid "_Hardware address policy:"
+msgstr "_Политика аппаратных адресов:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:51
+msgid "Name of runner to be used."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:52
+msgid ""
+"This defines the policy of how hardware addresses of team device and port "
+"devices should be set during the team lifetime."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:53
+msgid "Send LACPDU frames _periodically"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:54
+msgid ""
+"If checked, LACPDU frames are sent along the configured links periodically. "
+"If not, it acts as “speak when spoken to”."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:55
+msgid "Send a LACPDU frame _every second"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:56
+msgid ""
+"Option specifies the rate at which our link partner is asked to transmit "
+"LACPDU packets. If checked, packets will be sent once per second. Otherwise "
+"they will be sent every 30 seconds."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:57
 #, fuzzy
-msgid "Im_port team configuration from a file..."
-msgstr "_Импортировать параметры агрегированного подключения (Team) из файла…"
+#| msgid "_Priority:"
+msgid "_System priority:"
+msgstr "_Приоритет:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:58
+msgid "_Minimum ports:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:59
+msgid "_Aggregator selection policy:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:60
+msgid "System priority, value can be 0 – 65535."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:61
+msgid ""
+"Specifies the minimum number of ports that must be active before asserting "
+"carrier in the master interface, value can be 1 – 255."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:62
+msgid "This selects the policy of how the aggregators will be selected."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:63
+msgid ""
+"List of fragment types (strings) which should be used for packet Tx hash "
+"computation."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:64
+msgid "_Fields for transmission hash"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:65
+msgid "In tenths of a second. Periodic interval between rebalancing."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:66
+msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:67
+#, fuzzy
+#| msgid "Transmission po_wer:"
+msgid "Transmission _balancing interval:"
+msgstr "Мо_щность передачи:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:68
+#, fuzzy
+#| msgid "Transmission po_wer:"
+msgid "_Transmission balancer:"
+msgstr "Мо_щность передачи:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:69
+msgid "Runner"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2013,41 +2710,42 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Hotspot"
-msgstr ""
+msgstr "Точка доступа"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "Мо_щность передачи:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
 msgstr "Мбит/c"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#, fuzzy
 msgid "_Rate:"
 msgstr "Скорость:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 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 "_Канал:"
 
-#: ../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:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
@@ -2100,165 +2798,208 @@ msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol версии 2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#, fuzzy
+#| msgid ""
+#| "In most cases, the provider's PPP servers will support all authentication "
+#| "methods.  If connections fail, try disabling support for some methods."
 msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+"In most cases, the provider’s PPP servers will support all authentication "
+"methods. If connections fail, try disabling support for some methods."
 msgstr ""
 "В большинстве случаев PPP-серверы провайдера поддерживают любой метод "
 "аутентификации. Если же соединение не устанавливается, попробуйте выключить "
 "поддержку некоторых методов."
 
-#: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:326
-#: ../src/libnm-gtk/nm-ui-utils.c:321
-msgid "Ethernet"
-msgstr "Ethernet"
-
-#: ../src/connection-editor/connection-helpers.c:98
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/connection-helpers.c:113
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
-msgstr "Агрегированное (Bond)"
+msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:117
+#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
-msgstr "Агрегированное (Team)"
+msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bridge.c:210
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-bridge.c:212
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
-msgid "VLAN"
-msgstr "VLAN"
+#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/page-ip-tunnel.c:176
+msgid "IP tunnel"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/connection-helpers.c:254
-#: ../src/connection-editor/page-vpn.c:101
+#: ../src/connection-editor/connection-helpers.c:122
+#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:196
+#: ../src/connection-editor/connection-helpers.c:205
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+"Модулю VPN не удалось правильно импортировать VPN-соединение\n"
+"\n"
+"Ошибка: тип службы VPN не поддерживается."
+
+#: ../src/connection-editor/connection-helpers.c:217
+msgid "Cannot import VPN connection"
+msgstr "Не удалось импортировать VPN-соединение"
+
+#: ../src/connection-editor/connection-helpers.c:219
+#, fuzzy, c-format
+#| msgid ""
+#| "The file '%s' could not be read or does not contain recognized VPN "
+#| "connection information\n"
+#| "\n"
+#| "Error: %s."
+msgid ""
+"The file “%s” could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
+msgstr ""
+"Файл «%s» не может быть прочитан или не содержит распознаваемые данные о VPN-"
+"соединении.\n"
+"\n"
+"Ошибка: %s."
+
+#: ../src/connection-editor/connection-helpers.c:220
+#, fuzzy
+msgid "unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/page-proxy.c:118
+#: ../src/connection-editor/page-team.c:341
+#: ../src/connection-editor/page-team-port.c:203
+msgid "Select file to import"
+msgstr "Выбор файла для импортирования"
+
+#: ../src/connection-editor/connection-helpers.c:338
 msgid "Hardware"
 msgstr "Физическое"
 
-#: ../src/connection-editor/connection-helpers.c:223
+#: ../src/connection-editor/connection-helpers.c:365
 msgid "Virtual"
 msgstr "Логическое"
 
-#: ../src/connection-editor/connection-helpers.c:292
-#: ../src/connection-editor/connection-helpers.c:294
-msgid "Import a saved VPN configuration..."
+#: ../src/connection-editor/connection-helpers.c:514
+#: ../src/connection-editor/connection-helpers.c:516
+#, fuzzy
+#| msgid "Import a saved VPN configuration..."
+msgid "Import a saved VPN configuration…"
 msgstr "Импортировать сохранённые параметры VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:323
+#: ../src/connection-editor/connection-helpers.c:546
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Не удалось создать диалог редактора соединений из-за внутренней ошибки."
 
-#: ../src/connection-editor/connection-helpers.c:332
+#: ../src/connection-editor/connection-helpers.c:555
 msgid "Could not create new connection"
 msgstr "Не удалось создать новое соединение"
 
-#: ../src/connection-editor/connection-helpers.c:469
+#: ../src/connection-editor/connection-helpers.c:718
 msgid "Connection delete failed"
 msgstr "Не удалось удалить соединение"
 
-#: ../src/connection-editor/connection-helpers.c:517
+#: ../src/connection-editor/connection-helpers.c:766
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Удалить соединение «%s»?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:804
-#: ../src/connection-editor/ip6-routes-dialog.c:746
-#: ../src/connection-editor/page-ip4.c:1068
-#: ../src/connection-editor/page-ip6.c:1066
+#: ../src/connection-editor/ip4-routes-dialog.c:697
+#: ../src/connection-editor/ip6-routes-dialog.c:718
+#: ../src/connection-editor/page-ip4.c:1136
+#: ../src/connection-editor/page-ip6.c:1095
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:823
-#: ../src/connection-editor/page-ip4.c:1087
+#: ../src/connection-editor/ip4-routes-dialog.c:716
+#: ../src/connection-editor/page-ip4.c:1155
 msgid "Netmask"
 msgstr "Маска сети"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:842
-#: ../src/connection-editor/ip6-routes-dialog.c:784
-#: ../src/connection-editor/page-ip4.c:1106
-#: ../src/connection-editor/page-ip6.c:1104
+#: ../src/connection-editor/ip4-routes-dialog.c:735
+#: ../src/connection-editor/ip6-routes-dialog.c:756
+#: ../src/connection-editor/page-ip4.c:1174
+#: ../src/connection-editor/page-ip6.c:1133
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:861
-#: ../src/connection-editor/ip6-routes-dialog.c:803
+#: ../src/connection-editor/ip4-routes-dialog.c:754
+#: ../src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:765
-#: ../src/connection-editor/page-ip6.c:1085
+#: ../src/connection-editor/ip6-routes-dialog.c:737
+#: ../src/connection-editor/page-ip6.c:1114
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: ../src/connection-editor/nm-connection-editor.c:108
 #, c-format
 msgid "Editing %s"
 msgstr "Изменение %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:112
 msgid "Editing un-named connection"
 msgstr "Изменение безымянного соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: ../src/connection-editor/nm-connection-editor.c:132
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Название соединения:"
 
-#: ../src/connection-editor/nm-connection-editor.c:187
+#: ../src/connection-editor/nm-connection-editor.c:352
 #, fuzzy
-msgid "Editor initializing..."
+msgid "Editor initializing…"
 msgstr "Ошибка инициализации редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:194
-#: ../src/connection-editor/nm-connection-list.c:397
+#: ../src/connection-editor/nm-connection-editor.c:359
+#: ../src/connection-editor/nm-connection-list.c:408
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Сбой добавления соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:207
+#: ../src/connection-editor/nm-connection-editor.c:374
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:283
+#: ../src/connection-editor/nm-connection-editor.c:450
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2266,55 +3007,99 @@ msgstr ""
 "Редактор соединений не может найти некоторые необходимые ресурсы (не найден "
 "файл glade)."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:577
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:578
 msgid "Save any changes made to this connection."
 msgstr "Сохранить параметры соединения."
 
-#: ../src/connection-editor/nm-connection-editor.c:421
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Введите пароль администратора для того, чтобы сделать это соединение общим "
 "для всех пользователей компьютера."
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:595
 msgid "Could not create connection"
 msgstr "Не удалось создать соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:595
 msgid "Could not edit connection"
 msgstr "Не удалось изменить соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:439
+#: ../src/connection-editor/nm-connection-editor.c:597
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ошибка создания диалога для изменения соединений."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
+#: ../src/connection-editor/nm-connection-editor.c:738
+msgid ""
+"Warning: the connection contains some properties not supported by the "
+"editor. They will be cleared upon save."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:758
 msgid "Error initializing editor"
 msgstr "Ошибка инициализации редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:921
+#: ../src/connection-editor/nm-connection-editor.c:1142
 msgid "Connection add failed"
 msgstr "Сбой добавления соединения"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
 msgid "_Close"
-msgstr ""
+msgstr "_Закрыть"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "Fix"
+msgstr "Исправить"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+#| msgid ""
+#| "Set this to true to disable warnings about CA certificates in EAP "
+#| "authentication."
+msgid ""
+"Security labels may prevent some files from being used with certificate "
+"authentication."
+msgstr ""
+"Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
+"аутентификации EAP."
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "Connection _name:"
 msgstr "_Название соединения:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Export..."
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
+msgid "_Export…"
 msgstr "_Экспортировать…"
 
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+msgid "File Relabel"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+msgid "_Relabel"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:11
+msgid ""
+"The following files are not labelled for use with certificate "
+"authentication. Do you wish to adjust the labels?"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:12
+msgid "Relabel"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:13
+msgid "Filename"
+msgstr "Имя файла"
+
 #: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
-msgstr "не было подключения"
+msgstr "никогда"
 
 #: ../src/connection-editor/nm-connection-list.c:138
 #: ../src/connection-editor/nm-connection-list.c:149
@@ -2362,50 +3147,54 @@ msgstr[0] "%d год назад"
 msgstr[1] "%d года назад"
 msgstr[2] "%d лет назад"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
-msgstr "Название"
+msgstr "Имя"
 
-#: ../src/connection-editor/nm-connection-list.c:636
+#: ../src/connection-editor/nm-connection-list.c:648
 msgid "Last Used"
-msgstr "Последнее подключение"
+msgstr "Последнее использование"
 
-#: ../src/connection-editor/nm-connection-list.c:684
+#: ../src/connection-editor/nm-connection-list.c:696
 msgid "Edit the selected connection"
-msgstr "Изменить выбранное соединение."
+msgstr "Изменить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:697
 msgid "Authenticate to edit the selected connection"
 msgstr "Для изменения выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:712
 msgid "Delete the selected connection"
 msgstr "Удалить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:701
+#: ../src/connection-editor/nm-connection-list.c:713
 msgid "Authenticate to delete the selected connection"
 msgstr "Для удаления выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:938
+msgid "Error creating connection"
+msgstr "Ошибка создания соединения"
+
+#: ../src/connection-editor/nm-connection-list.c:936
 msgid "No VPN plugins are installed."
 msgstr "Модули VPN не установлены."
 
-#: ../src/connection-editor/nm-connection-list.c:931
-#, c-format
-msgid "Don't know how to create '%s' connections"
+#: ../src/connection-editor/nm-connection-list.c:939
+#, fuzzy, c-format
+#| msgid "Don't know how to create '%s' connections"
+msgid "Don’t know how to create “%s” connections"
 msgstr "Неизвестно, как создавать соединения «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:933
-msgid "Error creating connection"
-msgstr "Ошибка создания соединения"
-
-#: ../src/connection-editor/nm-connection-list.c:955
+#: ../src/connection-editor/nm-connection-list.c:970
 msgid "Error editing connection"
 msgstr "Ошибка изменения соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:956
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
+#: ../src/connection-editor/nm-connection-list.c:971
+#, fuzzy, c-format
+#| msgid "Did not find a connection with UUID '%s'"
+msgid "Did not find a connection with UUID “%s”"
 msgstr "Соединение с UUID «%s» не найдено"
 
 #: ../src/connection-editor/page-8021x-security.c:109
@@ -2439,44 +3228,44 @@ msgstr "не удалось найти устройство Bluetooth."
 msgid "Bluetooth connection %d"
 msgstr "Объединение %d"
 
-#: ../src/connection-editor/page-bluetooth.c:302
+#: ../src/connection-editor/page-bluetooth.c:308
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:320
+#: ../src/connection-editor/page-bluetooth.c:326
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: ../src/connection-editor/page-bluetooth.c:331
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Проводная сеть"
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: ../src/connection-editor/page-bluetooth.c:336
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Сеть Wi-Fi"
 
-#: ../src/connection-editor/page-bond.c:447
+#: ../src/connection-editor/page-bond.c:449
 msgid "Could not load bond user interface."
 msgstr "Не удалось загрузить диалог настройки объединения интерфейсов."
 
-#: ../src/connection-editor/page-bond.c:566
+#: ../src/connection-editor/page-bond.c:568
 #, fuzzy
 msgid "primary"
 msgstr "_Первичный:"
 
-#: ../src/connection-editor/page-bond.c:616
+#: ../src/connection-editor/page-bond.c:623
 #, c-format
 msgid "Bond connection %d"
 msgstr "Объединение %d"
 
-#: ../src/connection-editor/page-bridge.c:213
+#: ../src/connection-editor/page-bridge.c:215
 msgid "Could not load bridge user interface."
 msgstr "Не удалось загрузить диалог настройки мостового соединения."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:317
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Мост %d"
@@ -2492,11 +3281,11 @@ msgstr "Порт моста"
 msgid "Could not load bridge port user interface."
 msgstr "Не удалось загрузить диалог настройки порта мостового соединения."
 
-#: ../src/connection-editor/page-dcb.c:603
+#: ../src/connection-editor/page-dcb.c:622
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:624
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Не удалось загрузить диалог настройки DSL."
@@ -2505,55 +3294,61 @@ msgstr "Не удалось загрузить диалог настройки D
 msgid "Could not load DSL user interface."
 msgstr "Не удалось загрузить диалог настройки DSL."
 
-#: ../src/connection-editor/page-dsl.c:214
+#: ../src/connection-editor/page-dsl.c:219
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-соединение %d"
 
-#: ../src/connection-editor/page-ethernet.c:74
+#: ../src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
-"its interface name or permanent MAC or both. Examples: \"em1\", "
-"\"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
+"its interface name or permanent MAC or both. Examples: “em1”, "
+"“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 msgstr ""
 "Привязать соединение к сетевому устройству с этим MAC-адресом. Пример: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:328
+#: ../src/connection-editor/page-ethernet.c:262
+#, fuzzy
+#| msgid "Ignored"
+msgid "ignored"
+msgstr "Игнорировать"
+
+#: ../src/connection-editor/page-ethernet.c:353
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс для проводного соединения."
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: ../src/connection-editor/page-ethernet.c:515
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:461
-#: ../src/connection-editor/page-vlan.c:741
-#: ../src/connection-editor/page-wifi.c:581
+#: ../src/connection-editor/page-ethernet.c:519
+#: ../src/connection-editor/page-vlan.c:742
+#: ../src/connection-editor/page-wifi.c:574
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Клонированный MAC-адрес:"
 
-#: ../src/connection-editor/page-ethernet.c:465
+#: ../src/connection-editor/page-ethernet.c:523
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:500
+#: ../src/connection-editor/page-ethernet.c:563
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Проводное соединение %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:51
-#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/connection-editor/page-general.c:54
+#: ../src/libnma/nma-mobile-providers.c:817
 #: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/connection-editor/page-general.c:52
+#: ../src/connection-editor/page-general.c:55
 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 "
@@ -2563,171 +3358,178 @@ msgstr ""
 "является зоной общего пользования, выбрав эту зону, вы установите её в "
 "межсетевом экране. Работает только при включённом firewalld."
 
-#: ../src/connection-editor/page-general.c:53
-msgid "FirewallD is not running."
-msgstr "FirewallD не запущен."
-
-#: ../src/connection-editor/page-general.c:350
+#: ../src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс общих параметров."
 
 #: ../src/connection-editor/page-infiniband.c:57
+#, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
-"its interface name or permanent MAC or both. Examples: \"ib0\", "
-"\"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", \"ib0 "
-"(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
+"its interface name or permanent MAC or both. Examples: “ib0”, “80:00:00:48:"
+"fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, “ib0 (80:00:00:48:"
+"fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
+"Привязать соединение к сетевому устройству с этим MAC-адресом. Пример: "
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:153
+#: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс управления InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:216
+#: ../src/connection-editor/page-infiniband.c:214
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: ../src/connection-editor/page-infiniband.c:254
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Соединение InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip-tunnel.c:178
+#, fuzzy
+#| msgid "Could not load IPv4 user interface."
+msgid "Could not load IP tunnel user interface."
+msgstr "Не удалось загрузить диалог настройки IPv4."
+
+#: ../src/connection-editor/page-ip-tunnel.c:292
+#, fuzzy, c-format
+#| msgid "Ethernet connection %d"
+msgid "IP tunnel connection %d"
+msgstr "Проводное соединение %d"
+
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN)"
 msgstr "Автоматически (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматически (VPN, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Автоматически, только адреса"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Автоматически (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматически (PPPoE, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Автоматически (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматически (DHCP, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:179
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Только для локальной связи"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:295
+#: ../src/connection-editor/page-ip4.c:361
+#: ../src/connection-editor/page-ip6.c:324
 msgid "Additional DNS ser_vers:"
 msgstr "_Дополнительные серверы DNS:"
 
-#: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:304
+#: ../src/connection-editor/page-ip4.c:370
+#: ../src/connection-editor/page-ip6.c:333
 msgid "Additional s_earch domains:"
 msgstr "До_полнительные поисковые домены:"
 
-#: ../src/connection-editor/page-ip4.c:965
+#: ../src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Маршруты IPv4 для %s"
 
-#: ../src/connection-editor/page-ip4.c:1158
+#: ../src/connection-editor/page-ip4.c:1226
 msgid "IPv4 Settings"
 msgstr "Параметры IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1160
+#: ../src/connection-editor/page-ip4.c:1228
 msgid "Could not load IPv4 user interface."
 msgstr "Не удалось загрузить диалог настройки IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1253
+#: ../src/connection-editor/page-ip4.c:1321
 #, c-format
-msgid "IPv4 address \"%s\" invalid"
+msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1261
+#: ../src/connection-editor/page-ip4.c:1329
 #, c-format
-msgid "IPv4 address netmask \"%s\" invalid"
+msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1270
+#: ../src/connection-editor/page-ip4.c:1338
 #, c-format
-msgid "IPv4 gateway \"%s\" invalid"
+msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1313
+#: ../src/connection-editor/page-ip4.c:1381
 #, c-format
-msgid "IPv4 DNS server \"%s\" invalid"
+msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:148
-msgid "Ignore"
-msgstr "Игнорировать"
-
-#: ../src/connection-editor/page-ip6.c:172
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Автоматически, только DHCP"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:993
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Маршруты IPv4 для %s"
 
-#: ../src/connection-editor/page-ip6.c:1155
+#: ../src/connection-editor/page-ip6.c:1184
 msgid "IPv6 Settings"
 msgstr "Параметры IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1157
+#: ../src/connection-editor/page-ip6.c:1186
 msgid "Could not load IPv6 user interface."
 msgstr "Не удалось загрузить диалог настройки IPv4."
 
-#: ../src/connection-editor/page-ip6.c:1248
+#: ../src/connection-editor/page-ip6.c:1277
 #, c-format
-msgid "IPv6 address \"%s\" invalid"
+msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1256
+#: ../src/connection-editor/page-ip6.c:1285
 #, c-format
-msgid "IPv6 prefix \"%s\" invalid"
+msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1265
+#: ../src/connection-editor/page-ip6.c:1294
 #, c-format
-msgid "IPv6 gateway \"%s\" invalid"
+msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: ../src/connection-editor/page-ip6.c:1336
 #, c-format
-msgid "IPv6 DNS server \"%s\" invalid"
+msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
-#: ../src/connection-editor/page-master.c:259
+#: ../src/connection-editor/page-master.c:247
+#: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:249
+#: ../src/connection-editor/page-master.c:248
 #, c-format
-msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:260
+#: ../src/connection-editor/page-master.c:259
 #, c-format
 msgid ""
-"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
@@ -2745,30 +3547,36 @@ msgid "Unsupported mobile broadband connection type."
 msgstr "Указанный тип мобильного соединения не поддерживается."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:529
+#: ../src/connection-editor/page-mobile.c:540
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Выберите оператора мобильной связи"
 
-#: ../src/connection-editor/page-mobile.c:556
+#: ../src/connection-editor/page-mobile.c:567
+#, fuzzy
+#| msgid ""
+#| "Select the technology your mobile broadband provider uses.  If you are "
+#| "unsure, ask your provider."
 msgid ""
-"Select the technology your mobile broadband provider uses.  If you are "
+"Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr "Выберите предоставляемый оператором тип мобильной связи."
 
-#: ../src/connection-editor/page-mobile.c:561
+#: ../src/connection-editor/page-mobile.c:572
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Провайдер использует технологию _GSM (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:568
+#. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button.
+#. You may need to change it according to your language.
+#: ../src/connection-editor/page-mobile.c:579
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Провайдер использует технологию _CDMA (1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
@@ -2778,24 +3586,24 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:258
+#: ../src/wireless-security/eap-method-ttls.c:260
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:303
+#: ../src/wireless-security/eap-method-ttls.c:322
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:280
-#: ../src/wireless-security/eap-method-peap.c:272
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:273
+#: ../src/wireless-security/eap-method-ttls.c:290
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:273
+#: ../src/wireless-security/eap-method-ttls.c:275
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -2817,23 +3625,27 @@ msgstr "Параметры PPP"
 msgid "Could not load PPP user interface."
 msgstr "Не удалось загрузить диалог настройки PPP."
 
-#: ../src/connection-editor/page-team.c:98
-#: ../src/connection-editor/page-team-port.c:71
-#: ../src/connection-editor/vpn-helpers.c:165
-msgid "Select file to import"
-msgstr "Выбор файла для импортирования"
+#: ../src/connection-editor/page-proxy.c:215
+msgid "Proxy"
+msgstr ""
 
-#: ../src/connection-editor/page-team.c:118
-#: ../src/connection-editor/page-team-port.c:91
-msgid "Error: file doesn't contain a valid JSON configuration"
+#: ../src/connection-editor/page-proxy.c:217
+#, fuzzy
+#| msgid "Could not load bond user interface."
+msgid "Could not load proxy user interface."
+msgstr "Не удалось загрузить диалог настройки объединения интерфейсов."
+
+#: ../src/connection-editor/page-team.c:361
+#: ../src/connection-editor/page-team-port.c:223
+msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:270
+#: ../src/connection-editor/page-team.c:1156
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Не удалось загрузить диалог настройки vlan."
 
-#: ../src/connection-editor/page-team.c:377
+#: ../src/connection-editor/page-team.c:1253
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL-соединение %d"
@@ -2841,12 +3653,12 @@ msgstr "DSL-соединение %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:151
+#: ../src/connection-editor/page-team-port.c:732
 #, fuzzy
 msgid "Team Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-team-port.c:153
+#: ../src/connection-editor/page-team-port.c:734
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Не удалось загрузить диалог настройки порта мостового соединения."
@@ -2854,61 +3666,69 @@ msgstr "Не удалось загрузить диалог настройки 
 #. Translators: the first %s is a device name (eg, "em1"), the
 #. * second is a connection name (eg, "Auto Ethernet").
 #.
-#: ../src/connection-editor/page-vlan.c:414
-#, c-format
-msgid "%s (via \"%s\")"
+#: ../src/connection-editor/page-vlan.c:415
+#, fuzzy, c-format
+#| msgid "%s (via \"%s\")"
+msgid "%s (via “%s”)"
 msgstr "%s (посредством «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:426
+#: ../src/connection-editor/page-vlan.c:427
 #, fuzzy, c-format
-msgid "New connection..."
+msgid "New connection…"
 msgstr "Нет подключения к сети"
 
 #: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Не удалось загрузить диалог настройки vlan."
 
-#: ../src/connection-editor/page-vlan.c:734
+#: ../src/connection-editor/page-vlan.c:735
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:797
+#: ../src/connection-editor/page-vlan.c:803
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-соединение %d"
 
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/page-vpn.c:98
 msgid "Could not load VPN user interface."
 msgstr "Не удалось загрузить интерфейс для VPN."
 
-#: ../src/connection-editor/page-vpn.c:118
-#, c-format
-msgid "Could not find VPN plugin service for '%s'."
+#: ../src/connection-editor/page-vpn.c:113
+#, fuzzy, c-format
+#| msgid "Could not find VPN plugin service for '%s'."
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Не удалось найти VPN-модуль «%s»."
+
+#: ../src/connection-editor/page-vpn.c:122
+#, fuzzy, c-format
+#| msgid "Could not find VPN plugin service for '%s'."
+msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Не удалось найти VPN-модуль «%s»."
 
+#: ../src/connection-editor/page-vpn.c:123
+#, fuzzy
+#| msgid "Connection failure"
+msgid "unknown failure"
+msgstr "Сбой подключения"
+
 #: ../src/connection-editor/page-vpn.c:205
-#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-соединение %d"
 
-#: ../src/connection-editor/page-vpn.c:229
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"Модулю VPN не удалось правильно импортировать VPN-соединение\n"
-"\n"
-"Ошибка: тип службы VPN не поддерживается."
-
-#: ../src/connection-editor/page-vpn.c:254
+#: ../src/connection-editor/page-vpn.c:211
 msgid "Choose a VPN Connection Type"
 msgstr "Выберите тип VPN-соединения"
 
-#: ../src/connection-editor/page-vpn.c:255
+#: ../src/connection-editor/page-vpn.c:212
+#, fuzzy
+#| 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 not have the correct VPN plugin installed."
 msgid ""
-"Select the type of VPN you wish to use for the new connection.  If the type "
+"Select the type of VPN you wish to use for the new connection. If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 msgstr ""
@@ -2916,9 +3736,13 @@ msgstr ""
 "списке, то возможно, не установлен необходимый VPN-модуль."
 
 #: ../src/connection-editor/page-wifi.c:77
+#, fuzzy
+#| 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"
 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"
+"by the BSSID entered here. Example: 00:11:22:33:44:55"
 msgstr ""
 "Этот параметр привязывает это соединение к беспроводной точке доступа, "
 "указанной по идентификатору BSSID.  Пример: 00:11:22:33:44:55"
@@ -2927,8 +3751,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
-"its interface name or permanent MAC or both. Examples: \"wlan0\", "
-"\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
+"its interface name or permanent MAC or both. Examples: “wlan0”, "
+"“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 msgstr ""
 "Привязать соединение к сетевому устройству с этим MAC-адресом. Пример: "
 "00:11:22:33:44:55"
@@ -2938,115 +3762,96 @@ msgstr ""
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:450
+#: ../src/connection-editor/page-wifi.c:442
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не удалось загрузить интерфейс пользователя для Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:571
+#: ../src/connection-editor/page-wifi.c:564
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:577
-#, fuzzy
+#: ../src/connection-editor/page-wifi.c:570
 msgid "Wi-Fi device"
-msgstr "Любое устройство"
+msgstr "Устройство Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:619
+#: ../src/connection-editor/page-wifi.c:617
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Соединение Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP (40/128-битный ключ (Hex или ASCII))"
 
-#: ../src/connection-editor/page-wifi-security.c:319
-#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP (128-битный ключ)"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/connection-editor/page-wifi-security.c:392
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамический WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA/WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:371
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:461
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Не удалось загрузить диалог настройки защиты Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:424
+#: ../src/connection-editor/page-wifi-security.c:472
 msgid "Wi-Fi Security"
 msgstr "Защита Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:426
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не удалось загрузить диалог настройки защиты Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:506
+#: ../src/connection-editor/page-wifi-security.c:558
 #, c-format
 msgid "missing SSID"
-msgstr ""
+msgstr "отсутствует SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:512
+#: ../src/connection-editor/page-wifi-security.c:564
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:138
-msgid "Cannot import VPN connection"
-msgstr "Не удалось импортировать VPN-соединение"
-
-#: ../src/connection-editor/vpn-helpers.c:140
-#, c-format
-msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
-msgstr ""
-"Файл «%s» не может быть прочитан или не содержит распознаваемые данные о VPN-"
-"соединении.\n"
-"\n"
-"Ошибка: %s."
-
-#: ../src/connection-editor/vpn-helpers.c:141
-#, fuzzy
-msgid "unknown error"
-msgstr "Неизвестная ошибка"
-
-#: ../src/connection-editor/vpn-helpers.c:215
-#, c-format
-msgid "A file named \"%s\" already exists."
+#: ../src/connection-editor/vpn-helpers.c:132
+#, fuzzy, c-format
+#| msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
 msgstr "Файл с именем «%s» уже существует."
 
-#: ../src/connection-editor/vpn-helpers.c:217
+#: ../src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: ../src/connection-editor/vpn-helpers.c:219
+#: ../src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Заменить «%s» VPN-соединением, которое вы хотите сохранить?"
 
-#: ../src/connection-editor/vpn-helpers.c:255
+#: ../src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Не удалось экспортировать VPN-соединение"
 
-#: ../src/connection-editor/vpn-helpers.c:257
-#, c-format
+#: ../src/connection-editor/vpn-helpers.c:174
+#, fuzzy, c-format
+#| msgid ""
+#| "The VPN connection '%s' could not be exported to %s.\n"
+#| "\n"
+#| "Error: %s."
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -3054,18 +3859,12 @@ msgstr ""
 "\n"
 "Ошибка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:292
-msgid "Export VPN connection..."
+#: ../src/connection-editor/vpn-helpers.c:209
+#, fuzzy
+#| msgid "Export VPN connection..."
+msgid "Export VPN connection…"
 msgstr "Экспортировать VPN-соединение…"
 
-#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"Апплет NetworkManager не смог найти некоторые необходимые ресурсы (не "
-"найден .ui-файл интерфейса)."
-
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Разблокировать"
@@ -3082,6 +3881,52 @@ msgstr "Сведения о текущем соединении"
 msgid "Active Network Connections"
 msgstr "Активные сетевые соединения"
 
+#: ../src/libnma/nma-file-cert-chooser.c:108
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#, fuzzy
+#| msgid "No CA certificate is _required"
+msgid "No certificate set"
+msgstr "Сертификат УЦ не _требуется"
+
+#: ../src/libnma/nma-file-cert-chooser.c:126
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+msgid "No key set"
+msgstr ""
+
+#: ../src/libnma/nma-file-cert-chooser.c:246
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#, fuzzy, c-format
+#| msgid "Choose CA Certificate"
+msgid "Choose a key for %s Certificate"
+msgstr "Выбрать сертификат УЦ"
+
+#: ../src/libnma/nma-file-cert-chooser.c:250
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#, fuzzy, c-format
+#| msgid "Private _key:"
+msgid "%s private _key:"
+msgstr "Секретный _ключ:"
+
+#: ../src/libnma/nma-file-cert-chooser.c:254
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#, fuzzy, c-format
+#| msgid "_Private key password:"
+msgid "%s key _password:"
+msgstr "_Пароль к секретному ключу:"
+
+#: ../src/libnma/nma-file-cert-chooser.c:258
+#, fuzzy, c-format
+#| msgid "Choose CA Certificate"
+msgid "Choose %s Certificate"
+msgstr "Выбрать сертификат УЦ"
+
+#: ../src/libnma/nma-file-cert-chooser.c:262
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#, fuzzy, c-format
+#| msgid "_User certificate:"
+msgid "%s _certificate:"
+msgstr "Сертификат _пользователя:"
+
 #: ../src/libnma/nma-mobile-wizard.c:198
 #: ../src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
@@ -3108,11 +3953,18 @@ msgstr "Тарифный план:"
 
 #: ../src/libnma/nma-mobile-wizard.c:248
 #: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+#| 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 resources, double-check your settings.  To modify your mobile "
+#| "broadband connection settings, choose \"Network Connections\" from the "
+#| "System >> Preferences menu."
 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 "
-"resources, double-check your settings.  To modify your mobile broadband "
-"connection settings, choose \"Network Connections\" from the System >> "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
 "Preferences menu."
 msgstr ""
 "После указания параметров доступа к мобильной сети будет установлено "
@@ -3141,11 +3993,18 @@ msgstr "Выберите точку доступа (APN) этого тарифн
 
 #: ../src/libnma/nma-mobile-wizard.c:500
 #: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+#| msgid ""
+#| "Warning: Selecting an incorrect plan may result in billing issues for "
+#| "your broadband account or may prevent connectivity.\n"
+#| "\n"
+#| "If you are unsure of your plan please ask your provider for your plan's "
+#| "APN."
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
 "\n"
-"If you are unsure of your plan please ask your provider for your plan's APN."
+"If you are unsure of your plan please ask your provider for your plan’s APN."
 msgstr ""
 "Внимание! Выбор неверного тарифного плана может привести к применению "
 "неправильного тарифа для мобильной связи или невозможности доступа в сеть.\n"
@@ -3160,7 +4019,9 @@ msgstr "Выберите тарифный план"
 
 #: ../src/libnma/nma-mobile-wizard.c:557
 #: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed..."
+#, fuzzy
+#| msgid "My plan is not listed..."
+msgid "My plan is not listed…"
 msgstr "Другой…"
 
 #: ../src/libnma/nma-mobile-wizard.c:710
@@ -3175,7 +4036,9 @@ msgstr "Оператор"
 
 #: ../src/libnma/nma-mobile-wizard.c:748
 #: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can't find my provider and I wish to enter it _manually:"
+#, fuzzy
+#| msgid "I can't find my provider and I wish to enter it _manually:"
+msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "_Указать оператора вручную:"
 
 #: ../src/libnma/nma-mobile-wizard.c:761
@@ -3215,7 +4078,9 @@ msgstr "Другая страна"
 
 #: ../src/libnma/nma-mobile-wizard.c:1126
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider's Country or Region"
+#, fuzzy
+#| msgid "Choose your Provider's Country or Region"
+msgid "Choose your Provider’s Country or Region"
 msgstr "Выберите страну и регион оператора"
 
 #: ../src/libnma/nma-mobile-wizard.c:1183
@@ -3244,7 +4109,9 @@ msgstr "Необходимо знать следующие сведения:"
 
 #: ../src/libnma/nma-mobile-wizard.c:1371
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider's name"
+#, fuzzy
+#| msgid "Your broadband provider's name"
+msgid "Your broadband provider’s name"
 msgstr "Название оператора мобильной связи"
 
 #: ../src/libnma/nma-mobile-wizard.c:1377
@@ -3273,11 +4140,94 @@ msgstr "Любое устройство"
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройка мобильного соединения"
 
-#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnma/nma-mobile-wizard.c:1620
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Новое мобильное соединение"
 
+#: ../src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy
+#| msgid "(none)"
+msgid "(None)"
+msgstr "(нет)"
+
+#: ../src/libnma/nma-cert-chooser-button.c:170
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: ../src/libnma/nma-cert-chooser-button.c:171
+#, fuzzy, c-format
+#| msgid "C_A certificate:"
+msgid "Certificate in %s"
+msgstr "С_ертификат УЦ:"
+
+#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#, fuzzy
+#| msgid "Unknown"
+msgid "(Unknown)"
+msgstr "Неизвестно"
+
+#: ../src/libnma/nma-cert-chooser-button.c:212
+#: ../src/libnma/nma-cert-chooser-button.c:242
+msgid "Select"
+msgstr ""
+
+#: ../src/libnma/nma-cert-chooser-button.c:213
+#: ../src/libnma/nma-cert-chooser-button.c:243
+msgid "Cancel"
+msgstr ""
+
+#: ../src/libnma/nma-cert-chooser-button.c:469
+msgid "Select from file…"
+msgstr ""
+
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#, fuzzy, c-format
+#| msgid "Choose CA Certificate"
+msgid "Choose a %s Certificate"
+msgstr "Выбрать сертификат УЦ"
+
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#, fuzzy, c-format
+#| msgid "_User certificate:"
+msgid "%s certificate _password:"
+msgstr "Сертификат _пользователя:"
+
+#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+msgid "Error logging in: "
+msgstr ""
+
+#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#, fuzzy
+#| msgid "Error editing connection"
+msgid "Error opening a session: "
+msgstr "Ошибка изменения соединения"
+
+#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#, fuzzy
+#| msgid "_Unlock"
+msgid "_Unlock token"
+msgstr "_Разблокировать"
+
+#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+msgid "Issued By"
+msgstr ""
+
+#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+msgid "_Login"
+msgstr ""
+
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+msgid "_Remember PIN"
+msgstr ""
+
 #: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
@@ -3325,54 +4275,63 @@ msgid ""
 "case, you have to edit the connection with nm-connection-editor first"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
-msgid "New..."
-msgstr "Новая…"
+#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New…"
+msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без проверки подлинности"
 
-#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#, fuzzy
+#| msgid "Dynamic WEP (802.1X)"
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамический WEP (802.1X)"
+
+#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "С_оздать"
 
-#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the Wi-Fi network "
+#| "'%s'."
 msgid ""
-"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Создать новую сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Создать сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введите имя для создаваемой сети Wi-Fi."
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Подключение к скрытой сети Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Скрытая сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3380,21 +4339,21 @@ msgstr ""
 "Введите имя и параметры безопасности скрытой сети Wi-Fi, к которой "
 "необходимо подключиться."
 
-#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
 msgid "Wi-Fi _security:"
 msgstr "_Безопасность Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "C_onnection:"
 msgstr "Сое_динение:"
 
-#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "Wi-Fi _adapter:"
 msgstr "_Адаптер Wi-Fi:"
 
 #: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
-msgstr "Проводные"
+msgstr "Проводная"
 
 #: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
@@ -3528,8 +4487,8 @@ msgstr "Роуминговая сеть"
 
 #: ../src/mobile-helpers.c:331
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "PIN-код для SIM-карты «%s» (%s)"
+msgid "PIN code for SIM card “%s” on “%s”"
+msgstr "PIN-код для SIM-карты «%s» на «%s»"
 
 #: ../src/mobile-helpers.c:464
 msgid "PIN code required"
@@ -3539,229 +4498,212 @@ msgstr "Требуется PIN-код"
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Для использования мобильного устройства требуется PIN-код"
 
-#: ../src/mobile-helpers.c:619
+#: ../src/mobile-helpers.c:622
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Мобильное соединение «%s» установлено: (%d%%%s%s)"
+msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
+msgstr "Мобильное соединение «%s» активно: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:625
 msgid "roaming"
 msgstr "роуминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:179
+#: ../src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Подключение %s"
 
-#: ../src/wireless-security/eap-method.c:56
+#: ../src/utils/utils.c:563
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Сертификаты PEM (*.pem, *.crt, *.cer)"
+
+#: ../src/utils/utils.c:575
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
+
+#: ../src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:255
-msgid "unspecified error validating eap-method file"
-msgstr ""
+#: ../src/wireless-security/eap-method.c:227
+msgid "no file selected"
+msgstr "файлы не выбраны"
 
-#: ../src/wireless-security/eap-method.c:452
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:235
+#, c-format
+msgid "file “%s” does not exist"
+msgstr "файл «%s» не существует"
 
-#: ../src/wireless-security/eap-method.c:455
-msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "Сертификаты DER или PEM (*.der, *.pem, *.crt, *.cer)"
+#: ../src/wireless-security/eap-method.c:258
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:70
+#: ../src/wireless-security/eap-method-fast.c:73
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:265
-#: ../src/wireless-security/eap-method-peap.c:302
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-fast.c:269
+#: ../src/wireless-security/eap-method-peap.c:303
+#: ../src/wireless-security/eap-method-ttls.c:352
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:403
-msgid "Choose a PAC file..."
-msgstr "Выберите файл PAC..."
+#: ../src/wireless-security/eap-method-fast.c:407
+msgid "Choose a PAC file"
+msgstr "Выберите файл PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Файлы PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: ../src/wireless-security/eap-method-fast.ui.h:1
 msgid "Anonymous"
 msgstr "Анонимная"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Authenticated"
 msgstr "С проверкой подлинности"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:4
+#: ../src/wireless-security/eap-method-fast.ui.h:3
 msgid "Both"
 msgstr "Обе"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity:"
 msgstr "_Анонимная идентификация:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file:"
 msgstr "Файл _PAC:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication:"
 msgstr "Вн_утренняя аутентификация:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:8
+#: ../src/wireless-security/eap-method-fast.ui.h:7
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Разрешить автоматическую инициализацию PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:63
+#: ../src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:69
+#: ../src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:63
+#: ../src/wireless-security/eap-method-peap.c:64
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:68
+#: ../src/wireless-security/eap-method-peap.c:69
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:287
-#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/eap-method-peap.c:288
+#: ../src/wireless-security/eap-method-ttls.c:337
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:381
-#: ../src/wireless-security/eap-method-tls.c:481
-#: ../src/wireless-security/eap-method-ttls.c:412
-msgid "Choose a Certificate Authority certificate..."
+#: ../src/wireless-security/eap-method-peap.c:382
+#: ../src/wireless-security/eap-method-ttls.c:431
+#, fuzzy
+#| msgid "Choose a Certificate Authority certificate..."
+msgid "Choose a Certificate Authority certificate"
 msgstr "Выбрать сертификат удостоверяющего центра…"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Версия 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate:"
 msgstr "С_ертификат УЦ:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "No CA certificate is _required"
 msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version:"
 msgstr "_Версия PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:72
+#: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:82
+#: ../src/wireless-security/eap-method-simple.c:88
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:66
+#: ../src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:71
-#, fuzzy, c-format
-msgid "invalid EAP-TLS CA certificate: %s"
-msgstr "С_ертификат УЦ:"
-
-#: ../src/wireless-security/eap-method-tls.c:76
-msgid "invalid EAP-TLS CA certificate: no certificate specified"
-msgstr ""
+#: ../src/wireless-security/eap-method-tls.c:238
+#, fuzzy
+#| msgid "No CA certificate is _required"
+msgid "no user certificate selected"
+msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-tls.c:84
-msgid "invalid EAP-TLS password: missing"
+#: ../src/wireless-security/eap-method-tls.c:243
+msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:94
-#, c-format
-msgid "invalid EAP-TLS private-key: %s"
+#: ../src/wireless-security/eap-method-tls.c:263
+msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:101
-#, c-format
-msgid "invalid EAP-TLS user-certificate: %s"
+#: ../src/wireless-security/eap-method-tls.c:268
+msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:296
-msgid "Unencrypted private keys are insecure"
-msgstr "Использовать секретные ключи без шифрования небезопасно"
+#: ../src/wireless-security/eap-method-tls.c:314
+#, fuzzy
+#| msgid "No CA certificate is _required"
+msgid "no CA certificate selected"
+msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-tls.c:299
-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 "
-"a password-protected private key.\n"
-"\n"
-"(You can password-protect your private key with openssl)"
+#: ../src/wireless-security/eap-method-tls.c:319
+msgid "selected CA certificate file does not exist"
 msgstr ""
-"Выбранный секретный ключ не защищён паролем. Это небезопасно, выберите "
-"секретный ключ, защищённый паролем.\n"
-"\n"
-"Примечание: секретный ключ можно защитить с помощью openssl."
-
-#: ../src/wireless-security/eap-method-tls.c:475
-msgid "Choose your personal certificate..."
-msgstr "Выбрать персональный сертификат…"
-
-#: ../src/wireless-security/eap-method-tls.c:487
-msgid "Choose your private key..."
-msgstr "Выбрать секретный ключ…"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "_Идентификация:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-msgid "_User certificate:"
-msgstr "Сертификат _пользователя:"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:5
-msgid "Private _key:"
-msgstr "Секретный _ключ:"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_Private key password:"
-msgstr "_Пароль к секретному ключу:"
-
-#: ../src/wireless-security/eap-method-ttls.c:63
+#: ../src/wireless-security/eap-method-ttls.c:64
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:68
+#: ../src/wireless-security/eap-method-ttls.c:69
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 
+#: ../src/wireless-security/eap-method-ttls.c:306
+#, fuzzy
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2"
+
 #: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
@@ -3787,47 +4729,47 @@ msgstr "Туннелированный TLS"
 msgid "Protected EAP (PEAP)"
 msgstr "Защищённый EAP (PEAP)"
 
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../src/wireless-security/ws-wep-key.ui.h:9
-#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
 msgid "Au_thentication:"
 msgstr "_Аутентификация:"
 
-#: ../src/wireless-security/ws-leap.c:61
+#: ../src/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:69
+#: ../src/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:105
+#: ../src/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: ../src/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: ../src/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:125
+#: ../src/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:131
+#: ../src/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:133
+#: ../src/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -3835,34 +4777,34 @@ msgstr ""
 msgid "1 (Default)"
 msgstr "1 (по умолчанию)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Открытая система"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Общий ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Ключ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "Пока_зывать ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
+#: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x:"
 msgstr "_Индекс WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:69
+#: ../src/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:77
+#: ../src/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
@@ -3870,6 +4812,87 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Тип:"
 
+#, fuzzy
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "Апплет NetworkManager"
+
+#~ msgid "_Disconnect VPN"
+#~ msgstr "_Отключить VPN"
+
+#~ msgid "New Mobile Broadband connection..."
+#~ msgstr "Новое мобильное соединение…"
+
+#~ msgid "_Connect to Hidden Wi-Fi Network..."
+#~ msgstr "_Подключиться к скрытой сети Wi-Fi…"
+
+# перевод wifi как "беспроводная сеть" не подходит, так как bluetooth тоже беспроводная сеть
+#~ msgid "Create _New Wi-Fi Network..."
+#~ msgstr "Создать _новую сеть Wi-Fi…"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "Aut_onegotiate"
+#~ msgstr "_Автосогласование"
+
+#~ msgid "FirewallD is not running."
+#~ msgstr "FirewallD не запущен."
+
+#~ msgid "New..."
+#~ msgstr "Новая…"
+
+#, fuzzy
+#~ msgid "invalid EAP-TLS CA certificate: %s"
+#~ msgstr "С_ертификат УЦ:"
+
+#~ msgid "Unencrypted private keys are insecure"
+#~ msgstr "Использовать секретные ключи без шифрования небезопасно"
+
+#~ 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 a password-protected private key.\n"
+#~ "\n"
+#~ "(You can password-protect your private key with openssl)"
+#~ msgstr ""
+#~ "Выбранный секретный ключ не защищён паролем. Это небезопасно, выберите "
+#~ "секретный ключ, защищённый паролем.\n"
+#~ "\n"
+#~ "Примечание: секретный ключ можно защитить с помощью openssl."
+
+#~ msgid "Choose your personal certificate..."
+#~ msgstr "Выбрать персональный сертификат…"
+
+#~ msgid "Choose your private key..."
+#~ msgstr "Выбрать секретный ключ…"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Мобильная связь WiMA_X"
 
@@ -4051,9 +5074,6 @@ msgstr "_Тип:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "_Mode:"
-#~ msgstr "_Режим:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "MAC-адрес _устройства:"
 
@@ -4201,9 +5221,6 @@ msgstr "_Тип:"
 #~ "Игнорирование сертификата удостоверяющего центра (УЦ) может сделать "
 #~ "подключения уязвимыми.  Хотите выбрать сертификат удостоверяющего центра?"
 
-#~ msgid "Choose CA Certificate"
-#~ msgstr "Выбрать сертификат УЦ"
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Беспроводные сети (%s)"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]