po: updated Russian (ru) translation (bgo #745262)

https://bugzilla.gnome.org/show_bug.cgi?id=745262

diff --git a/po/ru.po b/po/ru.po
index 586414a..5a0aaad 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,575 +8,808 @@
 # Yulia <ypoyarko@redhat.com>, 2010.
 # Sergey Isachenko aka Zabuldon <vortexius@gmail.com>, 2011.
 # Yuri Kozlov <yuray@komyakino.ru>, 2011.
-# Stas Solovey <whats_up@tut.by>, 2012.
 # Yuri Myasoedov <omerta13@yandex.ru>, 2012.
 # ypoyarko <ypoyarko@redhat.com>, 2013. #zanata
 # ypoyarko <ypoyarko@redhat.com>, 2014. #zanata
+# Stas Solovey <whats_up@tut.by>, 2012, 2014, 2015.
+#
+#: ../src/nm-iface-helper.c:297
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-01-23 17:13+0530\n"
-"PO-Revision-Date: 2014-02-09 10:16-0500\n"
-"Last-Translator: ypoyarko <ypoyarko@redhat.com>\n"
-"Language-Team: русский <gnome-cyr@gnome.org>\n"
+"product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
+"POT-Creation-Date: 2015-02-26 11:39+0000\n"
+"PO-Revision-Date: 2015-02-27 02:25+0300\n"
+"Last-Translator: Stas Solovey <whats_up@tut.by>\n"
+"Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-10-20 12:08+0000\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Gtranslator 2.91.6\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"
 
-#: ../cli/src/common.c:34 ../cli/src/common.c:46 ../cli/src/common.c:54
-#: ../cli/src/common.c:65 ../cli/src/connections.c:174
-#: ../cli/src/connections.c:200
+#: ../clients/cli/agent.c:42
+#, c-format
+msgid ""
+"Usage: nmcli agent { COMMAND | help }\n"
+"\n"
+"COMMAND := { secret | polkit | all }\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:50
+#, c-format
+msgid ""
+"Usage: nmcli agent secret { help }\n"
+"\n"
+"Runs nmcli as NetworkManager secret agent. When NetworkManager requires\n"
+"a password it asks registered agents for it. This command keeps nmcli "
+"running\n"
+"and if a password is required asks the user for it.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:60
+#, c-format
+msgid ""
+"Usage: nmcli agent polkit { help }\n"
+"\n"
+"Registers nmcli as a polkit action for the user session.\n"
+"When a polkit daemon requires an authorization, nmcli asks the user and "
+"gives\n"
+"the response back to polkit.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:70
+#, c-format
+msgid ""
+"Usage: nmcli agent all { help }\n"
+"\n"
+"Runs nmcli as both NetworkManager secret and a polkit agent.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:152
+#, c-format
+msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:154
+#, fuzzy, c-format
+#| msgid "Modem initialization failed"
+msgid "Error: secret agent initialization failed"
+msgstr "Не удалось инициализировать модем"
+
+#: ../clients/cli/agent.c:169
+#, fuzzy, c-format
+#| msgid "Error: Connection activation failed: %s"
+msgid "Error: polkit agent initialization failed: %s"
+msgstr "Ошибка: сбой активации соединения: %s"
+
+#: ../clients/cli/agent.c:177
+#, c-format
+msgid "nmcli successfully registered as a polkit agent.\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:8958
+#: ../clients/cli/connections.c:8984 ../clients/cli/connections.c:9182
+#: ../clients/cli/devices.c:2908 ../clients/cli/general.c:361
+#: ../clients/cli/general.c:514
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Ошибка: NetworkManager не запущен."
+
+#: ../clients/cli/agent.c:245
+#, fuzzy, c-format
+#| msgid "Error: 'general' command '%s' is not valid."
+msgid "Error: 'agent' command '%s' is not valid."
+msgstr "Ошибка. Недопустимая команда «general»: «%s»."
+
+#: ../clients/cli/common.c:40 ../clients/cli/common.c:53
+#: ../clients/cli/common.c:61 ../clients/cli/common.c:73
+#: ../clients/cli/connections.c:172 ../clients/cli/connections.c:194
 msgid "GROUP"
 msgstr "ГРУППА"
 
-#: ../cli/src/common.c:35 ../cli/src/common.c:55
+#. 0
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
 msgid "ADDRESS"
 msgstr "АДРЕС"
 
-#: ../cli/src/common.c:36 ../cli/src/common.c:56
+#. 1
+#. 2
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
+#: ../clients/cli/connections.c:197
+msgid "GATEWAY"
+msgstr "ШЛЮЗ"
+
+#. 2
+#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
 msgid "ROUTE"
 msgstr "МАРШРУТ"
 
-#: ../cli/src/common.c:37 ../cli/src/common.c:57
+#. 3
+#: ../clients/cli/common.c:44 ../clients/cli/common.c:65
 msgid "DNS"
 msgstr "DNS"
 
-#: ../cli/src/common.c:38 ../cli/src/common.c:58
+#. 4
+#: ../clients/cli/common.c:45 ../clients/cli/common.c:66
 msgid "DOMAIN"
 msgstr "ДОМЕН"
 
-#: ../cli/src/common.c:39
+#. 5
+#: ../clients/cli/common.c:46
 msgid "WINS"
 msgstr "WINS"
 
-#: ../cli/src/common.c:47 ../cli/src/common.c:66
+#. 0
+#: ../clients/cli/common.c:54 ../clients/cli/common.c:74
 msgid "OPTION"
 msgstr "ПАРАМЕТР"
 
-#: ../cli/src/common.c:404 ../cli/src/settings.c:2808
-#, c-format
-msgid "invalid IPv4 address '%s'"
-msgstr "недопустимый адрес IPv4: «%s»"
-
-#: ../cli/src/common.c:412
-#, c-format
-msgid "invalid prefix '%s'; <1-32> allowed"
+#: ../clients/cli/common.c:378 ../clients/cli/common.c:438
+#, fuzzy, c-format
+#| msgid "invalid prefix '%s'; <1-32> allowed"
+msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "недопустимый префикс  «%s» (допускается <1-32>)"
 
-#: ../cli/src/common.c:419 ../cli/src/common.c:472
-#, c-format
-msgid "invalid gateway '%s'"
-msgstr "недопустимый шлюз «%s»"
-
-#: ../cli/src/common.c:457 ../cli/src/settings.c:3054
-#, c-format
-msgid "invalid IPv6 address '%s'"
-msgstr "недопустимый адрес IPv6: «%s»"
-
-#: ../cli/src/common.c:465
-#, c-format
-msgid "invalid prefix '%s'; <1-128> allowed"
-msgstr "недопустимый префикс  «%s» (допускается <1-128>)"
-
-#: ../cli/src/common.c:512
-#, c-format
-msgid "invalid IPv4 route '%s'"
-msgstr "недопустимый маршрут IPv4: «%s»"
-
-#: ../cli/src/common.c:520
-#, c-format
-msgid "invalid prefix '%s'; <0-32> allowed"
-msgstr "недопустимый префикс  «%s» (допускается <0-32>)"
+#: ../clients/cli/common.c:386
+#, fuzzy, c-format
+#| msgid "invalid IPv4 address '%s'"
+msgid "invalid IP address: %s"
+msgstr "недопустимый адрес IPv4: «%s»"
 
-#: ../cli/src/common.c:527 ../cli/src/common.c:590
+#: ../clients/cli/common.c:450
 #, c-format
-msgid "invalid next hop address '%s'"
-msgstr "недопустимый адрес перехода: «%s»"
+msgid ""
+"the second component of route ('%s') is neither a next hop address nor a "
+"metric"
+msgstr ""
 
-#: ../cli/src/common.c:534 ../cli/src/common.c:598
+#: ../clients/cli/common.c:459
 #, c-format
 msgid "invalid metric '%s'"
 msgstr "недопустимая метрика «%s»"
 
-#: ../cli/src/common.c:575
-#, c-format
-msgid "invalid IPv6 route '%s'"
-msgstr "недопустимый маршрут IPv6: «%s»"
+#: ../clients/cli/common.c:467
+#, fuzzy, c-format
+#| msgid "invalid IPv4 route '%s'"
+msgid "invalid route: %s"
+msgstr "недопустимый маршрут IPv4: «%s»"
 
-#: ../cli/src/common.c:583
-#, c-format
-msgid "invalid prefix '%s'; <0-128> allowed"
-msgstr "недопустимый префикс  «%s» (допускается <0-128>)"
+#: ../clients/cli/common.c:479
+msgid "default route cannot be added (NetworkManager handles it by itself)"
+msgstr ""
 
-#: ../cli/src/common.c:619
+#: ../clients/cli/common.c:496
 msgid "unmanaged"
 msgstr "без управления"
 
-#: ../cli/src/common.c:621
+#: ../clients/cli/common.c:498
 msgid "unavailable"
 msgstr "недоступен"
 
-#: ../cli/src/common.c:623 ../cli/src/network-manager.c:276
+#: ../clients/cli/common.c:500 ../clients/cli/general.c:260
 msgid "disconnected"
 msgstr "отключено"
 
-#: ../cli/src/common.c:625
+#: ../clients/cli/common.c:502
 msgid "connecting (prepare)"
 msgstr "подключение (подготовка)"
 
-#: ../cli/src/common.c:627
+#: ../clients/cli/common.c:504
 msgid "connecting (configuring)"
 msgstr "подключение (настройка)"
 
-#: ../cli/src/common.c:629
+#: ../clients/cli/common.c:506
 msgid "connecting (need authentication)"
 msgstr "подключение (требуется аутентификация)"
 
-#: ../cli/src/common.c:631
+#: ../clients/cli/common.c:508
 msgid "connecting (getting IP configuration)"
 msgstr "подключение (получение конфигурации IP)"
 
-#: ../cli/src/common.c:633
+#: ../clients/cli/common.c:510
 msgid "connecting (checking IP connectivity)"
 msgstr "подключение (проверка IP-подключения)"
 
-#: ../cli/src/common.c:635
+#: ../clients/cli/common.c:512
 msgid "connecting (starting secondary connections)"
 msgstr "подключение (запуск второстепенных соединений)"
 
-#: ../cli/src/common.c:637 ../cli/src/network-manager.c:272
+#: ../clients/cli/common.c:514 ../clients/cli/general.c:256
 msgid "connected"
 msgstr "подключено"
 
-#: ../cli/src/common.c:639 ../cli/src/connections.c:732
+#: ../clients/cli/common.c:516 ../clients/cli/connections.c:540
 msgid "deactivating"
 msgstr "деактивация"
 
-#: ../cli/src/common.c:641
+#: ../clients/cli/common.c:518
 msgid "connection failed"
 msgstr "сбой соединения"
 
-#: ../cli/src/common.c:643 ../cli/src/connections.c:737
-#: ../cli/src/connections.c:760 ../cli/src/connections.c:1462
-#: ../cli/src/devices.c:827 ../cli/src/devices.c:2257
-#: ../cli/src/network-manager.c:279 ../cli/src/network-manager.c:297
-#: ../cli/src/network-manager.c:360 ../cli/src/network-manager.c:363
-#: ../cli/src/network-manager.c:373 ../cli/src/network-manager.c:375
-#: ../cli/src/network-manager.c:432 ../cli/src/network-manager.c:448
-#: ../cli/src/settings.c:732 ../cli/src/settings.c:760
-#: ../cli/src/settings.c:822 ../cli/src/settings.c:1137
-#: ../cli/src/utils.c:1080 ../src/main.c:470 ../src/main.c:498
+#: ../clients/cli/common.c:520 ../clients/cli/connections.c:545
+#: ../clients/cli/connections.c:568 ../clients/cli/connections.c:1859
+#: ../clients/cli/devices.c:940 ../clients/cli/general.c:263
+#: ../clients/cli/general.c:301 ../clients/cli/general.c:462
+#: ../clients/cli/general.c:478 ../clients/cli/settings.c:721
+#: ../clients/cli/settings.c:783 ../clients/cli/settings.c:1077
+#: ../clients/cli/utils.c:1311 ../src/main.c:315 ../src/main.c:343
 msgid "unknown"
 msgstr "неизвестно"
 
-#: ../cli/src/common.c:652
+#: ../clients/cli/common.c:529
 msgid "No reason given"
 msgstr "Причина не указана"
 
-#: ../cli/src/common.c:655 ../cli/src/connections.c:2258
+#: ../clients/cli/common.c:532 ../clients/cli/connections.c:2859
 #, c-format
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../cli/src/common.c:658
+#: ../clients/cli/common.c:535
 msgid "Device is now managed"
 msgstr "Устройство обслуживается"
 
-#: ../cli/src/common.c:661
+#: ../clients/cli/common.c:538
 msgid "Device is now unmanaged"
 msgstr "Устройство не обслуживается"
 
-#: ../cli/src/common.c:664
+#: ../clients/cli/common.c:541
 msgid "The device could not be readied for configuration"
 msgstr "Устройство не позволяет чтение конфигурации"
 
-#: ../cli/src/common.c:667
+#: ../clients/cli/common.c:544
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "Конфигурация IP не может быть зарезервирована (отсутствует доступный адрес, "
 "истекло время ожидания и т.д.)"
 
-#: ../cli/src/common.c:670
+#: ../clients/cli/common.c:547
 msgid "The IP configuration is no longer valid"
 msgstr "Конфигурация IP не актуальна"
 
-#: ../cli/src/common.c:673
+#: ../clients/cli/common.c:550
 msgid "Secrets were required, but not provided"
 msgstr "Не предоставлена требуемая секретная информация"
 
-#: ../cli/src/common.c:676
+#: ../clients/cli/common.c:553
 msgid "802.1X supplicant disconnected"
 msgstr "Заявитель 802.1X отключён"
 
-#: ../cli/src/common.c:679
+#: ../clients/cli/common.c:556
 msgid "802.1X supplicant configuration failed"
 msgstr "Сбой конфигурации заявителя 802.1X"
 
-#: ../cli/src/common.c:682
+#: ../clients/cli/common.c:559
 msgid "802.1X supplicant failed"
 msgstr "Сбой заявителя 802.1X"
 
-#: ../cli/src/common.c:685
+#: ../clients/cli/common.c:562
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "Превышено время ожидания при проверке подлинности заявителя 802.1X"
 
-#: ../cli/src/common.c:688
+#: ../clients/cli/common.c:565
 msgid "PPP service failed to start"
 msgstr "Не удалось запустить службу PPP"
 
-#: ../cli/src/common.c:691
+#: ../clients/cli/common.c:568
 msgid "PPP service disconnected"
 msgstr "Служба PPP отключена"
 
-#: ../cli/src/common.c:694
+#: ../clients/cli/common.c:571
 msgid "PPP failed"
 msgstr "Сбой PPP"
 
-#: ../cli/src/common.c:697
+#: ../clients/cli/common.c:574
 msgid "DHCP client failed to start"
 msgstr "Не удалось запустить клиент DHCP"
 
-#: ../cli/src/common.c:700
+#: ../clients/cli/common.c:577
 msgid "DHCP client error"
 msgstr "Ошибка клиента DHCP"
 
-#: ../cli/src/common.c:703
+#: ../clients/cli/common.c:580
 msgid "DHCP client failed"
 msgstr "Сбой клиента DHCP"
 
-#: ../cli/src/common.c:706
+#: ../clients/cli/common.c:583
 msgid "Shared connection service failed to start"
 msgstr "Не удалось запустить службу общего подключения"
 
-#: ../cli/src/common.c:709
+#: ../clients/cli/common.c:586
 msgid "Shared connection service failed"
 msgstr "Сбой службы общего подключения"
 
-#: ../cli/src/common.c:712
+#: ../clients/cli/common.c:589
 msgid "AutoIP service failed to start"
 msgstr "Не удалось запустить службу AutoIP"
 
-#: ../cli/src/common.c:715
+#: ../clients/cli/common.c:592
 msgid "AutoIP service error"
 msgstr "Сбой службы AutoIP"
 
-#: ../cli/src/common.c:718
+#: ../clients/cli/common.c:595
 msgid "AutoIP service failed"
 msgstr "Ошибка службы AutoIP"
 
-#: ../cli/src/common.c:721
+#: ../clients/cli/common.c:598
 msgid "The line is busy"
 msgstr "Линия занята"
 
-#: ../cli/src/common.c:724
+#: ../clients/cli/common.c:601
 msgid "No dial tone"
 msgstr "Нет гудка"
 
-#: ../cli/src/common.c:727
+#: ../clients/cli/common.c:604
 msgid "No carrier could be established"
 msgstr "Не удалось установить несущую частоту"
 
-#: ../cli/src/common.c:730
+#: ../clients/cli/common.c:607
 msgid "The dialing request timed out"
 msgstr "Истекло время ожидания набора номера"
 
-#: ../cli/src/common.c:733
+#: ../clients/cli/common.c:610
 msgid "The dialing attempt failed"
 msgstr "Во время набора номера произошла ошибка"
 
-#: ../cli/src/common.c:736
+#: ../clients/cli/common.c:613
 msgid "Modem initialization failed"
 msgstr "Не удалось инициализировать модем"
 
-#: ../cli/src/common.c:739
+#: ../clients/cli/common.c:616
 msgid "Failed to select the specified APN"
 msgstr "Не удалось выбрать указанный APN"
 
-#: ../cli/src/common.c:742
+#: ../clients/cli/common.c:619
 msgid "Not searching for networks"
 msgstr "Не выполнять поиск сетей"
 
-#: ../cli/src/common.c:745
+#: ../clients/cli/common.c:622
 msgid "Network registration denied"
 msgstr "Регистрация сети запрещена"
 
-#: ../cli/src/common.c:748
+#: ../clients/cli/common.c:625
 msgid "Network registration timed out"
 msgstr "Истекло время ожидания регистрации сети"
 
-#: ../cli/src/common.c:751
+#: ../clients/cli/common.c:628
 msgid "Failed to register with the requested network"
 msgstr "Не удалось зарегистрироваться в запрошенной сети"
 
-#: ../cli/src/common.c:754
+#: ../clients/cli/common.c:631
 msgid "PIN check failed"
 msgstr "PIN-код не прошёл проверку"
 
-#: ../cli/src/common.c:757
+#: ../clients/cli/common.c:634
 msgid "Necessary firmware for the device may be missing"
 msgstr ""
 "Возможно для устройства требуется дополнительное программное обеспечение"
 
-#: ../cli/src/common.c:760
+#: ../clients/cli/common.c:637
 msgid "The device was removed"
 msgstr "Устройство извлечено"
 
-#: ../cli/src/common.c:763
+#: ../clients/cli/common.c:640
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager перешёл в спящий режим"
 
-#: ../cli/src/common.c:766
+#: ../clients/cli/common.c:643
 msgid "The device's active connection disappeared"
 msgstr "Устройство потеряло используемое соединение"
 
-#: ../cli/src/common.c:769
+#: ../clients/cli/common.c:646
 msgid "Device disconnected by user or client"
 msgstr "Устройство отключено пользователем или клиентом"
 
-#: ../cli/src/common.c:772
+#: ../clients/cli/common.c:649
 msgid "Carrier/link changed"
 msgstr "Произошли изменения линии или несущей частоты"
 
-#: ../cli/src/common.c:775
+#: ../clients/cli/common.c:652
 msgid "The device's existing connection was assumed"
 msgstr "Существующее соединение устройства принято"
 
-#: ../cli/src/common.c:778
+#: ../clients/cli/common.c:655
 msgid "The supplicant is now available"
 msgstr "Доступен заявитель"
 
-#: ../cli/src/common.c:781
+#: ../clients/cli/common.c:658
 msgid "The modem could not be found"
 msgstr "Не удалось обнаружить модем"
 
-#: ../cli/src/common.c:784
+#: ../clients/cli/common.c:661
 msgid "The Bluetooth connection failed or timed out"
 msgstr "Время ожидания соединения по Bluetooth истекло или произошла ошибка"
 
-#: ../cli/src/common.c:787
+#: ../clients/cli/common.c:664
 msgid "GSM Modem's SIM card not inserted"
 msgstr "Не вставлена SIM-карта GSM-модема"
 
-#: ../cli/src/common.c:790
+#: ../clients/cli/common.c:667
 msgid "GSM Modem's SIM PIN required"
 msgstr "Требуется PIN-код к SIM-карте GSM-модема"
 
-#: ../cli/src/common.c:793
+#: ../clients/cli/common.c:670
 msgid "GSM Modem's SIM PUK required"
 msgstr "Требуется PUK-код к SIM-карте GSM-модема"
 
-#: ../cli/src/common.c:796
+#: ../clients/cli/common.c:673
 msgid "GSM Modem's SIM wrong"
 msgstr "Неверная SIM-карта GSM модема"
 
-#: ../cli/src/common.c:799
+#: ../clients/cli/common.c:676
 msgid "InfiniBand device does not support connected mode"
 msgstr "Устройство InfiniBand не поддерживает режим соединения"
 
-#: ../cli/src/common.c:802
+#: ../clients/cli/common.c:679
 msgid "A dependency of the connection failed"
 msgstr "Сбой зависимости соединения"
 
-#: ../cli/src/common.c:805
+#: ../clients/cli/common.c:682
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Ошибка RFC 2684 Ethernet с использованием моста ADSL"
 
-#: ../cli/src/common.c:808
+#: ../clients/cli/common.c:685
 msgid "ModemManager is unavailable"
 msgstr "ModemManager недоступен"
 
-#: ../cli/src/common.c:811
+#: ../clients/cli/common.c:688
 msgid "The Wi-Fi network could not be found"
 msgstr "Не удалось обнаружить сеть Wi-Fi"
 
-#: ../cli/src/common.c:814
+#: ../clients/cli/common.c:691
 msgid "A secondary connection of the base connection failed"
 msgstr "Сбой вторичного подключения основого соединения"
 
-#: ../cli/src/common.c:817
+#: ../clients/cli/common.c:694
 msgid "DCB or FCoE setup failed"
 msgstr "Не удалось настроить DCB или FCoE"
 
-#: ../cli/src/common.c:820
+#: ../clients/cli/common.c:697
 msgid "teamd control failed"
 msgstr "Не удалось настроить teamd"
 
-#: ../cli/src/common.c:824 ../cli/src/devices.c:634 ../tui/nm-ui-utils.c:359
+#: ../clients/cli/common.c:700
+#, fuzzy
+#| msgid "ModemManager is unavailable"
+msgid "Modem failed or no longer available"
+msgstr "ModemManager недоступен"
+
+#: ../clients/cli/common.c:703
+#, fuzzy
+#| msgid "ModemManager is unavailable"
+msgid "Modem now ready and available"
+msgstr "ModemManager недоступен"
+
+#: ../clients/cli/common.c:706
+msgid "SIM PIN was incorrect"
+msgstr "Неверный PIN-код SIM-карты"
+
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#: ../clients/cli/common.c:710 ../clients/cli/devices.c:681
+#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1635
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../cli/src/common.c:866
+#: ../clients/cli/common.c:752
 #, c-format
 msgid "invalid priority map '%s'"
-msgstr "Неверная схема приоритетов  «%s»"
+msgstr "Неверная схема приоритетов «%s»"
 
-#: ../cli/src/common.c:873 ../cli/src/common.c:879
+#: ../clients/cli/common.c:759 ../clients/cli/common.c:765
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "недопустимый приоритет «%s» (<0-%ld>)"
 
-#: ../cli/src/common.c:935
+#: ../clients/cli/common.c:832
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
-msgstr "Недопустимое имя файла или неверная конфигурация группы: «%s»"
+msgstr ""
+"Недопустимое имя файла или неверная конфигурация агрегации (team): «%s»"
+
+#: ../clients/cli/common.c:933
+#, c-format
+msgid ""
+"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
+"without '--ask' option.\n"
+msgstr ""
 
-#: ../cli/src/connections.c:62
+#. define some prompts for connection editor
+#: ../clients/cli/connections.c:42
 msgid "Setting name? "
 msgstr "Настройка имени?"
 
-#: ../cli/src/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Property name? "
 msgstr "Имя свойства?"
 
-#: ../cli/src/connections.c:64
+#: ../clients/cli/connections.c:44
 msgid "Enter connection type: "
 msgstr "Выберите тип соединения:"
 
-#: ../cli/src/connections.c:68 ../cli/src/connections.c:175
-#: ../cli/src/devices.c:86 ../cli/src/devices.c:114 ../cli/src/devices.c:124
-#: ../cli/src/devices.c:134 ../cli/src/devices.c:143 ../cli/src/devices.c:158
-#: ../cli/src/devices.c:171 ../cli/src/devices.c:197 ../cli/src/devices.c:212
-#: ../cli/src/devices.c:221
+#. define some other prompts
+#: ../clients/cli/connections.c:47
+msgid "Connection type: "
+msgstr "Тип соединения:"
+
+#: ../clients/cli/connections.c:48
+msgid "VPN type: "
+msgstr "Тип VPN:"
+
+#: ../clients/cli/connections.c:49
+msgid "Bond master: "
+msgstr "Мастер-агрегации (Bond):"
+
+#: ../clients/cli/connections.c:50
+msgid "Team master: "
+msgstr "Мастер-агрегации (Team):"
+
+#: ../clients/cli/connections.c:51
+msgid "Bridge master: "
+msgstr "Мастер-мост:"
+
+#: ../clients/cli/connections.c:52
+msgid "Connection (name, UUID, or path): "
+msgstr "Соединение (имя, UUID, или путь):"
+
+#. 0
+#: ../clients/cli/connections.c:60 ../clients/cli/connections.c:173
+#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:86
+#: ../clients/cli/devices.c:96 ../clients/cli/devices.c:107
+#: ../clients/cli/devices.c:116 ../clients/cli/devices.c:131
+#: ../clients/cli/devices.c:144 ../clients/cli/devices.c:170
+#: ../clients/cli/devices.c:185 ../clients/cli/devices.c:194
+#: ../clients/cli/devices.c:204
 msgid "NAME"
 msgstr "ИМЯ"
 
-#: ../cli/src/connections.c:69 ../cli/src/connections.c:176
+#. 0
+#. 1
+#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174
 msgid "UUID"
 msgstr "UUID"
 
-#: ../cli/src/connections.c:70 ../cli/src/connections.c:201
-#: ../cli/src/devices.c:72 ../cli/src/devices.c:88 ../cli/src/devices.c:200
+#. 1
+#. 0
+#. 1
+#. 2
+#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:195
+#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:59
+#: ../clients/cli/devices.c:173
 msgid "TYPE"
 msgstr "ТИП"
 
-#: ../cli/src/connections.c:71
+#. 2
+#: ../clients/cli/connections.c:63
 msgid "TIMESTAMP"
 msgstr "МЕТКА ВРЕМЕНИ"
 
-#: ../cli/src/connections.c:72
+#. 3
+#: ../clients/cli/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "ДЕЙСТВ. МЕТКА ВРЕМЕНИ"
 
-#: ../cli/src/connections.c:73 ../cli/src/devices.c:101
+#. 4
+#. 15
+#: ../clients/cli/connections.c:65 ../clients/cli/devices.c:73
 msgid "AUTOCONNECT"
 msgstr "АВТОПОДКЛЮЧЕНИЕ"
 
-#: ../cli/src/connections.c:74
+#. 5
+#: ../clients/cli/connections.c:66
+#, fuzzy
+#| msgid "AUTOCONNECT"
+msgid "AUTOCONNECT-PRIORITY"
+msgstr "АВТОПОДКЛЮЧЕНИЕ"
+
+#. 6
+#: ../clients/cli/connections.c:67
 msgid "READONLY"
 msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ"
 
-#: ../cli/src/connections.c:75 ../cli/src/connections.c:183
-#: ../cli/src/devices.c:74 ../cli/src/devices.c:187 ../cli/src/devices.c:203
+#. 7
+#. 8
+#. 2
+#. 15
+#. 5
+#: ../clients/cli/connections.c:68 ../clients/cli/connections.c:181
+#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:160
+#: ../clients/cli/devices.c:176
 msgid "DBUS-PATH"
 msgstr "DBUS-PATH"
 
-#: ../cli/src/connections.c:177
-msgid "DEVICES"
-msgstr "УСТРОЙСТВА"
+#. 8
+#. 13
+#. 4
+#: ../clients/cli/connections.c:69 ../clients/cli/devices.c:158
+#: ../clients/cli/devices.c:175
+msgid "ACTIVE"
+msgstr "АКТИВЕН"
 
-#: ../cli/src/connections.c:178 ../cli/src/devices.c:73
-#: ../cli/src/devices.c:96 ../cli/src/network-manager.c:39
+#. 9
+#. 0
+#. 12
+#. 3
+#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:42
+#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:157
+#: ../clients/cli/devices.c:174
+msgid "DEVICE"
+msgstr "УСТРОЙСТВО"
+
+#. 10
+#. 3
+#. 1
+#. 9
+#. 1
+#: ../clients/cli/connections.c:71 ../clients/cli/connections.c:176
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:67
+#: ../clients/cli/general.c:37
 msgid "STATE"
 msgstr "СОСТОЯНИЕ"
 
-#: ../cli/src/connections.c:179
+#. 11
+#: ../clients/cli/connections.c:72
+#, fuzzy
+#| msgid "MASTER-PATH"
+msgid "ACTIVE-PATH"
+msgstr "МАСТЕР-ПУТЬ"
+
+#. 2
+#: ../clients/cli/connections.c:175
+msgid "DEVICES"
+msgstr "УСТРОЙСТВА"
+
+#. 4
+#: ../clients/cli/connections.c:177
 msgid "DEFAULT"
 msgstr "ПО УМОЛЧАНИЮ"
 
-#: ../cli/src/connections.c:180
+#. 5
+#: ../clients/cli/connections.c:178
 msgid "DEFAULT6"
 msgstr "ПО УМОЛЧАНИЮ 6"
 
-#: ../cli/src/connections.c:181
+#. 6
+#: ../clients/cli/connections.c:179
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#: ../cli/src/connections.c:182 ../cli/src/connections.c:224
-#: ../tui/nm-editor-utils.c:243 ../tui/nmt-connect-connection-list.c:343
+#. 7
+#. 4
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:180 ../clients/cli/connections.c:218
+#: ../clients/cli/connections.c:3984 ../clients/tui/nm-editor-utils.c:234
+#: ../clients/tui/nmt-connect-connection-list.c:406
 msgid "VPN"
 msgstr "VPN"
 
-#: ../cli/src/connections.c:184 ../cli/src/devices.c:77
-#: ../cli/src/devices.c:105
+#. 9
+#. 5
+#. 19
+#: ../clients/cli/connections.c:182 ../clients/cli/devices.c:48
+#: ../clients/cli/devices.c:77
 msgid "CON-PATH"
 msgstr "ПУТЬ ПОДКЛЮЧЕНИЯ"
 
-#: ../cli/src/connections.c:185
+#. 10
+#: ../clients/cli/connections.c:183
 msgid "ZONE"
 msgstr "ЗОНА"
 
-#: ../cli/src/connections.c:186
+#. 11
+#: ../clients/cli/connections.c:184
 msgid "MASTER-PATH"
 msgstr "МАСТЕР-ПУТЬ"
 
-#: ../cli/src/connections.c:202
+#. 1
+#: ../clients/cli/connections.c:196
 msgid "USERNAME"
 msgstr "ИМЯ_ПОЛЬЗОВАТЕЛЯ"
 
-#: ../cli/src/connections.c:203
-msgid "GATEWAY"
-msgstr "ШЛЮЗ"
-
-#: ../cli/src/connections.c:204
+#. 3
+#: ../clients/cli/connections.c:198
 msgid "BANNER"
 msgstr "БАННЕР"
 
-#: ../cli/src/connections.c:205
+#. 4
+#: ../clients/cli/connections.c:199
 msgid "VPN-STATE"
 msgstr "СТАТУС VPN"
 
-#: ../cli/src/connections.c:206
+#. 5
+#: ../clients/cli/connections.c:200
 msgid "CFG"
 msgstr "CFG"
 
-#: ../cli/src/connections.c:219 ../cli/src/devices.c:236
+#: ../clients/cli/connections.c:213 ../clients/cli/devices.c:219
 msgid "GENERAL"
 msgstr "ОБЩИЕ"
 
-#: ../cli/src/connections.c:220 ../cli/src/devices.c:243
+#. 0
+#. 6
+#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:226
 msgid "IP4"
 msgstr "IP4"
 
-#: ../cli/src/connections.c:221 ../cli/src/devices.c:244
+#. 1
+#. 7
+#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:227
 msgid "DHCP4"
 msgstr "DHCP4"
 
-#: ../cli/src/connections.c:222 ../cli/src/devices.c:245
+#. 2
+#. 8
+#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:228
 msgid "IP6"
 msgstr "IP6"
 
-#: ../cli/src/connections.c:223 ../cli/src/devices.c:246
+#. 3
+#. 9
+#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:229
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../cli/src/connections.c:255
-#, c-format
+#: ../clients/cli/connections.c:251
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli connection { COMMAND | help }\n"
+#| "\n"
+#| "COMMAND := { show | up | down | add | modify | edit | delete | reload | "
+#| "load }\n"
+#| "\n"
+#| "  show configured [[id | uuid | path] <ID>]\n"
+#| "  show active     [[id | uuid | path | apath] <ID>]\n"
+#| "\n"
+#| "  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp "
+#| "<name>]\n"
+#| "\n"
+#| "  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+#| "\n"
+#| "  down [id | uuid | path | apath] <ID>\n"
+#| "\n"
+#| "  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#| "\n"
+#| "  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+#| "\n"
+#| "  edit [id | uuid | path] <ID>\n"
+#| "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
+#| "\n"
+#| "  delete [id | uuid | path] <ID>\n"
+#| "\n"
+#| "  reload\n"
+#| "\n"
+#| "  load <filename> [ <filename>... ]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
+"load }\n"
 "\n"
-"  show configured [[id | uuid | path] <ID>]\n"
-"  show active     [[id | uuid | path | apath] <ID>]\n"
+"  show [--active] [--order <order spec>]\n"
+"  show [--active] [--show-secrets] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>] "
+"[passwd-file <file with passwords>]\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<file with passwords>]\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
 "  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
 "\n"
-"  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
 "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
@@ -590,8 +823,8 @@ msgid ""
 msgstr ""
 "Формат: nmcli connection { КОМАНДА | help }\n"
 "\n"
-"КОМАНДА := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
+"КОМАНДА := { show | up | down | add | modify | edit | delete | reload | "
+"load }\n"
 "\n"
 "  show configured [[id | uuid | путь] <ID>]\n"
 "  show active     [[id | uuid | путь | абс.путь] <ID>]\n"
@@ -616,62 +849,74 @@ msgstr ""
 "  load <файл> [ <файл>... ]\n"
 "\n"
 
-#: ../cli/src/connections.c:278
+#: ../clients/cli/connections.c:273
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
-"\n"
-"Show connections which are currently used by a device to connect to a "
-"network.\n"
-"Without a parameter, all active connections are listed. When <ID> is "
-"provided,\n"
-"the connection details are displayed instead.\n"
-"\n"
-"ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
-"\n"
-"Show in-memory and on-disk connections, some of which may also be active if\n"
-"a device is using that connection profile. Without a parameter, all profiles\n"
-"are listed. When <ID> is provided, the profile details are displayed instead."
-"\n"
-"\n"
+"ARGUMENTS := [--active] [--order <order spec>]\n"
+"\n"
+"List in-memory and on-disk connection profiles, some of which may also be\n"
+"active if a device is using that connection profile. Without a parameter, "
+"all\n"
+"profiles are listed. When --active option is specified, only the active\n"
+"profiles are shown. --order allows custom connection ordering (see manual "
+"page).\n"
+"\n"
+"ARGUMENTS := [--active] [--show-secrets] [id | uuid | path | apath] "
+"<ID> ...\n"
+"\n"
+"Show details for specified connections. By default, both static "
+"configuration\n"
+"and active connection data are displayed. It is possible to filter the "
+"output\n"
+"using global '--fields' option. Refer to the manual page for more "
+"information.\n"
+"When --active option is specified, only the active profiles are taken into\n"
+"account. --show-secrets option will reveal associated secrets as well.\n"
 msgstr ""
-"Формат: nmcli connection show { АРГУМЕНТЫ | help }\n"
-"\n"
-"АРГУМЕНТЫ := active [[id | uuid | path | apath] <ID>]\n"
-"\n"
-"Показывает список соединений.\n"
-"Если параметры не указаны, команда вернет все активные соединения.\n"
-"Если указан идентификатор, будет показана информация о его соединении.\n"
-"\n"
-"АРГУМЕНТЫ := configured [[id | uuid | path] <ID>]\n"
-"\n"
-"Показывает настроенные соединения, которые могут быть активны,\n"
-"если устройство использует соответствующий профиль соединения.\n"
-"Если параметры не указаны, команда вернет все профили.\n"
-"Если указан идентификатор, будет показаны сведения о его профиле.\n"
 
-#: ../cli/src/connections.c:297
-#, c-format
+#: ../clients/cli/connections.c:294
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli connection up { ARGUMENTS | help }\n"
+#| "\n"
+#| "ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
+#| "<name>]\n"
+#| "\n"
+#| "Activate a connection on a device. The profile to activate is identified "
+#| "by its\n"
+#| "name, UUID or D-Bus path.\n"
+#| "\n"
+#| "ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+#| "\n"
+#| "Activate a device with a connection. The connection profile is selected\n"
+#| "automatically by NetworkManager.\n"
+#| "\n"
+#| "ifname - specifies the device to active the connection on\n"
+#| "ap     - specifies AP to connect to (only valid for Wi-Fi)\n"
+#| "nsp    - specifies NSP to connect to (only valid for WiMAX)\n"
+#| "\n"
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>]\n"
+"<name>] [passwd-file <file with passwords>]\n"
 "\n"
 "Activate a connection on a device. The profile to activate is identified by "
 "its\n"
 "name, UUID or D-Bus path.\n"
 "\n"
-"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
+"with passwords>]\n"
 "\n"
 "Activate a device with a connection. The connection profile is selected\n"
 "automatically by NetworkManager.\n"
 "\n"
-"ifname - specifies the device to active the connection on\n"
-"ap     - specifies AP to connect to (only valid for Wi-Fi)\n"
-"nsp    - specifies NSP to connect to (only valid for WiMAX)\n"
+"ifname      - specifies the device to active the connection on\n"
+"ap          - specifies AP to connect to (only valid for Wi-Fi)\n"
+"nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
+"passwd-file - file with password(s) required to activate the connection\n"
 "\n"
 msgstr ""
 "Формат: nmcli connection up { АРГУМЕНТЫ | help }\n"
@@ -692,12 +937,23 @@ msgstr ""
 "nsp    — NSP (только для WiMAX)\n"
 "\n"
 
-#: ../cli/src/connections.c:318
-#, c-format
+#: ../clients/cli/connections.c:315
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli connection down { ARGUMENTS | help }\n"
+#| "\n"
+#| "ARGUMENTS := [id | uuid | path | apath] <ID>\n"
+#| "\n"
+#| "Deactivate a connection from a device (without preventing the device "
+#| "from\n"
+#| "further auto-activation). The profile to deactivate is identified by its "
+#| "name,\n"
+#| "UUID or D-Bus path.\n"
+#| "\n"
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path | apath] <ID>\n"
+"ARGUMENTS := [id | uuid | path | apath] <ID> ...\n"
 "\n"
 "Deactivate a connection from a device (without preventing the device from\n"
 "further auto-activation). The profile to deactivate is identified by its "
@@ -709,14 +965,108 @@ msgstr ""
 "\n"
 "АРГУМЕНТЫ := [id | uuid | path | apath] <ID>\n"
 "\n"
-"Отключение соединения с устройством, не ограничивая подключение в дальнейшем."
-"\n"
+"Отключение соединения с устройством, не ограничивая подключение в "
+"дальнейшем.\n"
 "Профиль определяется по имени, UUID или пути D-Bus.\n"
 "\n"
 "\n"
 
-#: ../cli/src/connections.c:331
-#, c-format
+#: ../clients/cli/connections.c:327
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli connection add { ARGUMENTS | help }\n"
+#| "\n"
+#| "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#| "\n"
+#| "  COMMON_OPTIONS:\n"
+#| "                  type <type>\n"
+#| "                  ifname <interface name> | \"*\"\n"
+#| "                  [con-name <connection name>]\n"
+#| "                  [autoconnect yes|no]\n"
+#| "\n"
+#| "  TYPE_SPECIFIC_OPTIONS:\n"
+#| "    ethernet:     [mac <MAC address>]\n"
+#| "                  [cloned-mac <cloned MAC address>]\n"
+#| "                  [mtu <MTU>]\n"
+#| "\n"
+#| "    wifi:         ssid <SSID>\n"
+#| "                  [mac <MAC address>]\n"
+#| "                  [cloned-mac <cloned MAC address>]\n"
+#| "                  [mtu <MTU>]\n"
+#| "\n"
+#| "    wimax:        [mac <MAC address>]\n"
+#| "                  [nsp <NSP>]\n"
+#| "\n"
+#| "    pppoe:        username <PPPoE username>\n"
+#| "                  [password <PPPoE password>]\n"
+#| "                  [service <PPPoE service name>]\n"
+#| "                  [mtu <MTU>]\n"
+#| "                  [mac <MAC address>]\n"
+#| "\n"
+#| "    gsm:          apn <APN>\n"
+#| "                  [user <username>]\n"
+#| "                  [password <password>]\n"
+#| "\n"
+#| "    cdma:         [user <username>]\n"
+#| "                  [password <password>]\n"
+#| "\n"
+#| "    infiniband:   [mac <MAC address>]\n"
+#| "                  [mtu <MTU>]\n"
+#| "                  [transport-mode datagram | connected]\n"
+#| "                  [parent <ifname>]\n"
+#| "                  [p-key <IPoIB P_Key>]\n"
+#| "\n"
+#| "    bluetooth:    [addr <bluetooth address>]\n"
+#| "                  [bt-type panu|dun-gsm|dun-cdma]\n"
+#| "\n"
+#| "    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+#| "                  id <VLAN ID>\n"
+#| "                  [flags <VLAN flags>]\n"
+#| "                  [ingress <ingress priority mapping>]\n"
+#| "                  [egress <egress priority mapping>]\n"
+#| "                  [mtu <MTU>]\n"
+#| "\n"
+#| "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor "
+#| "(2) | broadcast (3) |\n"
+#| "                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
+#| "(6)]\n"
+#| "                  [primary <ifname>]\n"
+#| "                  [miimon <num>]\n"
+#| "                  [downdelay <num>]\n"
+#| "                  [updelay <num>]\n"
+#| "                  [arp-interval <num>]\n"
+#| "                  [arp-ip-target <num>]\n"
+#| "\n"
+#| "    bond-slave:   master <master (ifname or connection UUID)>\n"
+#| "\n"
+#| "    team:         [config <file>|<raw JSON data>]\n"
+#| "\n"
+#| "    team-slave:   master <master (ifname or connection UUID)>\n"
+#| "                  [config <file>|<raw JSON data>]\n"
+#| "\n"
+#| "    bridge:       [stp yes|no]\n"
+#| "                  [priority <num>]\n"
+#| "                  [forward-delay <2-30>]\n"
+#| "                  [hello-time <1-10>]\n"
+#| "                  [max-age <6-40>]\n"
+#| "                  [ageing-time <0-1000000>]\n"
+#| "\n"
+#| "    bridge-slave: master <master (ifname or connection UUID)>\n"
+#| "                  [priority <0-63>]\n"
+#| "                  [path-cost <1-65535>]\n"
+#| "                  [hairpin yes|no]\n"
+#| "\n"
+#| "    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+#| "                  [user <username>]\n"
+#| "\n"
+#| "    olpc-mesh:    ssid <SSID>\n"
+#| "                  [channel <1-13>]\n"
+#| "                  [dhcp-anycast <MAC address>]\n"
+#| "\n"
+#| "  IP_OPTIONS:\n"
+#| "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
+#| "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -728,6 +1078,8 @@ msgid ""
 "                  [con-name <connection name>]\n"
 "                  [autoconnect yes|no]\n"
 "\n"
+"                  [save yes|no]\n"
+"\n"
 "  TYPE_SPECIFIC_OPTIONS:\n"
 "    ethernet:     [mac <MAC address>]\n"
 "                  [cloned-mac <cloned MAC address>]\n"
@@ -737,6 +1089,7 @@ msgid ""
 "                  [mac <MAC address>]\n"
 "                  [cloned-mac <cloned MAC address>]\n"
 "                  [mtu <MTU>]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
 "\n"
 "    wimax:        [mac <MAC address>]\n"
 "                  [nsp <NSP>]\n"
@@ -780,12 +1133,13 @@ msgid ""
 "                  [updelay <num>]\n"
 "                  [arp-interval <num>]\n"
 "                  [arp-ip-target <num>]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <master (ifname or connection UUID)>\n"
+"    bond-slave:   master <master (ifname, or connection UUID or name)>\n"
 "\n"
 "    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"    team-slave:   master <master (ifname or connection UUID)>\n"
+"    team-slave:   master <master (ifname, or connection UUID or name)>\n"
 "                  [config <file>|<raw JSON data>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
@@ -794,13 +1148,16 @@ msgid ""
 "                  [hello-time <1-10>]\n"
 "                  [max-age <6-40>]\n"
 "                  [ageing-time <0-1000000>]\n"
+"                  [multicast-snooping yes|no]\n"
+"                  [mac <MAC address>]\n"
 "\n"
-"    bridge-slave: master <master (ifname or connection UUID)>\n"
+"    bridge-slave: master <master (ifname, or connection UUID or name)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -907,27 +1264,32 @@ msgstr ""
 "                  [ip6 <адрес IPv6>] [gw6 <шлюз IPv6>]\n"
 "\n"
 
-#: ../cli/src/connections.c:408
+#: ../clients/cli/connections.c:408
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-"[<value>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
-"Modify a single property in the connection profile.\n"
-"The profile is identified by its name, UUID or D-Bus path.\n"
-"\n"
-msgstr ""
-"Формат: nmcli connection modify { АРГУМЕНТЫ | help }\n"
-"\n"
-"АРГУМЕНТЫ := [id | uuid | путь] <ID> <параметр>.<свойство> [<защита>]\n"
+"Modify one or more properties of the connection profile.\n"
+"The profile is identified by its name, UUID or D-Bus path. For multi-valued\n"
+"properties you can use optional '+' or '-' prefix to the property name.\n"
+"The '+' sign allows appending items instead of overwriting the whole value.\n"
+"The '-' sign allows removing selected items instead of the whole value.\n"
 "\n"
-"Изменение свойства в профиле соединения. \n"
-"Профиль определяется по имени, UUID или пути D-Bus.\n"
+"Examples:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
+msgstr ""
 
-#: ../cli/src/connections.c:420
+#: ../clients/cli/connections.c:431
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -954,7 +1316,7 @@ msgstr ""
 "Добавление нового профиля соединения в интерактивном редакторе.\n"
 "\n"
 
-#: ../cli/src/connections.c:436
+#: ../clients/cli/connections.c:446
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -973,7 +1335,7 @@ msgstr ""
 "Профиль определяется по имени, UUID или пути D-Bus.\n"
 "\n"
 
-#: ../cli/src/connections.c:448
+#: ../clients/cli/connections.c:457
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -986,7 +1348,7 @@ msgstr ""
 "Перезагрузка файлов соединений с диска.\n"
 "\n"
 
-#: ../cli/src/connections.c:457
+#: ../clients/cli/connections.c:465
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1008,926 +1370,1094 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../cli/src/connections.c:515
-#, c-format
-msgid "Error: 'list configured': %s"
-msgstr "Ошибка «list configured»: %s"
-
-#: ../cli/src/connections.c:523
-msgid "Connection details"
-msgstr "Свойства подключения"
-
-#: ../cli/src/connections.c:589
-msgid "never"
-msgstr "никогда"
-
-#: ../cli/src/connections.c:590 ../cli/src/connections.c:591
-#: ../cli/src/connections.c:833 ../cli/src/connections.c:834
-#: ../cli/src/connections.c:836 ../cli/src/connections.c:6112
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:654 ../cli/src/devices.c:796
-#: ../cli/src/devices.c:797 ../cli/src/devices.c:798 ../cli/src/devices.c:831
-#: ../cli/src/devices.c:860 ../cli/src/devices.c:861 ../cli/src/devices.c:862
-#: ../cli/src/devices.c:863 ../cli/src/devices.c:864 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/network-manager.c:442
-msgid "yes"
-msgstr "да"
-
-#: ../cli/src/connections.c:590 ../cli/src/connections.c:591
-#: ../cli/src/connections.c:833 ../cli/src/connections.c:834
-#: ../cli/src/connections.c:836 ../cli/src/connections.c:6112
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:654 ../cli/src/devices.c:796
-#: ../cli/src/devices.c:797 ../cli/src/devices.c:798 ../cli/src/devices.c:831
-#: ../cli/src/devices.c:860 ../cli/src/devices.c:861 ../cli/src/devices.c:862
-#: ../cli/src/devices.c:863 ../cli/src/devices.c:864 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/network-manager.c:444
-msgid "no"
-msgstr "нет"
-
-#: ../cli/src/connections.c:667
-msgid "List of configured connections"
-msgstr "Список настроенных соединений"
-
-#: ../cli/src/connections.c:684 ../cli/src/connections.c:1225
-#: ../cli/src/connections.c:1785 ../cli/src/connections.c:1801
-#: ../cli/src/connections.c:1810 ../cli/src/connections.c:1820
-#: ../cli/src/connections.c:1916 ../cli/src/connections.c:7563
-#: ../cli/src/connections.c:7738 ../cli/src/devices.c:1633
-#: ../cli/src/devices.c:1641 ../cli/src/devices.c:2028
-#: ../cli/src/devices.c:2035 ../cli/src/devices.c:2049
-#: ../cli/src/devices.c:2056 ../cli/src/devices.c:2073
-#: ../cli/src/devices.c:2081 ../cli/src/devices.c:2277
-#: ../cli/src/devices.c:2373 ../cli/src/devices.c:2380
-#, c-format
-msgid "Error: %s argument is missing."
-msgstr "Ошибка: отсутствует аргумент %s."
-
-#: ../cli/src/connections.c:698
-#, c-format
-msgid "Error: %s - no such connection."
-msgstr "Ошибка: неизвестное подключение %s."
-
-#: ../cli/src/connections.c:710
-#, c-format
-msgid "Error: 'show configured': %s"
-msgstr "Ошибка «show configured»: %s"
-
-#: ../cli/src/connections.c:715 ../cli/src/connections.c:1853
-#: ../cli/src/connections.c:7804 ../cli/src/connections.c:7845
-#: ../cli/src/connections.c:7997 ../cli/src/devices.c:2256
-#: ../cli/src/devices.c:2630 ../cli/src/network-manager.c:539
-#: ../cli/src/network-manager.c:582 ../cli/src/network-manager.c:599
-#: ../cli/src/network-manager.c:645 ../cli/src/network-manager.c:659
-#: ../cli/src/network-manager.c:776 ../cli/src/network-manager.c:820
-#: ../cli/src/network-manager.c:840
-#, c-format
-msgid "Error: %s."
-msgstr "Ошибка: %s."
-
-#: ../cli/src/connections.c:728
+#: ../clients/cli/connections.c:536
 msgid "activating"
 msgstr "активация"
 
-#: ../cli/src/connections.c:730
+#: ../clients/cli/connections.c:538
 msgid "activated"
 msgstr "включено"
 
-#: ../cli/src/connections.c:734
+#: ../clients/cli/connections.c:542
 msgid "deactivated"
 msgstr "отключено"
 
-#: ../cli/src/connections.c:746
+#: ../clients/cli/connections.c:554
 msgid "VPN connecting (prepare)"
 msgstr "Подключение VPN (подготовка)"
 
-#: ../cli/src/connections.c:748
+#: ../clients/cli/connections.c:556
 msgid "VPN connecting (need authentication)"
 msgstr "Подключение VPN (требуется аутентификация)"
 
-#: ../cli/src/connections.c:750
+#: ../clients/cli/connections.c:558
 msgid "VPN connecting"
 msgstr "Подключение VPN"
 
-#: ../cli/src/connections.c:752
+#: ../clients/cli/connections.c:560
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Подключение VPN (получение конфигурации IP)"
 
-#: ../cli/src/connections.c:754
+#: ../clients/cli/connections.c:562
 msgid "VPN connected"
 msgstr "VPN подключён"
 
-#: ../cli/src/connections.c:756
+#: ../clients/cli/connections.c:564
 msgid "VPN connection failed"
 msgstr "Сбой подключения VPN"
 
-#: ../cli/src/connections.c:758
+#: ../clients/cli/connections.c:566
 msgid "VPN disconnected"
 msgstr "VPN отключён"
 
-#: ../cli/src/connections.c:829 ../cli/src/connections.c:839
-#: ../cli/src/devices.c:594
-msgid "N/A"
-msgstr "Н/Д"
+#: ../clients/cli/connections.c:636
+#, fuzzy, c-format
+#| msgid "Error saving connection: %s"
+msgid "Error updating secrets for %s: %s\n"
+msgstr "Ошибка при сохранении соединения: %s"
 
-#: ../cli/src/connections.c:1012
-#, c-format
-msgid "Error: 'list active': %s"
-msgstr "Ошибка «list active»: %s"
+#: ../clients/cli/connections.c:656
+#, fuzzy
+#| msgid "Connection details"
+msgid "Connection profile details"
+msgstr "Свойства подключения"
+
+#: ../clients/cli/connections.c:668 ../clients/cli/connections.c:1061
+#, fuzzy, c-format
+#| msgid "Error: 'device show': %s"
+msgid "Error: 'connection show': %s"
+msgstr "Ошибка «device show»: %s"
+
+#: ../clients/cli/connections.c:824
+msgid "never"
+msgstr "никогда"
+
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:825 ../clients/cli/connections.c:827
+#: ../clients/cli/connections.c:829 ../clients/cli/connections.c:863
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:3265
+#: ../clients/cli/connections.c:7123 ../clients/cli/connections.c:7124
+#: ../clients/cli/devices.c:644 ../clients/cli/devices.c:701
+#: ../clients/cli/devices.c:908 ../clients/cli/devices.c:909
+#: ../clients/cli/devices.c:910 ../clients/cli/devices.c:911
+#: ../clients/cli/devices.c:944 ../clients/cli/devices.c:946
+#: ../clients/cli/devices.c:974 ../clients/cli/devices.c:975
+#: ../clients/cli/devices.c:976 ../clients/cli/devices.c:977
+#: ../clients/cli/devices.c:978 ../clients/cli/devices.c:979
+#: ../clients/cli/devices.c:980 ../clients/cli/general.c:472
+#: ../clients/cli/settings.c:1542
+msgid "yes"
+msgstr "да"
+
+#: ../clients/cli/connections.c:825 ../clients/cli/connections.c:827
+#: ../clients/cli/connections.c:829 ../clients/cli/connections.c:932
+#: ../clients/cli/connections.c:933 ../clients/cli/connections.c:935
+#: ../clients/cli/connections.c:3266 ../clients/cli/connections.c:7123
+#: ../clients/cli/connections.c:7124 ../clients/cli/devices.c:644
+#: ../clients/cli/devices.c:701 ../clients/cli/devices.c:908
+#: ../clients/cli/devices.c:909 ../clients/cli/devices.c:910
+#: ../clients/cli/devices.c:911 ../clients/cli/devices.c:944
+#: ../clients/cli/devices.c:946 ../clients/cli/devices.c:974
+#: ../clients/cli/devices.c:975 ../clients/cli/devices.c:976
+#: ../clients/cli/devices.c:977 ../clients/cli/devices.c:978
+#: ../clients/cli/devices.c:979 ../clients/cli/devices.c:980
+#: ../clients/cli/general.c:474 ../clients/cli/settings.c:1540
+msgid "no"
+msgstr "нет"
 
-#: ../cli/src/connections.c:1020
-msgid "Active connection details"
+#: ../clients/cli/connections.c:1049
+#, fuzzy
+#| msgid "Active connection details"
+msgid "Activate connection details"
 msgstr "Сведения об активном соединении"
 
-#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1840
-#: ../cli/src/connections.c:1899 ../cli/src/connections.c:7592
-#: ../cli/src/connections.c:7707 ../cli/src/connections.c:7798
-#: ../cli/src/connections.c:7826 ../cli/src/devices.c:1197
-#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1403
-#: ../cli/src/devices.c:1538 ../cli/src/devices.c:1675
-#: ../cli/src/devices.c:2115 ../cli/src/devices.c:2414
-#: ../cli/src/network-manager.c:484
-#, c-format
-msgid "Error: NetworkManager is not running."
-msgstr "Ошибка: NetworkManager не запущен."
+#: ../clients/cli/connections.c:1285
+#, fuzzy, c-format
+#| msgid "invalid field '%s'; allowed fields: %s"
+msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
+msgstr "неверное поле «%s»; допустимые поля: %s"
+
+#: ../clients/cli/connections.c:1300 ../clients/cli/connections.c:1308
+#, fuzzy, c-format
+#| msgid "field '%s' has to be alone"
+msgid "'%s' has to be alone"
+msgstr "поле «%s» должно быть единственным"
+
+#. Add headers
+#: ../clients/cli/connections.c:1525
+#, fuzzy
+#| msgid "NetworkManager status"
+msgid "NetworkManager active profiles"
+msgstr "Состояние NetworkManager"
 
-#: ../cli/src/connections.c:1203
-msgid "List of active connections"
-msgstr "Список активных соединений"
+#: ../clients/cli/connections.c:1526
+#, fuzzy
+#| msgid "NetworkManager went to sleep"
+msgid "NetworkManager connection profiles"
+msgstr "NetworkManager перешёл в спящий режим"
 
-#: ../cli/src/connections.c:1239 ../cli/src/connections.c:1926
+#: ../clients/cli/connections.c:1572 ../clients/cli/connections.c:2299
+#: ../clients/cli/connections.c:2321 ../clients/cli/connections.c:2330
+#: ../clients/cli/connections.c:2340 ../clients/cli/connections.c:2350
+#: ../clients/cli/connections.c:2500 ../clients/cli/connections.c:8678
+#: ../clients/cli/connections.c:8895 ../clients/cli/devices.c:1985
+#: ../clients/cli/devices.c:1993 ../clients/cli/devices.c:2309
+#: ../clients/cli/devices.c:2316 ../clients/cli/devices.c:2330
+#: ../clients/cli/devices.c:2337 ../clients/cli/devices.c:2354
+#: ../clients/cli/devices.c:2362 ../clients/cli/devices.c:2550
+#: ../clients/cli/devices.c:2646 ../clients/cli/devices.c:2653
 #, c-format
-msgid "Error: '%s' is not an active connection."
-msgstr "Ошибка: «%s» не является активным соединением."
+msgid "Error: %s argument is missing."
+msgstr "Ошибка: отсутствует аргумент %s."
 
-#: ../cli/src/connections.c:1251
+#: ../clients/cli/connections.c:1587
+#, fuzzy, c-format
+#| msgid "Error: %s - no such connection."
+msgid "Error: %s - no such connection profile."
+msgstr "Ошибка: неизвестное подключение %s."
+
+#: ../clients/cli/connections.c:1646 ../clients/cli/connections.c:2373
+#: ../clients/cli/connections.c:9269 ../clients/cli/devices.c:2529
+#: ../clients/cli/devices.c:2997 ../clients/cli/general.c:569
+#: ../clients/cli/general.c:618 ../clients/cli/general.c:635
+#: ../clients/cli/general.c:674 ../clients/cli/general.c:688
+#: ../clients/cli/general.c:806 ../clients/cli/general.c:853
+#: ../clients/cli/general.c:873
 #, c-format
-msgid "Error: 'show active': %s"
-msgstr "Ошибка «show active»: %s"
+msgid "Error: %s."
+msgstr "Ошибка: %s."
 
-#: ../cli/src/connections.c:1344
+#: ../clients/cli/connections.c:1741
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "на устройстве «%s» нет активных соединений"
 
-#: ../cli/src/connections.c:1352
+#: ../clients/cli/connections.c:1749
 msgid "no active connection or device"
 msgstr "на устройстве нет активных соединений"
 
-#: ../cli/src/connections.c:1423
+#: ../clients/cli/connections.c:1820
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "устройство «%s» несовместимо с соединением «%s»"
 
-#: ../cli/src/connections.c:1426
+#: ../clients/cli/connections.c:1823
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "не найдено устройство для соединения «%s»"
 
-#: ../cli/src/connections.c:1438
+#: ../clients/cli/connections.c:1835
 msgid "unknown reason"
 msgstr "неизвестная причина"
 
-#: ../cli/src/connections.c:1440 ../cli/src/network-manager.c:288
+#: ../clients/cli/connections.c:1837 ../clients/cli/general.c:292
 msgid "none"
 msgstr "нет"
 
-#: ../cli/src/connections.c:1442
+#: ../clients/cli/connections.c:1839
 msgid "the user was disconnected"
 msgstr "пользователь был отключён"
 
-#: ../cli/src/connections.c:1444
+#: ../clients/cli/connections.c:1841
 msgid "the base network connection was interrupted"
 msgstr "основное соединение с сетью было разорвано"
 
-#: ../cli/src/connections.c:1446
+#: ../clients/cli/connections.c:1843
 msgid "the VPN service stopped unexpectedly"
 msgstr "служба VPN внезапно прекратила работу"
 
-#: ../cli/src/connections.c:1448
+#: ../clients/cli/connections.c:1845
 msgid "the VPN service returned invalid configuration"
 msgstr "служба VPN вернула недопустимую конфигурацию"
 
-#: ../cli/src/connections.c:1450
+#: ../clients/cli/connections.c:1847
 msgid "the connection attempt timed out"
 msgstr "время ожидания соединения истекло"
 
-#: ../cli/src/connections.c:1452
+#: ../clients/cli/connections.c:1849
 msgid "the VPN service did not start in time"
 msgstr "служба VPN не была запущена вовремя"
 
-#: ../cli/src/connections.c:1454
+#: ../clients/cli/connections.c:1851
 msgid "the VPN service failed to start"
 msgstr "не удалось запустить службу VPN"
 
-#: ../cli/src/connections.c:1456
+#: ../clients/cli/connections.c:1853
 msgid "no valid VPN secrets"
 msgstr "нет верных секретов VPN"
 
-#: ../cli/src/connections.c:1458
+#: ../clients/cli/connections.c:1855
 msgid "invalid VPN secrets"
 msgstr "неверные секреты VPN"
 
-#: ../cli/src/connections.c:1460
+#: ../clients/cli/connections.c:1857
 msgid "the connection was removed"
 msgstr "соединение удалено"
 
-#: ../cli/src/connections.c:1477 ../cli/src/connections.c:1633
-#: ../cli/src/connections.c:6016
+#: ../clients/cli/connections.c:1879 ../clients/cli/connections.c:1907
+#: ../clients/cli/connections.c:2068 ../clients/cli/connections.c:7014
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1482
+#: ../clients/cli/connections.c:1886
+#, fuzzy, c-format
+#| msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgid ""
+"Connection successfully activated (master waiting for slaves) (D-Bus active "
+"path: %s)\n"
+msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
+
+#: ../clients/cli/connections.c:1890 ../clients/cli/connections.c:1912
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Ошибка: сбой активации соединения."
 
-#: ../cli/src/connections.c:1507
+#: ../clients/cli/connections.c:1963
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN-соединение успешно установлено (адрес действующего D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1514
+#: ../clients/cli/connections.c:1971
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Ошибка: сбой активации соединения: %s."
 
-#: ../cli/src/connections.c:1532 ../cli/src/devices.c:1294
+#: ../clients/cli/connections.c:1990 ../clients/cli/devices.c:1397
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Ошибка: превышено время ожидания (%d с)."
 
-#: ../cli/src/connections.c:1597
+#: ../clients/cli/connections.c:2050
 #, c-format
-msgid ""
-"Error: Device '%s' is waiting for slaves before proceeding with activation."
+msgid "Error: Connection activation failed: %s"
+msgstr "Ошибка: сбой активации соединения: %s"
+
+#: ../clients/cli/connections.c:2135
+#, fuzzy, c-format
+#| msgid "Error: failed to remove value of '%s': %s\n"
+msgid "failed to read passwd-file '%s': %s"
+msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+
+#: ../clients/cli/connections.c:2147
+#, c-format
+msgid "missing colon in 'password' entry '%s'"
 msgstr ""
-"Ошибка. Для продолжения активации устройства «%s» необходимо дождаться его "
-"подчиненных устройств."
 
-#: ../cli/src/connections.c:1617
+#: ../clients/cli/connections.c:2155
 #, c-format
-msgid "Error: Connection activation failed: %s"
-msgstr "Ошибка: сбой активации соединения: %s"
+msgid "missing dot in 'password' entry '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2168
+#, c-format
+msgid "invalid setting name in 'password' entry '%s'"
+msgstr ""
 
-#: ../cli/src/connections.c:1722 ../cli/src/connections.c:1854
+#: ../clients/cli/connections.c:2215 ../clients/cli/connections.c:2374
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: ../cli/src/connections.c:1730
+#: ../clients/cli/connections.c:2224
 #, c-format
 msgid "unknown device '%s'."
 msgstr "неизвестное устройство «%s»"
 
-#: ../cli/src/connections.c:1735
+#: ../clients/cli/connections.c:2229
 msgid "neither a valid connection nor device given"
 msgstr "недействительное подключение или устройство не определено"
 
-#: ../cli/src/connections.c:1773 ../cli/src/connections.c:1884
-#: ../cli/src/connections.c:7714
-msgid "Connection (name, UUID, or path): "
-msgstr "Соединение (имя, UUID, путь):"
+#: ../clients/cli/connections.c:2312
+#, fuzzy, c-format
+#| msgid "Error: connection is not valid: %s\n"
+msgid "Error: Connection '%s' does not exist."
+msgstr "Ошибка. Недействительное соединение: %s\n"
 
-#: ../cli/src/connections.c:1829 ../cli/src/devices.c:1171
-#: ../cli/src/devices.c:1647 ../cli/src/devices.c:2092
-#: ../cli/src/devices.c:2386
+#: ../clients/cli/connections.c:2358 ../clients/cli/devices.c:1296
+#: ../clients/cli/devices.c:1999 ../clients/cli/devices.c:2373
+#: ../clients/cli/devices.c:2659
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Неизвестный параметр: %s\n"
 
-#: ../cli/src/connections.c:1862
+#: ../clients/cli/connections.c:2382
 msgid "preparing"
 msgstr "подготовка"
 
-#: ../cli/src/connections.c:1889 ../cli/src/connections.c:7719
-#: ../cli/src/connections.c:7832
+#: ../clients/cli/connections.c:2421
+#, fuzzy, c-format
+#| msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
+msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n"
+
+#: ../clients/cli/connections.c:2479 ../clients/cli/connections.c:8876
+#: ../clients/cli/connections.c:8990
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Ошибка. Соединение не определено."
 
-#: ../cli/src/connections.c:2237 ../cli/src/utils.c:490
+#: ../clients/cli/connections.c:2510
+#, fuzzy, c-format
+#| msgid "Error: '%s' is not an active connection."
+msgid "Error: '%s' is not an active connection.\n"
+msgstr "Ошибка: «%s» не является активным соединением."
+
+#: ../clients/cli/connections.c:2511
+#, fuzzy, c-format
+#| msgid "Error: '%s' is not an active connection."
+msgid "Error: not all active connections found."
+msgstr "Ошибка: «%s» не является активным соединением."
+
+#: ../clients/cli/connections.c:2520
+#, fuzzy, c-format
+#| msgid "Error: %s - no such connection."
+msgid "Error: no active connection provided."
+msgstr "Ошибка: неизвестное подключение %s."
+
+#: ../clients/cli/connections.c:2838 ../clients/cli/utils.c:609
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "«%s» не входит в %s"
 
-#: ../cli/src/connections.c:2319
+#: ../clients/cli/connections.c:2917
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Ошибка. «%s»: «%s» не является действительным %s MAC-адресом."
 
-#: ../cli/src/connections.c:2320 ../tui/nm-editor-utils.c:173
-#: ../tui/nm-ui-utils.c:347
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:2918 ../clients/cli/connections.c:3380
+#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1575
+#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1623
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../cli/src/connections.c:2320 ../tui/nm-editor-utils.c:156
-#: ../tui/nm-ui-utils.c:335
+#: ../clients/cli/connections.c:2918 ../clients/tui/nm-editor-utils.c:147
+#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1611
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../cli/src/connections.c:2343
+#: ../clients/cli/connections.c:2938
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Ошибка «mtu». Недействительный MTU: «%s» "
 
-#: ../cli/src/connections.c:2359
+#: ../clients/cli/connections.c:2954
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Ошибка «parent». Недействительное имя интерфейса: «%s» "
 
-#: ../cli/src/connections.c:2380
+#: ../clients/cli/connections.c:2975
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Ошибка «p-key». Недействительный InfiniBand P_KEY: «%s»"
 
-#: ../cli/src/connections.c:2396
-#, c-format
-msgid ""
-"Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
-"connected]."
-msgstr ""
-"Ошибка «mode». Недействительный режим передачи InfiniBand: «%s» [датаграмма, "
-"подключено]."
+#: ../clients/cli/connections.c:3020
+#, fuzzy, c-format
+#| msgid "Error: '%s': '%s' is not valid; %s "
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Error: '%s': '%s' is not valid; %s "
+
+#: ../clients/cli/connections.c:3033
+#| msgid "Wi-Fi"
+msgid "Wi-Fi mode"
+msgstr "Режим Wi-Fi"
 
-#: ../cli/src/connections.c:2412
+#: ../clients/cli/connections.c:3042
+#, fuzzy
+#| msgid "Transport mode"
+msgid "InfiniBand transport mode"
+msgstr "Транспортный режим"
+
+#: ../clients/cli/connections.c:3055
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
-msgstr "Ошибка «flags». Неверное значение «%s». Допустимые значения:  <0-7>."
+msgstr "Ошибка «flags». Неверное значение «%s». Допустимые значения: <0-7>."
 
-#: ../cli/src/connections.c:2434
+#: ../clients/cli/connections.c:3077
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Error: '%s': '%s' is not valid; %s "
 
-#: ../cli/src/connections.c:2541
+#: ../clients/cli/connections.c:3256
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Ошибка «%s». Недействительный «%s»: используйте <%u-%u>."
 
-#: ../cli/src/connections.c:2555
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3312
+#, fuzzy, c-format
+#| msgid "There is 1 optional argument for '%s' connection type.\n"
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] ""
+"При настройке соединений %s допускается использование одного дополнительного "
+"аргумента.\n"
+msgstr[1] ""
+"При настройке соединений %s допускается использование одного дополнительного "
+"аргумента.\n"
+msgstr[2] ""
+"При настройке соединений %s допускается использование одного дополнительного "
+"аргумента.\n"
+
+#: ../clients/cli/connections.c:3315
+#, fuzzy, c-format
+#| msgid "Do you want to provide it? (yes/no) [yes] "
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "Хотите его определить? (Да, нет) [да]"
+msgstr[1] "Хотите его определить? (Да, нет) [да]"
+msgstr[2] "Хотите его определить? (Да, нет) [да]"
+
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3332
 msgid "ethernet"
 msgstr "ethernet"
 
-#: ../cli/src/connections.c:2555 ../tui/nm-editor-utils.c:164
-#: ../tui/nm-ui-utils.c:337
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../cli/src/connections.c:2558
-#, c-format
-msgid "There are 3 optional arguments for '%s' connection type.\n"
-msgstr "Для соединения  «%s» доступно три дополнительных аргумента.\n"
-
-#: ../cli/src/connections.c:2559 ../cli/src/connections.c:2613
-#: ../cli/src/connections.c:2735 ../cli/src/connections.c:2781
-#: ../cli/src/connections.c:2841 ../cli/src/connections.c:2909
-#: ../cli/src/connections.c:3072 ../cli/src/connections.c:3168
-#: ../cli/src/connections.c:3250
-msgid "Do you want to provide them? (yes/no) [yes] "
-msgstr "Хотите их определить? (Да или нет)"
-
-#: ../cli/src/connections.c:2567 ../cli/src/connections.c:2621
-#: ../cli/src/connections.c:2748 ../cli/src/connections.c:2849
+#: ../clients/cli/connections.c:3337 ../clients/cli/connections.c:3385
+#: ../clients/cli/connections.c:3519 ../clients/cli/connections.c:3598
 msgid "MTU [auto]: "
 msgstr "MTU [авто]: "
 
-#: ../cli/src/connections.c:2578 ../cli/src/connections.c:2632
-#: ../cli/src/connections.c:2711 ../cli/src/connections.c:2759
+#: ../clients/cli/connections.c:3348 ../clients/cli/connections.c:3396
+#: ../clients/cli/connections.c:3491 ../clients/cli/connections.c:3530
+#: ../clients/cli/connections.c:3916
 msgid "MAC [none]: "
 msgstr "MAC [нет]: "
 
-#: ../cli/src/connections.c:2589
+#: ../clients/cli/connections.c:3359
 msgid "Cloned MAC [none]: "
 msgstr "Клонированный MAC [нет]:"
 
-#: ../cli/src/connections.c:2612
-#, c-format
-msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
-msgstr "Для соединений «InfiniBand» доступно пять дополнительных аргументов.\n"
-
-#: ../cli/src/connections.c:2643
-msgid "Transport mode (datagram or connected) [datagram]: "
-msgstr "Режим передачи (датаграммы  или подключенный) [датаграмма]:"
+#: ../clients/cli/connections.c:3407
+#, fuzzy, c-format
+#| msgid "Transport mode"
+msgid "Transport mode %s"
+msgstr "Транспортный режим"
 
-#: ../cli/src/connections.c:2656
+#: ../clients/cli/connections.c:3420
 msgid "Parent interface [none]: "
 msgstr "Родительский интерфейс [нет]:"
 
-#: ../cli/src/connections.c:2667
+#: ../clients/cli/connections.c:3431
 msgid "P_KEY [none]: "
 msgstr "P_KEY [нет]: "
 
-#: ../cli/src/connections.c:2677
+#: ../clients/cli/connections.c:3441
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Ошибка. Если задан «parent», необходимо определить «p-key» \n"
 
-#: ../cli/src/connections.c:2702
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3458 ../clients/tui/nm-editor-utils.c:155
+#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1613
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../clients/cli/connections.c:3466
 #, c-format
-msgid "There is 1 optional argument for 'WiMax' connection type.\n"
-msgstr "Для соединений «WiMax» доступен один дополнительный аргумент.\n"
+#| msgid "Mode"
+msgid "Mode %s"
+msgstr "Режим %s"
 
-#: ../cli/src/connections.c:2703 ../cli/src/connections.c:2805
-#: ../cli/src/connections.c:3024 ../cli/src/connections.c:3226
-msgid "Do you want to provide it? (yes/no) [yes] "
-msgstr "Хотите его определить? (Да, нет) [да]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3486 ../libnm-glib/nm-device.c:1797
+#: ../libnm/nm-device.c:1619
+msgid "WiMAX"
+msgstr "WiMAX"
 
-#: ../cli/src/connections.c:2734
-#, c-format
-msgid "There are 4 optional arguments for 'PPPoE' connection type.\n"
-msgstr ""
-"При настройке соединений PPPoE допускается использование четырех "
-"дополнительных аргументов.\n"
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3509
+msgid "PPPoE"
+msgstr "PPPoE"
 
-#: ../cli/src/connections.c:2742 ../cli/src/connections.c:2790
+#: ../clients/cli/connections.c:3513 ../clients/cli/connections.c:3551
 msgid "Password [none]: "
-msgstr "Пароль [нет]:"
+msgstr "Пароль [нет]: "
 
-#: ../cli/src/connections.c:2744
+#: ../clients/cli/connections.c:3515
 msgid "Service [none]: "
-msgstr "Служба  [нет]:"
+msgstr "Служба [нет]: "
 
-#: ../cli/src/connections.c:2780
-#, c-format
-msgid ""
-"There are 2 optional arguments for 'mobile broadband' connection type.\n"
-msgstr ""
-"Для мобильных широкополосных соединений доступно два дополнительных "
-"аргумента.\n"
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3545
+#| msgid "Mobile Broadband"
+msgid "mobile broadband"
+msgstr "мобильное широкополосное"
 
-#: ../cli/src/connections.c:2788 ../cli/src/connections.c:3233
+#: ../clients/cli/connections.c:3549 ../clients/cli/connections.c:3988
 msgid "Username [none]: "
-msgstr "Пользователь [нет]:"
-
-#: ../cli/src/connections.c:2804
-#, c-format
-msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
-msgstr "Для соединений Bluetooth доступен один дополнительный аргумент.\n"
+msgstr "Пользователь [нет]: "
 
-#: ../cli/src/connections.c:2813
-msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
-msgstr "Тип bluetooth (panu, dun-gsm, dun-cdma) [panu]: "
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3564
+#| msgid "Bluetooth"
+msgid "bluetooth"
+msgstr "bluetooth"
 
-#: ../cli/src/connections.c:2821
+#: ../clients/cli/connections.c:3571
 #, c-format
-msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
-msgstr "Ошибка. Недопустимый тип bluetooth: «%s»\n"
+#| msgid "Bluetooth"
+msgid "Bluetooth type %s"
+msgstr "Тип Bluetooth: %s"
 
-#: ../cli/src/connections.c:2840
+#: ../clients/cli/connections.c:3577
 #, c-format
-msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
-msgstr "Для соединений «VLAN» доступно четыре дополнительных аргумента.\n"
+msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgstr "Ошибка: «bt-type»: «%s» не является допустимым типом bluetooth.\n"
+
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3593 ../clients/cli/devices.c:233
+#: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:97
+#: ../libnm-core/nm-connection.c:1573 ../libnm-glib/nm-device.c:1809
+#: ../libnm-util/nm-connection.c:1614 ../libnm/nm-device.c:1631
+msgid "VLAN"
+msgstr "VLAN"
 
-#: ../cli/src/connections.c:2860
+#: ../clients/cli/connections.c:3609
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Флаги VLAN (<0-7>) [нет]: "
 
-#: ../cli/src/connections.c:2871
+#: ../clients/cli/connections.c:3620
 msgid "Ingress priority maps [none]: "
 msgstr "Соответствие приоритета на входе [нет]:"
 
-#: ../cli/src/connections.c:2882
+#: ../clients/cli/connections.c:3631
 msgid "Egress priority maps [none]: "
 msgstr "Соответствие приоритета на выходе [нет]:"
 
-#: ../cli/src/connections.c:2908
-#, c-format
-msgid "There are optional arguments for 'bond' connection type.\n"
-msgstr "Для соединений «bond» доступны дополнительные аргументы.\n"
-
-#: ../cli/src/connections.c:2918
+#: ../clients/cli/connections.c:3642
 msgid "Bonding mode [balance-rr]: "
-msgstr "Режим агрегации [balance-rr]: "
+msgstr "Режим агрегации (Bond) [balance-rr]: "
 
-#: ../cli/src/connections.c:2934
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3658
+msgid "bond"
+msgstr "агрегированное (Bond)"
+
+#: ../clients/cli/connections.c:3680
 msgid "Bonding primary interface [none]: "
-msgstr "Основной интерфейс агрегации [нет]:"
+msgstr "Основной интерфейс агрегации (Bond) [нет]:"
 
-#: ../cli/src/connections.c:2937
+#: ../clients/cli/connections.c:3683
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
-msgstr "Ошибка «primary». Недействительное имя интерфейса: «%s».\n"
+msgstr "Ошибка: «primary»: «%s» не является допустимым именем интерфейса.\n"
 
-#: ../cli/src/connections.c:2945
-msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
-msgstr "Режим мониторинга агрегации (miimon или arp) [miimon]: "
+#: ../clients/cli/connections.c:3691
+#, c-format
+#| msgid "Link monitoring"
+msgid "Bonding monitoring mode %s"
+msgstr "Режим мониторинга агрегации (Bond): %s"
 
-#: ../cli/src/connections.c:2950
+#: ../clients/cli/connections.c:3697
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
-"Ошибка. Недопустимый режим мониторинга:  «%s». Используйте  «%s» или  «%s»."
-"\n"
+"Ошибка. Недопустимый режим мониторинга: «%s». Используйте «%s» или  «%s».\n"
 
-#: ../cli/src/connections.c:2959
+#: ../clients/cli/connections.c:3706
 msgid "Bonding miimon [100]: "
 msgstr "Bonding miimon [100]: "
 
-#: ../cli/src/connections.c:2962
+#: ../clients/cli/connections.c:3709
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Ошибка «miimon». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
 
-#: ../cli/src/connections.c:2970
+#: ../clients/cli/connections.c:3717
 msgid "Bonding downdelay [0]: "
 msgstr "Bonding downdelay [0]: "
 
-#: ../cli/src/connections.c:2973
+#: ../clients/cli/connections.c:3720
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Ошибка «downdelay». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
 
-#: ../cli/src/connections.c:2981
+#: ../clients/cli/connections.c:3728
 msgid "Bonding updelay [0]: "
 msgstr "Bonding updelay [0]: "
 
-#: ../cli/src/connections.c:2984
+#: ../clients/cli/connections.c:3731
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Ошибка «updelay». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
 
-#: ../cli/src/connections.c:2993
+#: ../clients/cli/connections.c:3740
 msgid "Bonding arp-interval [0]: "
 msgstr "Bonding arp-interval [0]: "
 
-#: ../cli/src/connections.c:2996
+#: ../clients/cli/connections.c:3743
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr ""
 "Ошибка «arp-interval». Недопустимое значение «%s». Ожидается: <0-%u>.\n"
 
-#: ../cli/src/connections.c:3004
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3751
 msgid "Bonding arp-ip-target [none]: "
 msgstr "Bonding arp-ip-target [нет]: "
 
-#: ../cli/src/connections.c:3023
-#, c-format
-msgid "There is 1 optional argument for '%s' connection type.\n"
+#: ../clients/cli/connections.c:3758
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr ""
-"При настройке соединений %s допускается использование одного дополнительного "
-"аргумента.\n"
 
-#: ../cli/src/connections.c:3032
+#: ../clients/cli/connections.c:3764
+#, fuzzy, c-format
+#| msgid "Error: 'master': '%s' is not valid UUID nor interface."
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Ошибка «master».  «%s» не содержит UUID или интерфейс."
+
+#: ../clients/cli/connections.c:3787
 msgid "Team JSON configuration [none]: "
-msgstr "Конфигурация группы JSON [нет]:"
+msgstr "Конфигурация JSON агрегированного соединения (team) [нет]:"
 
-#: ../cli/src/connections.c:3051
+#: ../clients/cli/connections.c:3804
 msgid "team"
-msgstr "гÑ\80Ñ\83ппа"
+msgstr "агÑ\80егиÑ\80ованное (team)"
 
-#: ../cli/src/connections.c:3057
+#: ../clients/cli/connections.c:3810
 msgid "team-slave"
-msgstr "Ð\9fодÑ\87иненнÑ\8bй гÑ\80Ñ\83ппÑ\8b:"
+msgstr "Слейв агÑ\80егиÑ\80ованного Ñ\81оединениÑ\8f (team)"
 
-#: ../cli/src/connections.c:3071
-#, c-format
-msgid "There are 6 optional arguments for 'bridge' connection type.\n"
-msgstr "Ð\94лÑ\8f Ñ\81оединений «bridge» доÑ\81Ñ\82Ñ\83пно Ñ\88еÑ\81Ñ\82Ñ\8c дополниÑ\82елÑ\8cнÑ\8bÑ\85 аÑ\80гÑ\83менÑ\82ов.\n"
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:3822
+msgid "bridge"
+msgstr "моÑ\81Ñ\82"
 
-#: ../cli/src/connections.c:3081
-msgid "Enable STP (yes/no) [yes]: "
-msgstr "Включить STP (да, нет) [да]:"
+#: ../clients/cli/connections.c:3828
+#, c-format
+#| msgid "Enable STP (yes/no) [yes]: "
+msgid "Enable STP %s"
+msgstr "Включить STP %s"
 
-#: ../cli/src/connections.c:3085
+#: ../clients/cli/connections.c:3833
 #, c-format
-msgid "Error: 'stp': '%s'.\n"
-msgstr "Ошибка «stp»: «%s»\n"
+#| msgid "Error: 'stp': %s."
+msgid "Error: 'stp': %s.\n"
+msgstr "Ошибка: «stp»: %s.\n"
 
-#: ../cli/src/connections.c:3093
-msgid "STP priority [128]: "
-msgstr "Приоритет STP [128]: "
+#: ../clients/cli/connections.c:3841
+#| msgid "STP priority [128]: "
+msgid "STP priority [32768]: "
+msgstr "Приоритет STP [32768]: "
 
-#: ../cli/src/connections.c:3097
+#: ../clients/cli/connections.c:3845
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Недопустимое значение «priority»: «%s». Ожидается: <0-%d>.\n"
 
-#: ../cli/src/connections.c:3105
+#: ../clients/cli/connections.c:3853
 msgid "Forward delay [15]: "
-msgstr "Forward delay  [15]:"
+msgstr "Forward delay [15]:"
 
-#: ../cli/src/connections.c:3109
+#: ../clients/cli/connections.c:3857
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr ""
 "Ошибка «forward-delay». Недопустимое значение «%s». Ожидается: <2-30>.\n"
 
-#: ../cli/src/connections.c:3118
+#: ../clients/cli/connections.c:3866
 msgid "Hello time [2]: "
 msgstr "Hello time [2]: "
 
-#: ../cli/src/connections.c:3122
+#: ../clients/cli/connections.c:3870
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Недопустимое значение «hello-time»: «%s». Ожидается: <1-10>.\n"
 
-#: ../cli/src/connections.c:3130
+#: ../clients/cli/connections.c:3878
 msgid "Max age [20]: "
 msgstr "Max age [20]: "
 
-#: ../cli/src/connections.c:3134
+#: ../clients/cli/connections.c:3882
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Недопустимое значение «max-age»: «%s». Ожидается: <6-40>.\n"
 
-#: ../cli/src/connections.c:3142
+#: ../clients/cli/connections.c:3890
 msgid "MAC address ageing time [300]: "
 msgstr "Время действия MAC-адреса [300]: "
 
-#: ../cli/src/connections.c:3146
+#: ../clients/cli/connections.c:3894
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Недопустимое значение «ageing-time»: «%s». Ожидается: <0-1000000>.\n"
 
-#: ../cli/src/connections.c:3167
+#: ../clients/cli/connections.c:3903
 #, c-format
-msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
-msgstr ""
-"Для соединений  «bridge-slave» доступно три дополнительных аргумента.\n"
+#| msgid "Enable STP (yes/no) [yes]: "
+msgid "Enable IGMP snooping %s"
+msgstr "Включить IGMP snooping %s"
+
+#: ../clients/cli/connections.c:3908
+#, fuzzy, c-format
+#| msgid "Error: 'stp': %s."
+msgid "Error: 'multicast-snooping': %s.\n"
+msgstr "Ошибка «stp»: %s"
+
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:3935
+#| msgid "team-slave"
+msgid "bridge-slave"
+msgstr "Слейв соединения типа «мост»"
 
-#: ../cli/src/connections.c:3176
+#: ../clients/cli/connections.c:3940
 msgid "Bridge port priority [32]: "
 msgstr "Приоритет порта моста [32]: "
 
-#: ../cli/src/connections.c:3189
+#: ../clients/cli/connections.c:3953
 msgid "Bridge port STP path cost [100]: "
 msgstr "Стоимость STP порта моста [100]: "
 
-#: ../cli/src/connections.c:3203
-msgid "Hairpin (yes/no) [yes]: "
-msgstr "Hairpin (да/нет) [да]: "
-
-#: ../cli/src/connections.c:3207
-#, c-format
-msgid "Error: 'hairpin': '%s'.\n"
-msgstr "Ошибка «hairpin»:  «%s»\n"
+#: ../clients/cli/connections.c:3967
+#, fuzzy, c-format
+#| msgid "Hairpin mode"
+msgid "Hairpin %s"
+msgstr "Режим разворота пакетов"
 
-#: ../cli/src/connections.c:3225
-#, c-format
-msgid "There is 1 optional argument for 'VPN' connection type.\n"
-msgstr "Для соединений VPN доступен один дополнительный аргумент.\n"
+#: ../clients/cli/connections.c:3972
+#, fuzzy, c-format
+#| msgid "Error: 'hairpin': %s."
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Ошибка «hairpin»:  %s"
 
-#: ../cli/src/connections.c:3249
-#, c-format
-msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
-msgstr "Для соединений «OLPC Mesh» доступно два дополнительных аргумента.\n"
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:3999 ../libnm-glib/nm-device.c:1795
+#: ../libnm/nm-device.c:1617
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
 
-#: ../cli/src/connections.c:3258
+#: ../clients/cli/connections.c:4004
 msgid "OLPC Mesh channel [1]: "
 msgstr "Канал OLPC mesh [1]:"
 
-#: ../cli/src/connections.c:3261
+#: ../clients/cli/connections.c:4007
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Ошибка «channel». Недопустимое значение «%s». Ожидается: <1-13>.\n"
 
-#: ../cli/src/connections.c:3269
+#: ../clients/cli/connections.c:4015
 msgid "DHCP anycast MAC address [none]: "
 msgstr "MAC-адрес рассылки DHCP [нет]:"
 
-#: ../cli/src/connections.c:3317
-msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4057
+#, fuzzy
+#| msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
+msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: "
 
-#: ../cli/src/connections.c:3319
-msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:4059
+#, fuzzy
+#| msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
+msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: "
 
-#: ../cli/src/connections.c:3337
-#, c-format
-msgid "  Address successfully added: %s %s\n"
+#: ../clients/cli/connections.c:4073
+#, fuzzy, c-format
+#| msgid "  Address successfully added: %s %s\n"
+msgid "  Address successfully added: %s\n"
 msgstr "Адрес добавлен: %s %s\n"
 
-#: ../cli/src/connections.c:3339
-#, c-format
-msgid "  Warning: address already present: %s %s\n"
+#: ../clients/cli/connections.c:4075
+#, fuzzy, c-format
+#| msgid "  Warning: address already present: %s %s\n"
+msgid "  Warning: address already present: %s\n"
 msgstr "Предупреждение. Адрес уже используется: %s %s\n"
 
-#: ../cli/src/connections.c:3341
+#: ../clients/cli/connections.c:4077
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "Предупреждение. Игнорируется мусор в конце: «%s».\n"
 
-#: ../cli/src/connections.c:3343 ../cli/src/connections.c:4192
-#: ../cli/src/connections.c:4247 ../cli/src/connections.c:4646
-#: ../cli/src/connections.c:4656
+#: ../clients/cli/connections.c:4079 ../clients/cli/connections.c:4960
+#: ../clients/cli/connections.c:5021 ../clients/cli/connections.c:5442
+#: ../clients/cli/connections.c:5475
 msgid "Error: "
 msgstr "Ошибка:"
 
-#: ../cli/src/connections.c:3361
-msgid "Do you want to add IP addresses? (yes/no) [yes] "
+#: ../clients/cli/connections.c:4099
+#, fuzzy
+#| msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
+msgid "IPv4 gateway [none]: "
+msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: "
+
+#: ../clients/cli/connections.c:4102
+#, fuzzy
+#| msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
+msgid "IPv6 gateway [none]: "
+msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: "
+
+#: ../clients/cli/connections.c:4122
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»."
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4135
+#, fuzzy, c-format
+#| msgid "Do you want to add IP addresses? (yes/no) [yes] "
+msgid "Do you want to add IP addresses? %s"
 msgstr "Добавить IP-адреса? (Да или нет) [да]"
 
-#: ../cli/src/connections.c:3367
+#: ../clients/cli/connections.c:4143
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
 msgstr "Нажмите <Enter>, чтобы завершить процедуру добавления адресов.\n"
 
-#: ../cli/src/connections.c:3513
+#: ../clients/cli/connections.c:4282
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Ошибка «parent». Недействительно без «p-key». "
 
-#: ../cli/src/connections.c:3569 ../cli/src/connections.c:4562
+#: ../clients/cli/connections.c:4337 ../clients/cli/connections.c:5358
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../cli/src/connections.c:3572 ../cli/src/connections.c:4565
+#: ../clients/cli/connections.c:4340 ../clients/cli/connections.c:5361
 msgid "Error: 'ssid' is required."
 msgstr "Ошибка. Необходимо определить «ssid»."
 
-#: ../cli/src/connections.c:3636
+#: ../clients/cli/connections.c:4404
 msgid "WiMAX NSP name: "
 msgstr "Имя WiMAX NSP"
 
-#: ../cli/src/connections.c:3639
+#: ../clients/cli/connections.c:4407
 msgid "Error: 'nsp' is required."
 msgstr "Ошибка. Необходимо определить «nsp»."
 
-#: ../cli/src/connections.c:3694
+#: ../clients/cli/connections.c:4459
 msgid "PPPoE username: "
 msgstr "Пользователь PPPoE:"
 
-#: ../cli/src/connections.c:3697
+#: ../clients/cli/connections.c:4462
 msgid "Error: 'username' is required."
 msgstr "Ошибка. Необходимо определить имя пользователя."
 
-#: ../cli/src/connections.c:3768
+#: ../clients/cli/connections.c:4531
 msgid "APN: "
 msgstr "APN: "
 
-#: ../cli/src/connections.c:3771
+#: ../clients/cli/connections.c:4534
 msgid "Error: 'apn' is required."
 msgstr "Ошибка. Необходимо определить «apn»."
 
-#: ../cli/src/connections.c:3830
+#: ../clients/cli/connections.c:4592
 msgid "Bluetooth device address: "
 msgstr "Адрес устройства Bluetooth:"
 
-#: ../cli/src/connections.c:3833
+#: ../clients/cli/connections.c:4595
 msgid "Error: 'addr' is required."
 msgstr "Ошибка. Необходимо определить «addr»."
 
-#: ../cli/src/connections.c:3876
+#: ../clients/cli/connections.c:4636
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 "Ошибка «bt-type». Неверное значение «%s». Используйте [%s, %s (%s), %s]."
 
-#: ../cli/src/connections.c:3921
+#: ../clients/cli/connections.c:4680
 msgid "VLAN parent device or connection UUID: "
 msgstr "Родительское устройство VLAN или подключение UUID:"
 
-#: ../cli/src/connections.c:3924
+#: ../clients/cli/connections.c:4683
 msgid "Error: 'dev' is required."
 msgstr "Ошибка. Необходимо определить «dev»."
 
-#: ../cli/src/connections.c:3928
+#: ../clients/cli/connections.c:4687
 msgid "VLAN ID <0-4095>: "
 msgstr "VLAN ID <0-4095>: "
 
-#: ../cli/src/connections.c:3931
+#: ../clients/cli/connections.c:4690
 msgid "Error: 'id' is required."
 msgstr "Ошибка. Необходимо определить «id»."
 
-#: ../cli/src/connections.c:3937
+#: ../clients/cli/connections.c:4696
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4095>."
-msgstr "Ошибка «id». Неверное значение «%s». Допустимые значения:  <0-4095>."
+msgstr "Ошибка «id». Неверное значение «%s». Допустимые значения: <0-4095>."
 
-#: ../cli/src/connections.c:3947
+#: ../clients/cli/connections.c:4706
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
-msgstr ""
-"Ошибка «dev».  «%s»  может содержать UUID, имя интерфейса или MAC-адрес."
+msgstr "Ошибка «dev». «%s» может содержать UUID, имя интерфейса или MAC-адрес."
 
-#: ../cli/src/connections.c:4082
+#: ../clients/cli/connections.c:4840
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Ошибка «mode»: %s"
 
-#: ../cli/src/connections.c:4091
+#: ../clients/cli/connections.c:4849
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Ошибка «primary». Недействительное имя интерфейса: «%s»."
 
-#: ../cli/src/connections.c:4134
-msgid "Bond master: "
-msgstr "Bond-master:"
-
-#: ../cli/src/connections.c:4137 ../cli/src/connections.c:4229
-#: ../cli/src/connections.c:4416
+#: ../clients/cli/connections.c:4901 ../clients/cli/connections.c:4999
+#: ../clients/cli/connections.c:5217
 msgid "Error: 'master' is required."
 msgstr "Ошибка. Необходимо определить «master»."
 
-#: ../cli/src/connections.c:4142 ../cli/src/connections.c:4239
-#: ../cli/src/connections.c:4427
+#: ../clients/cli/connections.c:4907 ../clients/cli/connections.c:5005
+#: ../clients/cli/connections.c:5223
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:4910 ../clients/cli/connections.c:5013
+#: ../clients/cli/connections.c:5226
 #, c-format
 msgid ""
 "Warning: 'type' is currently ignored. We only support ethernet slaves for "
 "now.\n"
 msgstr ""
-"Предупреждение.  Поддерживаются только подчиненные Ethernet-подключения, "
-"поэтому «type» игнорируется.\n"
-
-#: ../cli/src/connections.c:4226
-msgid "Team master: "
-msgstr "Мастер группы:"
+"Предупреждение: сейчас поддерживаются только слейвы Ethernet, поэтому «type» "
+"игнорируется.\n"
 
-#: ../cli/src/connections.c:4329
+#: ../clients/cli/connections.c:5111
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Ошибка «stp»: %s"
 
-#: ../cli/src/connections.c:4413
-msgid "Bridge master: "
-msgstr "Мастер-мост:"
-
-#: ../cli/src/connections.c:4421
-#, c-format
-msgid "Error: 'master': '%s' is not valid UUID nor interface."
-msgstr "Ошибка «master».  «%s» не содержит UUID или интерфейс."
+#: ../clients/cli/connections.c:5120
+#, fuzzy, c-format
+#| msgid "Error: 'stp': %s."
+msgid "Error: 'multicast-snooping': %s."
+msgstr "Ошибка «stp»: %s"
 
-#: ../cli/src/connections.c:4454
+#: ../clients/cli/connections.c:5253
 #, c-format
 msgid "Error: 'hairpin': %s."
-msgstr "Ошибка «hairpin»:  %s"
-
-#: ../cli/src/connections.c:4506
-msgid "VPN type: "
-msgstr "Тип VPN:"
+msgstr "Ошибка «hairpin»: %s"
 
-#: ../cli/src/connections.c:4509
+#: ../clients/cli/connections.c:5306
 msgid "Error: 'vpn-type' is required."
 msgstr "Ошибка. Необходимо определить «vpn-type»."
 
-#: ../cli/src/connections.c:4520
-#, c-format
-msgid "Error: 'vpn-type': %s."
+#: ../clients/cli/connections.c:5313
+#, fuzzy, c-format
+#| msgid "Error: 'vpn-type': %s."
+msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Ошибка «vpn-type»: %s."
 
-#: ../cli/src/connections.c:4578
+#: ../clients/cli/connections.c:5374
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
-msgstr ""
-"Ошибка «channel». Неверное значение «%s». Допустимые значения:  <1-13>."
+msgstr "Ошибка «channel». Неверное значение «%s». Допустимые значения: <1-13>."
 
-#: ../cli/src/connections.c:4613
+#: ../clients/cli/connections.c:5410
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Ошибка. Недопустимый тип соединения: «%s»"
 
-#: ../cli/src/connections.c:4711
+#: ../clients/cli/connections.c:5454
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr ""
+
+#: ../clients/cli/connections.c:5458
+#, fuzzy, c-format
+#| msgid "Error: No interface specified."
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Ошибка. Интерфейс не определен."
+
+#: ../clients/cli/connections.c:5462
+#, fuzzy, c-format
+#| msgid "invalid gateway '%s'"
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "недопустимый шлюз «%s»"
+
+#: ../clients/cli/connections.c:5487
 #, c-format
-msgid "Error: Failed to add '%s' connection: (%d) %s"
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr ""
+
+#: ../clients/cli/connections.c:5491
+#, fuzzy, c-format
+#| msgid "Error: No interface specified."
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Ошибка. Интерфейс не определен."
+
+#: ../clients/cli/connections.c:5495
+#, fuzzy, c-format
+#| msgid "invalid gateway '%s'"
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "недопустимый шлюз «%s»"
+
+#: ../clients/cli/connections.c:5555
+#, fuzzy, c-format
+#| msgid "Error: Failed to add '%s' connection: (%d) %s"
+msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
 
-#: ../cli/src/connections.c:4715
+#: ../clients/cli/connections.c:5560
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Соединение «%s» (%s) добавлено.\n"
 
-#: ../cli/src/connections.c:4761
-msgid "Connection type: "
-msgstr "Тип соединения:"
-
-#: ../cli/src/connections.c:4765
+#: ../clients/cli/connections.c:5780
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Ошибка. Аргумент «type» является обязательным."
 
-#: ../cli/src/connections.c:4771
+#: ../clients/cli/connections.c:5788
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Ошибка. Недопустимый тип соединения: %s."
 
-#: ../cli/src/connections.c:4780
+#: ../clients/cli/connections.c:5797
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Ошибка «autoconnect»: %s."
 
-#: ../cli/src/connections.c:4796
+#: ../clients/cli/connections.c:5807
+#, fuzzy, c-format
+#| msgid "Error: 'stp': %s."
+msgid "Error: 'save': %s."
+msgstr "Ошибка «stp»: %s"
+
+#: ../clients/cli/connections.c:5823
 msgid "Interface name [*]: "
 msgstr "Имя интерфейса [*]: "
 
-#: ../cli/src/connections.c:4801
+#: ../clients/cli/connections.c:5828
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Ошибка. Требуется аргумент «ifname»."
 
-#: ../cli/src/connections.c:4808
+#: ../clients/cli/connections.c:5835
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr ""
 "Ошибка «ifname». Недействительный интерфейс: «%s». Укажите другой интерфейс "
 "или «*»."
 
-#: ../cli/src/connections.c:5627
+#: ../clients/cli/connections.c:6596
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[«%s» устанавливает значения]\n"
 
-#: ../cli/src/connections.c:5708
-#, c-format
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. *              However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6678
+#, fuzzy, c-format
+#| msgid ""
+#| "---[ Main menu ]---\n"
+#| "goto     [<setting> | <prop>]        :: go to a setting or property\n"
+#| "remove   <setting>[.<prop>] | <prop> :: remove setting or reset property "
+#| "value\n"
+#| "set      [<setting>.<prop> <value>]  :: set property value\n"
+#| "describe [<setting>.<prop>]          :: describe property\n"
+#| "print    [all]                       :: print the connection\n"
+#| "verify   [all]                       :: verify the connection\n"
+#| "save                                 :: save the connection\n"
+#| "activate [<ifname>] [/<ap>|<nsp>]    :: activate the connection\n"
+#| "back                                 :: go one level up (back)\n"
+#| "help/?   [<command>]                 :: print this help\n"
+#| "nmcli    <conf-option> <value>       :: nmcli configuration\n"
+#| "quit                                 :: exit nmcli\n"
 msgid ""
 "---[ Main menu ]---\n"
 "goto     [<setting> | <prop>]        :: go to a setting or property\n"
@@ -1935,9 +2465,9 @@ msgid ""
 "value\n"
 "set      [<setting>.<prop> <value>]  :: set property value\n"
 "describe [<setting>.<prop>]          :: describe property\n"
-"print    [all]                       :: print the connection\n"
-"verify   [all]                       :: verify the connection\n"
-"save                                 :: save the connection\n"
+"print    [all | <setting>[.<prop>]]  :: print the connection\n"
+"verify   [all | fix]                 :: verify the connection\n"
+"save     [persistent|temporary]      :: save the connection\n"
 "activate [<ifname>] [/<ap>|<nsp>]    :: activate the connection\n"
 "back                                 :: go one level up (back)\n"
 "help/?   [<command>]                 :: print this help\n"
@@ -1960,7 +2490,7 @@ msgstr ""
 "nmcli    <параметр> <значение>       :: конфигурация nmcli\n"
 "quit                                 :: выход\n"
 
-#: ../cli/src/connections.c:5735
+#: ../clients/cli/connections.c:6705
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1980,12 +2510,13 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../cli/src/connections.c:5742
+#: ../clients/cli/connections.c:6712
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -1999,7 +2530,7 @@ msgstr ""
 "Примеры: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../cli/src/connections.c:5749
+#: ../clients/cli/connections.c:6719
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2014,7 +2545,7 @@ msgstr ""
 "\n"
 "Пример: nmcli> set con.id My connection\n"
 
-#: ../cli/src/connections.c:5754
+#: ../clients/cli/connections.c:6724
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2027,7 +2558,7 @@ msgstr ""
 "Возвращает описание свойства. Полный список параметров и их значений можно "
 "найти на справочной странице nm-settings(5).\n"
 
-#: ../cli/src/connections.c:5759
+#: ../clients/cli/connections.c:6729
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2042,15 +2573,26 @@ msgstr ""
 "\n"
 "Пример: nmcli ipv4> print all\n"
 
-#: ../cli/src/connections.c:5764
-#, c-format
+#: ../clients/cli/connections.c:6734
+#, fuzzy, c-format
+#| msgid ""
+#| "verify [all]  :: verify setting or connection validity\n"
+#| "\n"
+#| "Verifies whether the setting or connection is valid and can be saved "
+#| "later. It indicates invalid values on error.\n"
+#| "\n"
+#| "Examples: nmcli> verify\n"
+#| "          nmcli bond> verify\n"
 msgid ""
-"verify [all]  :: verify setting or connection validity\n"
+"verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
-"Verifies whether the setting or connection is valid and can be saved later. "
-"It indicates invalid values on error.\n"
+"Verifies whether the setting or connection is valid and can be saved later.\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
+"by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
+"          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
 "verify [all]  :: проверка параметров соединения\n"
@@ -2060,18 +2602,23 @@ msgstr ""
 "Примеры: nmcli> verify\n"
 "          nmcli bond> verify\n"
 
-#: ../cli/src/connections.c:5771
+#: ../clients/cli/connections.c:6743
 #, c-format
 msgid ""
-"save  :: save the connection\n"
-"\n"
-"Sends the connection to NetworkManager that will save it.\n"
+"save [persistent|temporary]  :: save the connection\n"
+"\n"
+"Sends the connection profile to NetworkManager that either will save it\n"
+"persistently, or will only keep it in memory. 'save' without an argument\n"
+"means 'save persistent'.\n"
+"Note that once you save the profile persistently those settings are saved\n"
+"across reboot or restart. Subsequent changes can also be temporary or\n"
+"persistent, but any temporary changes will not persist across reboot or\n"
+"restart. If you want to fully remove the persistent connection, the "
+"connection\n"
+"profile must be deleted.\n"
 msgstr ""
-"save  :: сохранение соединения\n"
-"\n"
-"Сохраняет соединение в NetworkManager.\n"
 
-#: ../cli/src/connections.c:5775
+#: ../clients/cli/connections.c:6754
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2092,28 +2639,53 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) или NSP (WiMAX) (если интерфейс не задан, в начале "
 "строки надо добавить /)\n"
 
-#: ../cli/src/connections.c:5782 ../cli/src/connections.c:5932
+#: ../clients/cli/connections.c:6761 ../clients/cli/connections.c:6919
 #, c-format
-msgid "back  :: go to upper menu level\n"
+msgid ""
+"back  :: go to upper menu level\n"
 "\n"
-msgstr "back  :: возврат к предыдущему меню\n"
+msgstr ""
+"back  :: возврат к предыдущему меню\n"
 "\n"
 
-#: ../cli/src/connections.c:5785
+#: ../clients/cli/connections.c:6764
 #, c-format
-msgid "help/? [<command>]  :: help for the nmcli commands\n"
-"\n"
-msgstr "help/? [<команда>]  :: справка по командам nmcli\n"
+msgid ""
+"help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-
-#: ../cli/src/connections.c:5788
-#, c-format
+msgstr ""
+"help/? [<команда>]  :: справка по командам nmcli\n"
+"\n"
+
+#: ../clients/cli/connections.c:6767
+#, fuzzy, c-format
+#| msgid ""
+#| "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
+#| "\n"
+#| "Configures nmcli. The following options are available:\n"
+#| "status-line yes | no        [default: no]\n"
+#| "save-confirmation yes | no  [default: yes]\n"
+#| "prompt-color <0-8>          [default: 0]\n"
+#| "  0 = normal\n"
+#| "  1 = \e[30mblack\e[0m\n"
+#| "  2 = \e[31mred\e[0m\n"
+#| "  3 = \e[32mgreen\e[0m\n"
+#| "  4 = \e[33myellow\e[0m\n"
+#| "  5 = \e[34mblue\e[0m\n"
+#| "  6 = \e[35mmagenta\e[0m\n"
+#| "  7 = \e[36mcyan\e[0m\n"
+#| "  8 = \e[37mwhite\e[0m\n"
+#| "\n"
+#| "Examples: nmcli> nmcli status-line yes\n"
+#| "          nmcli> nmcli save-confirmation no\n"
+#| "          nmcli> nmcli prompt-color 3\n"
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
 "Configures nmcli. The following options are available:\n"
 "status-line yes | no        [default: no]\n"
 "save-confirmation yes | no  [default: yes]\n"
+"show-secrets yes | no       [default: no]\n"
 "prompt-color <0-8>          [default: 0]\n"
 "  0 = normal\n"
 "  1 = \e[30mblack\e[0m\n"
@@ -2149,7 +2721,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../cli/src/connections.c:5808 ../cli/src/connections.c:5938
+#: ../clients/cli/connections.c:6788 ../clients/cli/connections.c:6925
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2161,13 +2733,16 @@ msgstr ""
 "\n"
 "Если изменения соединения не сохранены, появится окно подтверждения.\n"
 
-#: ../cli/src/connections.c:5813 ../cli/src/connections.c:5943
-#: ../cli/src/connections.c:6313 ../cli/src/connections.c:7162
+#: ../clients/cli/connections.c:6793 ../clients/cli/connections.c:6930
+#: ../clients/cli/connections.c:7342 ../clients/cli/connections.c:8262
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Неизвестная команда: «%s»\n"
 
-#: ../cli/src/connections.c:5879
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. *              However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6859
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2193,7 +2768,7 @@ msgstr ""
 "help/?   [<команда>]             :: показать справку или описание команды\n"
 "quit                             :: выход из nmcli\n"
 
-#: ../cli/src/connections.c:5904
+#: ../clients/cli/connections.c:6884
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2204,14 +2779,20 @@ msgstr ""
 "\n"
 "Эта команда определяет новое значение свойства.\n"
 
-#: ../cli/src/connections.c:5908
-#, c-format
+#: ../clients/cli/connections.c:6888
+#, fuzzy, c-format
+#| msgid ""
+#| "add [<value>]  :: add new option to the property\n"
+#| "\n"
+#| "This command add provided <value> to this property, if the property is of "
+#| "a container type. For single-valued properties it replaces the value "
+#| "(same as 'set').\n"
 msgid ""
-"add [<value>]  :: add new option to the property\n"
+"add [<value>]  :: append new value to the property\n"
 "\n"
-"This command add provided <value> to this property, if the property is of a "
-"container type. For single-valued properties it replaces the value (same as "
-"'set').\n"
+"This command adds provided <value> to this property, if the property is of a "
+"container type. For single-valued properties the property value is replaced "
+"(same as 'set').\n"
 msgstr ""
 "add [<значение>]  :: присвоение значения свойству\n"
 "\n"
@@ -2219,7 +2800,7 @@ msgstr ""
 "контейнера).  Для свойств с единственным значением, оно будет перезаписано "
 "(аналогично команде «set»).\n"
 
-#: ../cli/src/connections.c:5914
+#: ../clients/cli/connections.c:6894
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2230,18 +2811,27 @@ msgstr ""
 "\n"
 "Показывает значение и позволяет его отредактировать.\n"
 
-#: ../cli/src/connections.c:5918
+#: ../clients/cli/connections.c:6898
 #, c-format
 msgid ""
-"remove [<index>|<option>]  :: delete the value\n"
+"remove [<value>|<index>|<option name>]  :: delete the value\n"
+"\n"
+"Removes the property value. For single-valued properties, this sets the\n"
+"property back to its default value. For container-type properties, this "
+"removes\n"
+"all the values of that property, or you can specify an argument to remove "
+"just\n"
+"a single item or option. The argument is either a value or index of the item "
+"to\n"
+"remove, or an option name (for properties with named options).\n"
 "\n"
-"Removes the property value (sets it to default).\n"
-msgstr ""
-"remove [<индекс>|<значение>]  :: удаление значения\n"
+"Examples: nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
 "\n"
-"Очищает свойство и присваивает ему исходное значение.\n"
+msgstr ""
 
-#: ../cli/src/connections.c:5922
+#: ../clients/cli/connections.c:6909
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2254,7 +2844,7 @@ msgstr ""
 "Возвращает описание свойства. Полный список параметров и их значений можно "
 "найти на справочной странице nm-settings(5).\n"
 
-#: ../cli/src/connections.c:5927
+#: ../clients/cli/connections.c:6914
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2269,675 +2859,844 @@ msgstr ""
 "Если аргумент не указан, возвращает значение свойства. Укажите параметр или "
 "соединение, чтобы получить соответствующую информацию.\n"
 
-#: ../cli/src/connections.c:5935
+#: ../clients/cli/connections.c:6922
 #, c-format
-msgid "help/? [<command>]  :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr "help/? [<команда>]  :: справка по командам nmcli\n"
+msgstr ""
+"help/? [<команда>]  :: справка по командам nmcli\n"
 "\n"
 
-#: ../cli/src/connections.c:6022
+#: ../clients/cli/connections.c:7020
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Ошибка. Не удалось активировать соединение.\n"
 
-#: ../cli/src/connections.c:6093
+#: ../clients/cli/connections.c:7103
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Ошибка. Обязательное значение «%s» не может быть удалено.\n"
 
-#: ../cli/src/connections.c:6111
-#, c-format
-msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+#. TRANSLATORS: status line in nmcli connection editor
+#: ../clients/cli/connections.c:7121
+#, fuzzy, c-format
+#| msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[Тип соединения: %s | имя: %s | UUID: %s | грязное: %s ]\n"
 
-#: ../cli/src/connections.c:6171
+#: ../clients/cli/connections.c:7157
+#, fuzzy, c-format
+#| msgid "The connection is not saved. Do you really want to quit? [y/n]\n"
+msgid "The connection is not saved. Do you really want to quit? %s"
+msgstr "Соединение не сохранено. Вы действительно хотите выйти? [y/n]\n"
+
+#: ../clients/cli/connections.c:7203
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
 msgstr ""
 "Профиль соединения был удален из другого клиента. Чтобы его восстановить, "
-"введите  «save».\n"
+"введите «save».\n"
 
-#: ../cli/src/connections.c:6192 ../cli/src/connections.c:6615
-#: ../cli/src/connections.c:6673
+#: ../clients/cli/connections.c:7225 ../clients/cli/connections.c:7648
+#: ../clients/cli/connections.c:7703
 #, c-format
 msgid "Enter '%s' value: "
-msgstr "Введите значение  «%s»:"
+msgstr "Введите значение «%s»:"
 
-#: ../cli/src/connections.c:6209 ../cli/src/connections.c:6228
-#: ../cli/src/connections.c:6621 ../cli/src/connections.c:6680
+#: ../clients/cli/connections.c:7240 ../clients/cli/connections.c:7262
+#: ../clients/cli/connections.c:7652 ../clients/cli/connections.c:7708
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n"
 
-#: ../cli/src/connections.c:6221
+#: ../clients/cli/connections.c:7256
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Измените значение «%s»:"
 
-#: ../cli/src/connections.c:6250
+#: ../clients/cli/connections.c:7285
 #, c-format
 msgid "Error: %s\n"
 msgstr "Ошибка: %s\n"
 
-#: ../cli/src/connections.c:6256 ../cli/src/connections.c:6759
-#: ../cli/src/connections.c:6800
+#: ../clients/cli/connections.c:7291 ../clients/cli/connections.c:7787
+#: ../clients/cli/connections.c:7828
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n"
 
-#: ../cli/src/connections.c:6277
+#: ../clients/cli/connections.c:7312
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Неизвестный аргумент команды: «%s»\n"
 
-#: ../cli/src/connections.c:6297 ../cli/src/connections.c:7150
-msgid "The connection is not saved. Do you really want to quit? [y/n]\n"
-msgstr "Соединение не сохранено. Вы действительно хотите выйти? [y/n]\n"
-
-#: ../cli/src/connections.c:6409
+#: ../clients/cli/connections.c:7438
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Доступные параметры: %s\n"
 
-#: ../cli/src/connections.c:6418
+#: ../clients/cli/connections.c:7447
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Ошибка. Недопустимое значение параметра: %s\n"
 
-#: ../cli/src/connections.c:6435
+#: ../clients/cli/connections.c:7464
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Доступные свойства: %s\n"
 
-#: ../cli/src/connections.c:6443
+#: ../clients/cli/connections.c:7472
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Ошибка свойства %s\n"
 
-#: ../cli/src/connections.c:6484
+#: ../clients/cli/connections.c:7513
+#, fuzzy, c-format
+#| msgid ""
+#| "Saving the connection with 'autoconnect=yes'. That might result in an "
+#| "immediate activation of the connection.\n"
+#| "Do you still want to save? [yes] "
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
-"Do you still want to save? [yes] "
+"Do you still want to save? %s"
 msgstr ""
 "Соединение будет сохранено с параметром «autoconnect=yes», что немедленно "
 "активирует соединение. \n"
 "Сохранить? [Да]"
 
-#: ../cli/src/connections.c:6557
+#: ../clients/cli/connections.c:7589
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Разрешается изменить следующие параметры: %s\n"
 
-#: ../cli/src/connections.c:6583
+#: ../clients/cli/connections.c:7617
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr ""
 "Профиль соединения был удален из другого клиента. Чтобы его восстановить, "
-"введите  «save».\n"
+"введите «save».\n"
 
-#: ../cli/src/connections.c:6613 ../cli/src/connections.c:6671
+#: ../clients/cli/connections.c:7646 ../clients/cli/connections.c:7701
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Допустимые значения «%s»: %s\n"
 
-#: ../cli/src/connections.c:6625 ../cli/src/connections.c:6842
+#: ../clients/cli/connections.c:7656 ../clients/cli/connections.c:7870
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
-msgstr "Ошибка. Параметр не выбран. Допускается:  [%s]\n"
+msgstr "Ошибка. Параметр не выбран. Допускается: [%s]\n"
 
-#: ../cli/src/connections.c:6626
+#: ../clients/cli/connections.c:7657
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "используйте «goto <параметр>» или «set <параметр>.<свойство>»\n"
 
-#: ../cli/src/connections.c:6641 ../cli/src/connections.c:6779
-#: ../cli/src/connections.c:6859
+#: ../clients/cli/connections.c:7671 ../clients/cli/connections.c:7807
+#: ../clients/cli/connections.c:7887
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Ошибка. Недопустимый аргумент «%s». Допускается: [%s]\n"
 
-#: ../cli/src/connections.c:6651
+#: ../clients/cli/connections.c:7681
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Ошибка. Нет определения свойства «%s»\n"
 
-#: ../cli/src/connections.c:6658
+#: ../clients/cli/connections.c:7688
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Ошибка. Недействительное свойство: %s\n"
 
-#: ../cli/src/connections.c:6707
+#: ../clients/cli/connections.c:7735
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Ошибка: неизвестный параметр: %s\n"
 
-#: ../cli/src/connections.c:6720
+#: ../clients/cli/connections.c:7748
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Вы можете изменить следующие свойства: %s\n"
 
-#: ../cli/src/connections.c:6764
+#: ../clients/cli/connections.c:7792
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
-msgstr "Ошибка. Аргумент не задан. Допускается:  [%s]\n"
+msgstr "Ошибка. Аргумент не задан. Допускается: [%s]\n"
 
-#: ../cli/src/connections.c:6777
+#: ../clients/cli/connections.c:7805
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Параметр «%s» не определен в соединении.\n"
 
-#: ../cli/src/connections.c:6818
+#: ../clients/cli/connections.c:7846
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Ошибка. %s не является именем параметра или свойства.\n"
 
-#: ../cli/src/connections.c:6843
+#: ../clients/cli/connections.c:7871
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "используйте «goto <параметр>» или «describe <параметр>.<свойство>»\n"
 
-#: ../cli/src/connections.c:6884
+#: ../clients/cli/connections.c:7912
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Недопустимое свойство %s или неверное имя параметра.\n"
 
-#: ../cli/src/connections.c:6908
-#, c-format
-msgid "Error: '%s' setting not present\n"
-msgstr "Ошибка. Параметр «%s» не определен.\n"
-
-#: ../cli/src/connections.c:6911
+#: ../clients/cli/connections.c:7941
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Ошибка. Неизвестный параметр: %s\n"
 
-#: ../cli/src/connections.c:6927
+#: ../clients/cli/connections.c:7946
+#, fuzzy, c-format
+#| msgid "Setting '%s' is not present in the connection.\n"
+msgid "Error: '%s' setting not present in the connection\n"
+msgstr "Параметр «%s» не определен в соединении.\n"
+
+#: ../clients/cli/connections.c:7971
+#, fuzzy, c-format
+#| msgid "Error: invalid property: %s\n"
+msgid "Error: invalid property: %s%s\n"
+msgstr "Ошибка. Недействительное свойство: %s\n"
+
+#: ../clients/cli/connections.c:7973
+#, fuzzy
+#| msgid "Error: invalid property: %s, neither a valid setting name.\n"
+msgid ", neither a valid setting name"
+msgstr "Недопустимое свойство %s или неверное имя параметра.\n"
+
+#: ../clients/cli/connections.c:7990
+#, fuzzy, c-format
+#| msgid "invalid option '%s'"
+msgid "Invalid verify option: %s\n"
+msgstr "Недопустимый параметр  «%s»"
+
+#: ../clients/cli/connections.c:7998
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Проверьте параметр «%s»: %s\n"
 
-#: ../cli/src/connections.c:6934
+#: ../clients/cli/connections.c:8013
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Проверьте соединение: %s\n"
 
-#: ../cli/src/connections.c:6973
+#: ../clients/cli/connections.c:8016
 #, c-format
-msgid "Error: Failed to save '%s' (%s) connection: (%d) %s\n"
+msgid "The error cannot be fixed automatically.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:8033
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
+msgid "Error: invalid argument '%s'\n"
+msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»."
+
+#: ../clients/cli/connections.c:8066
+#, fuzzy, c-format
+#| msgid "Error: Failed to save '%s' (%s) connection: (%d) %s\n"
+msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Ошибка. Не удалось сохранить соединение «%s» (%s): (%d) %s\n"
 
-#: ../cli/src/connections.c:6980
+#: ../clients/cli/connections.c:8073
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Соединение «%s» (%s) сохранено.\n"
 
-#: ../cli/src/connections.c:7014
+#: ../clients/cli/connections.c:8074
+#, fuzzy, c-format
+#| msgid "Connection '%s' (%s) successfully added.\n"
+msgid "Connection '%s' (%s) successfully updated.\n"
+msgstr "Соединение «%s» (%s) добавлено.\n"
+
+#: ../clients/cli/connections.c:8107
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Ошибка. Проверка соединения завершилась неудачей: %s\n"
 
-#: ../cli/src/connections.c:7015
+#: ../clients/cli/connections.c:8108
 msgid "(unknown error)"
 msgstr "(неизвестная ошибка)"
 
-#: ../cli/src/connections.c:7036
+#: ../clients/cli/connections.c:8109
+#, c-format
+msgid "You may try running 'verify fix' to fix errors.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:8131
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Ошибка. Соединение не сохранено. Сначала введите «type».\n"
 
-#: ../cli/src/connections.c:7040
+#: ../clients/cli/connections.c:8135
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Ошибка. Недействительное соединение: %s\n"
 
-#: ../cli/src/connections.c:7051
+#: ../clients/cli/connections.c:8145
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Ошибка. Не удалось активировать соединение: %s\n"
 
-#: ../cli/src/connections.c:7061
-#, c-format
-msgid "Error: Failed to activate '%s' (%s) connection: (%d) %s\n"
+#: ../clients/cli/connections.c:8155
+#, fuzzy, c-format
+#| msgid "Error: Failed to activate '%s' (%s) connection: (%d) %s\n"
+msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Ошибка. Не удалось активировать соединение «%s» (%s): (%d) %s\n"
 
-#: ../cli/src/connections.c:7067
+#: ../clients/cli/connections.c:8161
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Контроль активации соединения (нажмите любую клавишу для продолжения)\n"
 
-#: ../cli/src/connections.c:7105
+#: ../clients/cli/connections.c:8199
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Ошибка status-line: %s\n"
 
-#: ../cli/src/connections.c:7113
+#: ../clients/cli/connections.c:8207
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Ошибка save-confirmation: %s\n"
 
-#: ../cli/src/connections.c:7121
+#: ../clients/cli/connections.c:8215
+#, fuzzy, c-format
+#| msgid "Error: 'show active': %s"
+msgid "Error: show-secrets: %s\n"
+msgstr "Ошибка «show active»: %s"
+
+#: ../clients/cli/connections.c:8223
 #, c-format
 msgid "Error: bad color number: '%s'; use <0-8>\n"
-msgstr "Ошибка. Неверный код цвета: «%s». Допустимые значения:  <0-8>\n"
+msgstr "Ошибка. Неверный код цвета: «%s». Допустимые значения: <0-8>\n"
 
-#: ../cli/src/connections.c:7133
+#: ../clients/cli/connections.c:8237
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Текущая конфигурация nmcli:\n"
 
-#: ../cli/src/connections.c:7141
+#: ../clients/cli/connections.c:8247
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Недопустимый параметр конфигурации «%s». Допускается: [%s]\n"
 
-#: ../cli/src/connections.c:7364
-#, c-format
-msgid ""
-">>> Command-line editing is not available. Consider installing a line "
-"editing library to enable the feature. <<<\n"
-"Supported libraries are:\n"
-"  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-"readline/rltop.html\n"
-"  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-msgstr ""
-">>> Редактирование в командной строке недоступно. Для этого рекомендуется "
-"установить библиотеку для редактирования текста. <<<\n"
-"Поддерживаемые библиотеки:\n"
-"  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-"readline/rltop.html\n"
-"  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-
-#: ../cli/src/connections.c:7390
+#: ../clients/cli/connections.c:8494
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Ошибка. Допускается только одно значение: «id», «uuid» или «path»."
 
-#: ../cli/src/connections.c:7402 ../cli/src/connections.c:7599
+#: ../clients/cli/connections.c:8506 ../clients/cli/connections.c:8693
+#: ../clients/cli/connections.c:8700
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Ошибка. Неизвестное соединение: «%s»."
 
-#: ../cli/src/connections.c:7417
+#: ../clients/cli/connections.c:8524
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
-"Предупреждение. При редактировании соединения «%s»  аргумент «type» будет "
+"Предупреждение. При редактировании соединения «%s» аргумент «type» будет "
 "пропущен.\n"
 
-#: ../cli/src/connections.c:7420
+#: ../clients/cli/connections.c:8527
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr ""
-"Предупреждение. При редактировании соединения «%s»  аргумент «con-name» "
-"бÑ\83деÑ\82 пÑ\80опÑ\83Ñ\89ен.\n"
+"Предупреждение. При редактировании соединения «%s» аргумент «con-name» будет "
+"пропущен.\n"
 
-#: ../cli/src/connections.c:7434
+#: ../clients/cli/connections.c:8541
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Доступные типы подключений: %s\n"
 
-#: ../cli/src/connections.c:7436
+#: ../clients/cli/connections.c:8543
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Ошибка. Недопустимый тип соединения: %s.\n"
 
-#: ../cli/src/connections.c:7472
+#: ../clients/cli/connections.c:8582
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| интерактивный редактор соединений nmcli |==="
 
-#: ../cli/src/connections.c:7475
+#: ../clients/cli/connections.c:8585
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Редактируется соединение «%s»: «%s»"
 
-#: ../cli/src/connections.c:7477
+#: ../clients/cli/connections.c:8587
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Добавление нового соединения «%s»"
 
-#: ../cli/src/connections.c:7479
+#: ../clients/cli/connections.c:8589
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Для просмотра доступных команд введите «help» или «?»"
 
-#: ../cli/src/connections.c:7481
+#: ../clients/cli/connections.c:8591
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
-"Для просмотра описания свойства введите  «describe [<параметр>.<свойство>]»."
+"Для просмотра описания свойства введите «describe [<параметр>.<свойство>]»."
 
-#: ../cli/src/connections.c:7520
-#, c-format
-msgid "Error: Failed to modify connection '%s': (%d) %s"
+#: ../clients/cli/connections.c:8629
+#, fuzzy, c-format
+#| msgid "Error: Failed to modify connection '%s': (%d) %s"
+msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Ошибка. Не удалось изменить соединение «%s»: (%d) %s"
 
-#: ../cli/src/connections.c:7526
+#: ../clients/cli/connections.c:8636
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Соединение «%s» (%s) изменено.\n"
 
-#: ../cli/src/connections.c:7553
+#: ../clients/cli/connections.c:8668
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Ошибка. Аргументы не определены."
 
-#: ../cli/src/connections.c:7577
+#: ../clients/cli/connections.c:8687
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "Ошибка. Идентификатор соединения отсутствует."
 
-#: ../cli/src/connections.c:7582
+#: ../clients/cli/connections.c:8709 ../clients/cli/connections.c:8722
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Ошибка. Отсутствует аргумент <параметр>.<свойство>"
 
-#: ../cli/src/connections.c:7605
+#: ../clients/cli/connections.c:8727
+#, fuzzy, c-format
+#| msgid "Error: fields for '%s' options are missing."
+msgid "Error: value for '%s' is missing."
+msgstr "Ошибка: отсутствуют поля для параметров «%s»."
+
+#: ../clients/cli/connections.c:8745
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "Ошибка  <параметр>.<свойство>:  «%s»."
+msgstr "Ошибка <параметр>.<свойство>: «%s»."
 
-#: ../cli/src/connections.c:7620
+#: ../clients/cli/connections.c:8753
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "Ошибка. Недопустимый параметр  «%s»: %s."
+msgstr "Ошибка. Недопустимый параметр «%s»: %s."
 
-#: ../cli/src/connections.c:7641
+#: ../clients/cli/connections.c:8774
 #, c-format
 msgid "Error: invalid property '%s': %s."
-msgstr "Ошибка. Недопустимое свойство  «%s»: %s."
+msgstr "Ошибка. Недопустимое свойство «%s»: %s."
 
-#: ../cli/src/connections.c:7647
+#: ../clients/cli/connections.c:8785
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Ошибка. Не удалось изменить %s.%s: %s."
 
-#: ../cli/src/connections.c:7677
+#: ../clients/cli/connections.c:8803
+#, fuzzy, c-format
+#| msgid "Error: failed to remove value of '%s': %s\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
+
+#: ../clients/cli/connections.c:8840
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Ошибка: сбой удаления соединения: %s"
 
-#: ../cli/src/connections.c:7747
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: unknown connection: %s\n"
 msgstr "Ошибка. Неизвестное соединение: %s\n"
 
-#: ../cli/src/connections.c:7781
+#. truncate trailing ", "
+#: ../clients/cli/connections.c:8941
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Ошибка. Не удалось удалить неизвестные соединения: %s"
 
-#: ../cli/src/connections.c:7852
+#: ../clients/cli/connections.c:8964
+#, fuzzy, c-format
+#| msgid "Error: Failed to add '%s' connection: (%d) %s"
+msgid "Error: failed to reload connections: %s."
+msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+
+#: ../clients/cli/connections.c:9003
+#, fuzzy, c-format
+#| msgid "Error: Failed to add '%s' connection: (%d) %s"
+msgid "Error: failed to load connection: %s."
+msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s"
+
+#: ../clients/cli/connections.c:9011
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Не удалось загрузить «%s»\n"
 
-#: ../cli/src/connections.c:7917
+#: ../clients/cli/connections.c:9108
 #, c-format
-msgid ""
-"Error: 'configured' or 'active' command is expected for 'connection show'."
-msgstr "Ошибка. После «connection show» ожидается «configured» или «active»."
+msgid "incorrect string '%s' of '--order' option"
+msgstr ""
 
-#: ../cli/src/connections.c:7984
+#: ../clients/cli/connections.c:9134
 #, c-format
-msgid "Error: '%s' is not valid 'connection' command."
-msgstr "Ошибка. Недопустимая команда «connection»:  «%s»"
+msgid "incorrect item '%s' in '--order' option"
+msgstr ""
 
-#: ../cli/src/connections.c:8053 ../cli/src/network-manager.c:615
-#, c-format
-msgid "Error: Could not get system settings."
-msgstr "Ошибка. Не удалось получить системные параметры."
+#: ../clients/cli/connections.c:9219
+#, fuzzy
+#| msgid "Error: %s argument is missing."
+msgid "'--order' argument is missing"
+msgstr "Ошибка: отсутствует аргумент %s."
 
-#: ../cli/src/connections.c:8063
+#: ../clients/cli/connections.c:9261
 #, c-format
-msgid "Error: Can't obtain connections: settings service is not running."
-msgstr ""
-"Ошибка: не удалось получить соединения: служба параметров не запущена."
+msgid "Error: '%s' is not valid 'connection' command."
+msgstr "Ошибка. Недопустимая команда «connection»: «%s»"
 
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:87 ../cli/src/devices.c:184
-#: ../cli/src/devices.c:201
-msgid "DEVICE"
-msgstr "УСТРÐ\9eÐ\99СТÐ\92Ð\9e"
+#. define some prompts
+#: ../clients/cli/devices.c:38
+msgid "Interface: "
+msgstr "Ð\98нÑ\82еÑ\80Ñ\84ейÑ\81:"
 
-#: ../cli/src/devices.c:75 ../cli/src/devices.c:103
+#. 3
+#. 17
+#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:75
 msgid "CONNECTION"
 msgstr "СОЕДИНЕНИЕ"
 
-#: ../cli/src/devices.c:76 ../cli/src/devices.c:104
+#. 4
+#. 18
+#: ../clients/cli/devices.c:47 ../clients/cli/devices.c:76
 msgid "CON-UUID"
 msgstr "UUID СОЕДИНЕНИЯ"
 
-#: ../cli/src/devices.c:89
+#. 2
+#: ../clients/cli/devices.c:60
 msgid "VENDOR"
 msgstr "ПРОИЗВОДИТЕЛЬ"
 
-#: ../cli/src/devices.c:90
+#. 3
+#: ../clients/cli/devices.c:61
 msgid "PRODUCT"
 msgstr "ПРОДУКТ"
 
-#: ../cli/src/devices.c:91
+#. 4
+#: ../clients/cli/devices.c:62
 msgid "DRIVER"
 msgstr "ДРАЙВЕР"
 
-#: ../cli/src/devices.c:92
+#. 5
+#: ../clients/cli/devices.c:63
 msgid "DRIVER-VERSION"
 msgstr "ВЕРСИЯ ДРАЙВЕРА"
 
-#: ../cli/src/devices.c:93
+#. 6
+#: ../clients/cli/devices.c:64
 msgid "FIRMWARE-VERSION"
 msgstr "ВЕРСИЯ ПРОШИВКИ"
 
-#: ../cli/src/devices.c:94
+#. 7
+#: ../clients/cli/devices.c:65
 msgid "HWADDR"
 msgstr "АППАРАТНЫЙ АДРЕС"
 
-#: ../cli/src/devices.c:95 ../tui/nmt-page-ethernet.c:86
-#: ../tui/nmt-page-infiniband.c:90 ../tui/nmt-page-vlan.c:138
-#: ../tui/nmt-page-wifi.c:364
+#. 8
+#: ../clients/cli/devices.c:66 ../clients/tui/nmt-page-ethernet.c:86
+#: ../clients/tui/nmt-page-infiniband.c:97 ../clients/tui/nmt-page-vlan.c:131
+#: ../clients/tui/nmt-page-wifi.c:373
 msgid "MTU"
 msgstr "MTU"
 
-#: ../cli/src/devices.c:97
+#. 10
+#: ../clients/cli/devices.c:68
 msgid "REASON"
 msgstr "ПРИЧИНА"
 
-#: ../cli/src/devices.c:98
+#. 11
+#: ../clients/cli/devices.c:69
 msgid "UDI"
 msgstr "UDI"
 
-#: ../cli/src/devices.c:99
+#. 12
+#: ../clients/cli/devices.c:70
 msgid "IP-IFACE"
 msgstr "IP_ИНТЕРФЕЙСА"
 
-#: ../cli/src/devices.c:100
+#. 13
+#. 2
+#: ../clients/cli/devices.c:71 ../clients/cli/devices.c:99
+msgid "IS-SOFTWARE"
+msgstr ""
+
+#. 14
+#: ../clients/cli/devices.c:72
 msgid "NM-MANAGED"
 msgstr "ПОД УПРАВЛЕНИЕМ NM"
 
-#: ../cli/src/devices.c:102
+#. 16
+#: ../clients/cli/devices.c:74
 msgid "FIRMWARE-MISSING"
 msgstr "ТРЕБУЕТСЯ ПРОШИВКА"
 
-#: ../cli/src/devices.c:115
+#. 0
+#: ../clients/cli/devices.c:87
 msgid "AVAILABLE-CONNECTION-PATHS"
 msgstr "ДОСТУПНЫЕ ПУТИ СОЕДИНЕНИЯ"
 
-#: ../cli/src/devices.c:116
+#. 1
+#: ../clients/cli/devices.c:88
 msgid "AVAILABLE-CONNECTIONS"
 msgstr "ДОСТУПНЫЕ СОЕДИНЕНИЯ"
 
-#: ../cli/src/devices.c:125
+#. 0
+#: ../clients/cli/devices.c:97
 msgid "CARRIER-DETECT"
 msgstr "ОПРЕД.НЕСУЩЕЙ"
 
-#: ../cli/src/devices.c:126
+#. 1
+#: ../clients/cli/devices.c:98
 msgid "SPEED"
 msgstr "СКОРОСТЬ"
 
-#: ../cli/src/devices.c:135
+#. 0
+#: ../clients/cli/devices.c:108
 msgid "CARRIER"
 msgstr "НЕСУЩАЯ"
 
-#: ../cli/src/devices.c:144 ../cli/src/devices.c:563
+#. 0
+#: ../clients/cli/devices.c:117 ../clients/cli/devices.c:603
 msgid "WEP"
 msgstr "WEP"
 
-#: ../cli/src/devices.c:145
+#. 1
+#: ../clients/cli/devices.c:118
 msgid "WPA"
 msgstr "WPA"
 
-#: ../cli/src/devices.c:146 ../cli/src/devices.c:571
+#. 2
+#: ../clients/cli/devices.c:119 ../clients/cli/devices.c:611
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../cli/src/devices.c:147
+#. 3
+#: ../clients/cli/devices.c:120
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../cli/src/devices.c:148
+#. 4
+#: ../clients/cli/devices.c:121
 msgid "CCMP"
 msgstr "CCMP"
 
-#: ../cli/src/devices.c:149 ../cli/src/devices.c:239
+#. 5
+#. 2
+#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:222
 msgid "AP"
 msgstr "ТОЧКА ДОСТУПА"
 
-#: ../cli/src/devices.c:150
+#. 6
+#: ../clients/cli/devices.c:123
 msgid "ADHOC"
 msgstr "ADHOC"
 
-#: ../cli/src/devices.c:159
+#. 0
+#: ../clients/cli/devices.c:132
 msgid "CTR-FREQ"
 msgstr "CTR-FREQ"
 
-#: ../cli/src/devices.c:160
+#. 1
+#: ../clients/cli/devices.c:133
 msgid "RSSI"
 msgstr "RSSI"
 
-#: ../cli/src/devices.c:161
+#. 2
+#: ../clients/cli/devices.c:134
 msgid "CINR"
 msgstr "CINR"
 
-#: ../cli/src/devices.c:162
+#. 3
+#: ../clients/cli/devices.c:135
 msgid "TX-POW"
 msgstr "TX-POW"
 
-#: ../cli/src/devices.c:163
+#. 4
+#: ../clients/cli/devices.c:136
 msgid "BSID"
 msgstr "BSID"
 
-#: ../cli/src/devices.c:172 ../tui/nmt-page-wifi.c:221
+#. 0
+#: ../clients/cli/devices.c:145 ../clients/tui/nmt-page-wifi.c:227
 msgid "SSID"
 msgstr "SSID"
 
-#: ../cli/src/devices.c:173
+#. 1
+#: ../clients/cli/devices.c:146
 msgid "SSID-HEX"
 msgstr "SSID-HEX"
 
-#: ../cli/src/devices.c:174 ../tui/nmt-page-wifi.c:352
+#. 2
+#: ../clients/cli/devices.c:147 ../clients/tui/nmt-page-wifi.c:361
 msgid "BSSID"
 msgstr "BSSID"
 
-#: ../cli/src/devices.c:175
+#. 3
+#: ../clients/cli/devices.c:148
 msgid "MODE"
 msgstr "РЕЖИМ"
 
-#: ../cli/src/devices.c:176
+#. 4
+#: ../clients/cli/devices.c:149
 msgid "CHAN"
 msgstr "КАНАЛ"
 
-#: ../cli/src/devices.c:177
+#. 5
+#: ../clients/cli/devices.c:150
 msgid "FREQ"
 msgstr "ЧАСТОТА"
 
-#: ../cli/src/devices.c:178
+#. 6
+#: ../clients/cli/devices.c:151
 msgid "RATE"
 msgstr "СКОРОСТЬ"
 
-#: ../cli/src/devices.c:179 ../cli/src/devices.c:199
+#. 7
+#. 1
+#: ../clients/cli/devices.c:152 ../clients/cli/devices.c:172
 msgid "SIGNAL"
 msgstr "СИГНАЛ"
 
-#: ../cli/src/devices.c:180
+#. 8
+#: ../clients/cli/devices.c:153
 msgid "BARS"
 msgstr "СТОЛБЦЫ"
 
-#: ../cli/src/devices.c:181
+#. 9
+#: ../clients/cli/devices.c:154
 msgid "SECURITY"
 msgstr "ЗАЩИТА"
 
-#: ../cli/src/devices.c:182
+#. 10
+#: ../clients/cli/devices.c:155
 msgid "WPA-FLAGS"
 msgstr "ФЛАГИ WPA"
 
-#: ../cli/src/devices.c:183
+#. 11
+#: ../clients/cli/devices.c:156
 msgid "RSN-FLAGS"
 msgstr "ФЛАГИ RSN"
 
-#: ../cli/src/devices.c:185 ../cli/src/devices.c:202
-msgid "ACTIVE"
-msgstr "АКТИВЕН"
-
-#: ../cli/src/devices.c:186
+#. 14
+#: ../clients/cli/devices.c:159
 msgid "*"
 msgstr "*"
 
-#: ../cli/src/devices.c:198 ../cli/src/devices.c:242
+#. 0
+#. 5
+#: ../clients/cli/devices.c:171 ../clients/cli/devices.c:225
 msgid "NSP"
 msgstr "NSP"
 
-#: ../cli/src/devices.c:213
+#. 0
+#: ../clients/cli/devices.c:186
 msgid "SLAVES"
-msgstr "ПОДЧИНЕННЫЕ"
+msgstr "СЛЕЙВЫ"
+
+#. 0
+#: ../clients/cli/devices.c:195
+msgid "PARENT"
+msgstr ""
 
-#: ../cli/src/devices.c:222
+#. 1
+#: ../clients/cli/devices.c:196
 msgid "ID"
 msgstr "ID"
 
-#: ../cli/src/devices.c:237
+#. 0
+#: ../clients/cli/devices.c:205 ../clients/cli/devices.c:220
 msgid "CAPABILITIES"
 msgstr "ВОЗМОЖНОСТИ"
 
-#: ../cli/src/devices.c:238
+#. 1
+#: ../clients/cli/devices.c:221
 msgid "WIFI-PROPERTIES"
 msgstr "СВОЙСТВА WIFI"
 
-#: ../cli/src/devices.c:240
+#. 3
+#: ../clients/cli/devices.c:223
 msgid "WIRED-PROPERTIES"
 msgstr "СВОЙСТВА ПРОВОДНОГО СОЕДИНЕНИЯ"
 
-#: ../cli/src/devices.c:241
+#. 4
+#: ../clients/cli/devices.c:224
 msgid "WIMAX-PROPERTIES"
 msgstr "СВОЙСТВА WIMAX"
 
-#: ../cli/src/devices.c:247 ../tui/nmt-page-bond.c:73
+#. 10
+#: ../clients/cli/devices.c:230 ../clients/tui/nmt-page-bond.c:354
 msgid "BOND"
-msgstr "АГРЕГАЦИЯ"
+msgstr "АГРЕГАЦИЯ (BOND)"
 
-#: ../cli/src/devices.c:248 ../tui/nm-editor-utils.c:227
-#: ../tui/nm-ui-utils.c:355 ../tui/nm-ui-utils.c:580 ../tui/nmt-page-vlan.c:53
-msgid "VLAN"
-msgstr "VLAN"
+#. 11
+#: ../clients/cli/devices.c:231 ../clients/tui/nmt-page-team.c:148
+msgid "TEAM"
+msgstr "АГРЕГАЦИЯ (TEAM)"
 
-#: ../cli/src/devices.c:249
+#. 12
+#: ../clients/cli/devices.c:232 ../clients/tui/nmt-page-bridge.c:77
+msgid "BRIDGE"
+msgstr "МОСТ"
+
+#. 14
+#: ../clients/cli/devices.c:234
+msgid "BLUETOOTH"
+msgstr "BLUETOOTH"
+
+#. 15
+#: ../clients/cli/devices.c:235
 msgid "CONNECTIONS"
 msgstr "СОЕДИНЕНИЯ"
 
-#: ../cli/src/devices.c:274
-#, c-format
+#: ../clients/cli/devices.c:259
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli device { COMMAND | help }\n"
+#| "\n"
+#| "COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+#| "\n"
+#| "COMMAND := { status | show | connect | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "\n"
+#| "  show [<ifname>]\n"
+#| "\n"
+#| "  connect <ifname>\n"
+#| "\n"
+#| "  disconnect <ifname>\n"
+#| "\n"
+#| "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+#| "\n"
+#| "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
+#| "[ifname <ifname>]\n"
+#| "                         [bssid <BSSID>] [name <name>] [private yes|no]\n"
+#| "\n"
+#| "  wifi rescan [[ifname] <ifname>]\n"
+#| "\n"
+#| "  wimax [list [ifname <ifname>] [nsp <name>]]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi | wimax }\n"
 "\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi }\n"
 "\n"
 "  status\n"
 "\n"
@@ -2947,6 +3706,8 @@ msgid ""
 "\n"
 "  disconnect <ifname>\n"
 "\n"
+"  delete <ifname>\n"
+"\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
@@ -2983,7 +3744,7 @@ msgstr ""
 "  wimax [list [ifname <интерфейс>] [nsp <имя>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:298
+#: ../clients/cli/devices.c:283
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2994,8 +3755,10 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
 "\n"
 msgstr ""
 "Формат: nmcli device status { help }\n"
@@ -3011,7 +3774,7 @@ msgstr ""
 "gen status».\n"
 "\n"
 
-#: ../cli/src/devices.c:314
+#: ../clients/cli/devices.c:298
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3030,7 +3793,7 @@ msgstr ""
 "отдельно выбранном устройстве.\n"
 "\n"
 
-#: ../cli/src/devices.c:326
+#: ../clients/cli/devices.c:309
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3038,8 +3801,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3052,7 +3815,7 @@ msgstr ""
 "принимая во внимание соединения без включенных функций\n"
 "автоматического запуска.\n"
 
-#: ../cli/src/devices.c:339
+#: ../clients/cli/devices.c:321
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -3073,7 +3836,36 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../cli/src/devices.c:352
+#: ../clients/cli/devices.c:333
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli device show { ARGUMENTS | help }\n"
+#| "\n"
+#| "ARGUMENTS := [<ifname>]\n"
+#| "\n"
+#| "Show details of device(s).\n"
+#| "The command lists details for all devices, or for a given device.\n"
+#| "\n"
+msgid ""
+"Usage: nmcli device delete { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := <ifname>\n"
+"\n"
+"Deletes the software device.\n"
+"The command removes the interface. It only works for software devices\n"
+"(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
+"command.\n"
+"\n"
+msgstr ""
+"Формат: nmcli device show { АРГУМЕНТЫ | help }\n"
+"\n"
+"АРГУМЕНТЫ := [<интерфейс>]\n"
+"\n"
+"Показывает информацию обо всех или\n"
+"отдельно выбранном устройстве.\n"
+"\n"
+
+#: ../clients/cli/devices.c:346
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -3085,8 +3877,8 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
 "\n"
 "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
@@ -3100,8 +3892,10 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [[ifname] <ifname>]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
 "be useful to start scanning manually. Note that this command does not show\n"
 "the APs, use 'nmcli device wifi list' for that.\n"
 "\n"
@@ -3137,7 +3931,7 @@ msgstr ""
 "но иногда это надо сделать сразу. Эта команда не показывает список \n"
 "точек доступа — для этой цели служит «nmcli device wifi list».\n"
 
-#: ../cli/src/devices.c:386
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device wimax { ARGUMENTS | help }\n"
@@ -3156,203 +3950,226 @@ msgstr ""
 "\n"
 "АРГУМЕНТЫ := [list [ifname <интерфейс>] [nsp <имя>]]\n"
 "\n"
-"Возвращает список доступных WiMAX NSP.  С помощью параметров \n"
+"Возвращает список доступных WiMAX NSP. С помощью параметров \n"
 "«ifname» и «ncp» можно выбрать сети для конкретного интерфейса или NCP.\n"
 "\n"
 
-#: ../cli/src/devices.c:480
+#: ../clients/cli/devices.c:522 ../clients/cli/devices.c:721
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../cli/src/devices.c:547
+#: ../clients/cli/devices.c:591
 #, c-format
 msgid "%u MHz"
 msgstr "%u МГц"
 
-#: ../cli/src/devices.c:548
+#: ../clients/cli/devices.c:592
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u МБ/с"
 
-#: ../cli/src/devices.c:567
+#: ../clients/cli/devices.c:607
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../cli/src/devices.c:576
+#: ../clients/cli/devices.c:616
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../cli/src/devices.c:592
+#: ../clients/cli/devices.c:632
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:593
+#: ../clients/cli/devices.c:633
 msgid "Infra"
 msgstr "Инфраструктура"
 
-#: ../cli/src/devices.c:625
+#: ../clients/cli/devices.c:634
+msgid "N/A"
+msgstr "Н/Д"
+
+#: ../clients/cli/devices.c:672
 msgid "Home"
 msgstr "Дом"
 
-#: ../cli/src/devices.c:628
+#: ../clients/cli/devices.c:675
 msgid "Partner"
 msgstr "Партнёр"
 
-#: ../cli/src/devices.c:631
+#: ../clients/cli/devices.c:678
 msgid "Roaming"
 msgstr "Роуминг"
 
-#: ../cli/src/devices.c:725
+#: ../clients/cli/devices.c:836
 msgid "Device details"
 msgstr "Сведения об устройстве"
 
-#: ../cli/src/devices.c:737
+#: ../clients/cli/devices.c:848
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Ошибка «device show»: %s"
 
-#: ../cli/src/devices.c:787 ../cli/src/devices.c:790 ../cli/src/devices.c:1334
-#: ../cli/src/devices.c:1474
+#: ../clients/cli/devices.c:899 ../clients/cli/devices.c:902
 msgid "(unknown)"
 msgstr "(неизвестно)"
 
-#: ../cli/src/devices.c:827
+#: ../clients/cli/devices.c:940
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/c"
 
-#: ../cli/src/devices.c:913
+#: ../clients/cli/devices.c:1027
 msgid "on"
 msgstr "вкл."
 
-#: ../cli/src/devices.c:913
+#: ../clients/cli/devices.c:1027
 msgid "off"
 msgstr "выкл."
 
-#: ../cli/src/devices.c:1188
+#: ../clients/cli/devices.c:1313
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Ошибка: «device status»: %s"
 
-#: ../cli/src/devices.c:1206
+#. Add headers
+#: ../clients/cli/devices.c:1320
 msgid "Status of devices"
 msgstr "Состояние устройств"
 
-#: ../cli/src/devices.c:1237
+#: ../clients/cli/devices.c:1351
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»."
 
-#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1422
-#: ../cli/src/devices.c:1557 ../cli/src/devices.c:1696
-#: ../cli/src/devices.c:2436
+#: ../clients/cli/devices.c:1368 ../clients/cli/devices.c:1666
+#: ../clients/cli/devices.c:1816 ../clients/cli/devices.c:1903
+#: ../clients/cli/devices.c:2037 ../clients/cli/devices.c:2698
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Ошибка: не найдено устройство «%s»."
 
-#: ../cli/src/devices.c:1319
-#, c-format
-msgid "Success: Device '%s' successfully activated."
+#: ../clients/cli/devices.c:1446
+#, fuzzy, c-format
+#| msgid "Success: Device '%s' successfully activated."
+msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Устройство «%s» успешно подключено."
 
-#: ../cli/src/devices.c:1333
+#: ../clients/cli/devices.c:1452
+#, fuzzy, c-format
+#| msgid "Error: Connection activation failed: (%d) %s."
+msgid "Error: Connection activation failed: (%d) %s.\n"
+msgstr "Ошибка: сбой активации соединения: (%d) %s."
+
+#: ../clients/cli/devices.c:1486
+#, fuzzy, c-format
+#| msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgid "Error: Failed to add/activate new connection: %s"
+msgstr "Ошибка: не удалось добавить или активировать новое соединение: (%d) %s"
+
+#: ../clients/cli/devices.c:1495
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr ""
+"Ошибка: не удалось добавить или активировать новое соединение: неизвестная "
+"ошибка"
+
+#: ../clients/cli/devices.c:1506
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Соединение с UUID «%s» создано и задействовано на устройстве «%s»\n"
+
+#: ../clients/cli/devices.c:1570
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Ошибка. Не удалось отключить устройство: %s"
 
-#: ../cli/src/devices.c:1350
+#: ../clients/cli/devices.c:1579
+#, fuzzy, c-format
+#| msgid "Error: Device activation failed: %s"
+msgid "Error: Device activation failed: device was disconnected"
+msgstr "Ошибка. Не удалось отключить устройство: %s"
+
+#: ../clients/cli/devices.c:1594
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Устройство «%s» подключено.\n"
 
-#: ../cli/src/devices.c:1377 ../cli/src/devices.c:1512
-msgid "Interface: "
-msgstr "Интерфейс:"
-
-#: ../cli/src/devices.c:1381 ../cli/src/devices.c:1390
-#: ../cli/src/devices.c:1516 ../cli/src/devices.c:1525
+#: ../clients/cli/devices.c:1635 ../clients/cli/devices.c:1644
+#: ../clients/cli/devices.c:1785 ../clients/cli/devices.c:1794
+#: ../clients/cli/devices.c:1873 ../clients/cli/devices.c:1881
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Ошибка. Интерфейс не определен."
 
-#: ../cli/src/devices.c:1396 ../cli/src/devices.c:1531
+#: ../clients/cli/devices.c:1650 ../clients/cli/devices.c:1800
+#: ../clients/cli/devices.c:1887
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Ошибка. Дополнительный аргумент не разрешен: «%s»."
 
-#: ../cli/src/devices.c:1459
-#, c-format
-msgid "Success: Device '%s' successfully disconnected."
+#: ../clients/cli/devices.c:1714 ../clients/cli/devices.c:1725
+#, fuzzy, c-format
+#| msgid "Success: Device '%s' successfully disconnected."
+msgid "Device '%s' successfully disconnected.\n"
 msgstr "Выполнено: устройство «%s» отключено."
 
-#: ../cli/src/devices.c:1471
+#: ../clients/cli/devices.c:1739
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s"
 
-#: ../cli/src/devices.c:1485
+#: ../clients/cli/devices.c:1754
 #, c-format
 msgid "Device '%s' has been disconnected.\n"
 msgstr "Устройство «%s» отключено.\n"
 
-#: ../cli/src/devices.c:1628
+#: ../clients/cli/devices.c:1845
+#, fuzzy, c-format
+#| msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgid "Error: Device '%s' (%s) deletion failed: %s"
+msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s"
+
+#: ../clients/cli/devices.c:1909
+#, fuzzy, c-format
+#| msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
+msgid "Error: Device '%s' is a hardware device. It can't be deleted."
+msgstr "Ошибка. Обязательное значение «%s» не может быть удалено.\n"
+
+#: ../clients/cli/devices.c:1980
 msgid "Wi-Fi scan list"
 msgstr "Список сканирования Wi-Fi"
 
-#: ../cli/src/devices.c:1666
+#: ../clients/cli/devices.c:2018
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Ошибка «device wifi»: «%s»"
 
-#: ../cli/src/devices.c:1719 ../cli/src/devices.c:1788
+#: ../clients/cli/devices.c:2060 ../clients/cli/devices.c:2135
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Ошибка: точка доступа с bssid «%s» не найдена."
 
-#: ../cli/src/devices.c:1743 ../cli/src/devices.c:2131
-#: ../cli/src/devices.c:2293
+#: ../clients/cli/devices.c:2084 ../clients/cli/devices.c:2401
+#: ../clients/cli/devices.c:2565
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Ошибка: «%s» не является устройством WiFi."
 
-#: ../cli/src/devices.c:1825 ../cli/src/devices.c:1872
-#, c-format
-msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "Соединение с UUID «%s» создано и задействовано на устройстве «%s»\n"
-
-#: ../cli/src/devices.c:1829
-#, c-format
-msgid "Error: Connection activation failed: (%d) %s."
-msgstr "Ошибка: сбой активации соединения: (%d) %s."
-
-#: ../cli/src/devices.c:1854
-#, c-format
-msgid "Error: Failed to add/activate new connection: (%d) %s"
-msgstr ""
-"Ошибка: не удалось добавить или активировать новое соединение: (%d) %s"
-
-#: ../cli/src/devices.c:1862
-#, c-format
-msgid "Error: Failed to add/activate new connection: Unknown error"
-msgstr ""
-"Ошибка: не удалось добавить или активировать новое соединение: неизвестная "
-"ошибка"
-
-#: ../cli/src/devices.c:2013
+#: ../clients/cli/devices.c:2294
 msgid "SSID or BSSID: "
 msgstr "SSID или BSSID: "
 
-#: ../cli/src/devices.c:2018
+#: ../clients/cli/devices.c:2299
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Ошибка: не указан SSID или BSSID."
 
-#: ../cli/src/devices.c:2042
+#: ../clients/cli/devices.c:2323
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Ошибка: недопустимое значение аргумента bssid «%s»."
 
-#: ../cli/src/devices.c:2066
+#: ../clients/cli/devices.c:2347
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3360,141 +4177,153 @@ msgstr ""
 "Ошибка: недопустимое значение аргумента wep-key-type «%s»; используйте «key» "
 "или «phrase»."
 
-#: ../cli/src/devices.c:2086
+#: ../clients/cli/devices.c:2367
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Ошибка: %s: %s."
 
-#: ../cli/src/devices.c:2101
+#: ../clients/cli/devices.c:2382
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Ошибка: BSSID для подключения к (%s) отличается от bssid аргумента (%s)."
 
-#: ../cli/src/devices.c:2107
+#: ../clients/cli/devices.c:2388
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Ошибка: параметр «%s» не является SSID или BSSID."
 
-#: ../cli/src/devices.c:2133 ../cli/src/devices.c:2295
+#: ../clients/cli/devices.c:2403 ../clients/cli/devices.c:2567
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Ошибка: устройства Wi-Fi не найдены."
 
-#: ../cli/src/devices.c:2151
+#: ../clients/cli/devices.c:2421
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Ошибка: не найдена сеть с SSID «%s»."
 
-#: ../cli/src/devices.c:2153
+#: ../clients/cli/devices.c:2423
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Ошибка: точка доступа с BSSID «%s» не найдена."
 
-#: ../cli/src/devices.c:2192
+#: ../clients/cli/devices.c:2462
 msgid "Password: "
 msgstr "Пароль:"
 
-#: ../cli/src/devices.c:2321
+#: ../clients/cli/devices.c:2594
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Ошибка. Неверная команда «device wifi»: «%s»."
 
-#: ../cli/src/devices.c:2368
+#: ../clients/cli/devices.c:2641
 msgid "WiMAX NSP list"
 msgstr "Список WiMAX NSP"
 
-#: ../cli/src/devices.c:2405
+#: ../clients/cli/devices.c:2678
 #, c-format
 msgid "Error: 'device wimax': %s"
 msgstr "Ошибка: «device wimax»: %s"
 
-#: ../cli/src/devices.c:2459
+#: ../clients/cli/devices.c:2721
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Ошибка: NSP с именем «%s» не найден."
 
-#: ../cli/src/devices.c:2472
+#: ../clients/cli/devices.c:2734
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Ошибка: «%s» не является устройством WIMAX."
 
-#: ../cli/src/devices.c:2510
+#: ../clients/cli/devices.c:2778
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Ошибка: точка доступа с nsp «%s» не найдена."
 
-#: ../cli/src/devices.c:2542
+#: ../clients/cli/devices.c:2815
 #, c-format
 msgid "Error: 'device wimax' command '%s' is not valid."
 msgstr "Ошибка. Неверная команда «device wimax»: «%s»."
 
-#: ../cli/src/devices.c:2621
+#: ../clients/cli/devices.c:2988
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Ошибка. Неверная команда «dev»: «%s»."
 
-#: ../cli/src/network-manager.c:37
+#: ../clients/cli/general.c:35
 msgid "RUNNING"
 msgstr "ВЫПОЛНЯЕТСЯ"
 
-#: ../cli/src/network-manager.c:38
+#. 0
+#: ../clients/cli/general.c:36
 msgid "VERSION"
 msgstr "ВЕРСИЯ"
 
-#: ../cli/src/network-manager.c:40
+#. 2
+#: ../clients/cli/general.c:38
 msgid "STARTUP"
 msgstr "ЗАПУСК"
 
-#: ../cli/src/network-manager.c:41
+#. 3
+#: ../clients/cli/general.c:39
 msgid "CONNECTIVITY"
 msgstr "СВЯЗЬ"
 
-#: ../cli/src/network-manager.c:42
+#. 4
+#: ../clients/cli/general.c:40
 msgid "NETWORKING"
 msgstr "СЕТЬ"
 
-#: ../cli/src/network-manager.c:43
+#. 5
+#: ../clients/cli/general.c:41
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
-#: ../cli/src/network-manager.c:44
+#. 6
+#: ../clients/cli/general.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#: ../cli/src/network-manager.c:45
+#. 7
+#: ../clients/cli/general.c:43
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
-#: ../cli/src/network-manager.c:46
+#. 8
+#: ../clients/cli/general.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:47
+#. 9
+#: ../clients/cli/general.c:45
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
-#: ../cli/src/network-manager.c:48
+#. 10
+#: ../clients/cli/general.c:46
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../cli/src/network-manager.c:70
+#: ../clients/cli/general.c:68
 msgid "PERMISSION"
 msgstr "РАЗРЕШЕНИЕ"
 
-#: ../cli/src/network-manager.c:71
+#. 0
+#: ../clients/cli/general.c:69
 msgid "VALUE"
 msgstr "ЗНАЧЕНИЕ"
 
-#: ../cli/src/network-manager.c:79
+#: ../clients/cli/general.c:77
 msgid "LEVEL"
 msgstr "УРОВЕНЬ"
 
-#: ../cli/src/network-manager.c:80
+#. 0
+#: ../clients/cli/general.c:78
 msgid "DOMAINS"
 msgstr "ДОМЕНЫ"
 
-#: ../cli/src/network-manager.c:95
+#: ../clients/cli/general.c:92
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3523,7 +4352,7 @@ msgstr ""
 "  logging [level <уровень>] [domains <домены>]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:107
+#: ../clients/cli/general.c:103
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3536,11 +4365,11 @@ msgstr ""
 "Формат: nmcli general status { help }\n"
 "\n"
 "Возвращает статус NetworkManager.\n"
-"«status» используется по умолчанию, то есть  «nmcli gen» эквивалентно «nmcli "
+"«status» используется по умолчанию, то есть «nmcli gen» эквивалентно «nmcli "
 "gen status».\n"
 "\n"
 
-#: ../cli/src/network-manager.c:117
+#: ../clients/cli/general.c:112
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3549,8 +4378,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
 "\n"
 msgstr ""
 "Формат: nmcli general hostname { АРГУМЕНТЫ | help }\n"
@@ -3562,7 +4391,7 @@ msgstr ""
 "В противном случае имя узла будет изменено. \n"
 "\n"
 
-#: ../cli/src/network-manager.c:130
+#: ../clients/cli/general.c:124
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3575,7 +4404,7 @@ msgstr ""
 "Возвращает разрешения для закрытых операций.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:139
+#: ../clients/cli/general.c:132
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3599,7 +4428,7 @@ msgstr ""
 "Полный список доменов можно найти на справочной странице команды.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:153
+#: ../clients/cli/general.c:145
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3624,29 +4453,33 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:164
+#: ../clients/cli/general.c:155
 #, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr "Формат: nmcli networking on { help }\n"
+msgstr ""
+"Формат: nmcli networking on { help }\n"
 "\n"
 "Включает сетевые функции.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:173
+#: ../clients/cli/general.c:163
 #, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr "Формат: nmcli networking off { help }\n"
+msgstr ""
+"Формат: nmcli networking off { help }\n"
 "\n"
 "Отключает сетевые функции.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:182
+#: ../clients/cli/general.c:171
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3654,8 +4487,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
 "\n"
 msgstr ""
 "Формат: nmcli networking connectivity { АРГУМЕНТЫ | help }\n"
@@ -3666,7 +4499,7 @@ msgstr ""
 "Дополнительный аргумент «check» повторно проверяет подключение.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:195
+#: ../clients/cli/general.c:183
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3691,7 +4524,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:210
+#: ../clients/cli/general.c:197
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3708,7 +4541,7 @@ msgstr ""
 "Просмотр и изменение статуса всех переключателей.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:221
+#: ../clients/cli/general.c:207
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3725,7 +4558,7 @@ msgstr ""
 "Просмотр и изменение статуса переключателя Wi-Fi.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:232
+#: ../clients/cli/general.c:217
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3742,7 +4575,7 @@ msgstr ""
 "Просмотр и изменение статуса переключателя мобильного соединения.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:244
+#: ../clients/cli/general.c:228
 #, c-format
 msgid ""
 "Usage: nmcli radio wimax { ARGUMENTS | help }\n"
@@ -3759,171 +4592,191 @@ msgstr ""
 "Просмотр и изменение статуса переключателя WiMAX.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:264
+#: ../clients/cli/general.c:248
 msgid "asleep"
 msgstr "спящий"
 
-#: ../cli/src/network-manager.c:266
+#: ../clients/cli/general.c:250
 msgid "connecting"
 msgstr "подключение"
 
-#: ../cli/src/network-manager.c:268
+#: ../clients/cli/general.c:252
 msgid "connected (local only)"
 msgstr "подключен (локально)"
 
-#: ../cli/src/network-manager.c:270
+#: ../clients/cli/general.c:254
 msgid "connected (site only)"
 msgstr "подключен (на узле)"
 
-#: ../cli/src/network-manager.c:274
+#: ../clients/cli/general.c:258
 msgid "disconnecting"
 msgstr "отключение"
 
-#: ../cli/src/network-manager.c:290
+#: ../clients/cli/general.c:294
 msgid "portal"
 msgstr "портал"
 
-#: ../cli/src/network-manager.c:292
+#: ../clients/cli/general.c:296
 msgid "limited"
 msgstr "ограничено"
 
-#: ../cli/src/network-manager.c:294
+#: ../clients/cli/general.c:298
 msgid "full"
 msgstr "полностью"
 
-#: ../cli/src/network-manager.c:332
+#: ../clients/cli/general.c:352
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Ошибка. Допустимые поля: %s"
 
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
-msgid "enabled"
-msgstr "включен"
-
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
-msgid "disabled"
-msgstr "отключен"
-
-#: ../cli/src/network-manager.c:367
+#: ../clients/cli/general.c:382
 msgid "NetworkManager status"
 msgstr "Состояние NetworkManager"
 
-#: ../cli/src/network-manager.c:372
+#: ../clients/cli/general.c:387
 msgid "running"
 msgstr "выполняется"
 
-#: ../cli/src/network-manager.c:372
-msgid "not running"
-msgstr "не выполняется"
-
-#: ../cli/src/network-manager.c:375
+#: ../clients/cli/general.c:390
 msgid "starting"
 msgstr "запускается"
 
-#: ../cli/src/network-manager.c:375
+#: ../clients/cli/general.c:390
 msgid "started"
 msgstr "запущено"
 
-#: ../cli/src/network-manager.c:446
+#: ../clients/cli/general.c:392 ../clients/cli/general.c:393
+#: ../clients/cli/general.c:394 ../clients/cli/general.c:395
+#: ../clients/cli/general.c:396 ../clients/cli/general.c:398
+#: ../clients/cli/general.c:399
+msgid "enabled"
+msgstr "включен"
+
+#: ../clients/cli/general.c:392 ../clients/cli/general.c:393
+#: ../clients/cli/general.c:394 ../clients/cli/general.c:395
+#: ../clients/cli/general.c:396 ../clients/cli/general.c:398
+#: ../clients/cli/general.c:399
+msgid "disabled"
+msgstr "отключен"
+
+#: ../clients/cli/general.c:476
 msgid "auth"
 msgstr "подлинный"
 
-#: ../cli/src/network-manager.c:475
+#: ../clients/cli/general.c:505
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Ошибка общих разрешений: %s"
 
-#: ../cli/src/network-manager.c:489
+#: ../clients/cli/general.c:519
 msgid "NetworkManager permissions"
 msgstr "Разрешения NetworkManager"
 
-#: ../cli/src/network-manager.c:530
+#: ../clients/cli/general.c:560
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Ошибка «general logging»: %s"
 
-#: ../cli/src/network-manager.c:545
+#: ../clients/cli/general.c:575
 msgid "NetworkManager logging"
 msgstr "Ведение журналов NetworkManager"
 
-#: ../cli/src/network-manager.c:565
-#, c-format
-msgid "Error: failed to set hostname: (%d) %s"
+#: ../clients/cli/general.c:597
+#, fuzzy, c-format
+#| msgid "Error: failed to set hostname: (%d) %s"
+msgid "Error: failed to set hostname: %s"
 msgstr "Ошибка. Не удалось установить имя узла: (%d) %s"
 
-#: ../cli/src/network-manager.c:682
-#, c-format
-msgid "Error: access denied to set logging; %s"
+#: ../clients/cli/general.c:710
+#, fuzzy, c-format
+#| msgid "Error: access denied to set logging; %s"
+msgid "Error: failed to set logging: %s"
 msgstr "Ошибка. Отказ доступа при настройке журналирования, %s"
 
-#: ../cli/src/network-manager.c:684
-#, c-format
-msgid "Error: %s"
-msgstr "Ошибка: %s"
-
-#: ../cli/src/network-manager.c:692
+#: ../clients/cli/general.c:719
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «general»: «%s»."
 
-#: ../cli/src/network-manager.c:710
+#: ../clients/cli/general.c:737
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "Недопустимое поле «--fields»: «%s». Допускается: %s"
 
-#: ../cli/src/network-manager.c:735
+#: ../clients/cli/general.c:762
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr ""
-"Недопустимый аргумент «%s»:  «%s». Может принимать значения on или off."
+msgstr "Недопустимый аргумент «%s»: «%s». Может принимать значения on или off."
 
-#: ../cli/src/network-manager.c:746
+#: ../clients/cli/general.c:773
 msgid "Connectivity"
 msgstr "Соединение"
 
-#: ../cli/src/network-manager.c:758
+#: ../clients/cli/general.c:788
 msgid "Networking"
 msgstr "Сеть"
 
-#: ../cli/src/network-manager.c:783
+#: ../clients/cli/general.c:813
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «networking connectivity»: «%s»."
 
-#: ../cli/src/network-manager.c:799
+#: ../clients/cli/general.c:829
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «networking»: «%s»."
 
-#: ../cli/src/network-manager.c:825 ../cli/src/network-manager.c:845
+#: ../clients/cli/general.c:858 ../clients/cli/general.c:878
 msgid "Radio switches"
 msgstr "Переключатели"
 
-#: ../cli/src/network-manager.c:863
+#. no argument, show current WiFi state
+#: ../clients/cli/general.c:896
 msgid "Wi-Fi radio switch"
 msgstr "Переключатель Wi-Fi"
 
-#: ../cli/src/network-manager.c:879
+#. no argument, show current WWAN (mobile broadband) state
+#: ../clients/cli/general.c:912
 msgid "WWAN radio switch"
 msgstr "Переключатель WWAN"
 
-#: ../cli/src/network-manager.c:896
+#. no argument, show current WiMAX state
+#: ../clients/cli/general.c:929
 msgid "WiMAX radio switch"
 msgstr "Переключатель WiMAX"
 
-#: ../cli/src/network-manager.c:908
+#: ../clients/cli/general.c:941
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Ошибка. Недопустимая команда «radio»: «%s»."
 
-#: ../cli/src/nmcli.c:78
-#, c-format
+#: ../clients/cli/nmcli.c:86
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+#| "\n"
+#| "OPTIONS\n"
+#| "  -t[erse]                                   terse output\n"
+#| "  -p[retty]                                  pretty output\n"
+#| "  -m[ode] tabular|multiline                  output mode\n"
+#| "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
+#| "  -e[scape] yes|no                           escape columns separators in "
+#| "values\n"
+#| "  -n[ocheck]                                 don't check nmcli and "
+#| "NetworkManager versions\n"
+#| "  -a[sk]                                     ask for missing parameters\n"
+#| "  -w[ait] <seconds>                          set timeout waiting for "
+#| "finishing operations\n"
+#| "  -v[ersion]                                 show program version\n"
+#| "  -h[elp]                                    print this help\n"
+#| "\n"
+#| "OBJECT\n"
+#| "  g[eneral]       NetworkManager's general status and operations\n"
+#| "  n[etworking]    overall networking control\n"
+#| "  r[adio]         NetworkManager radio switches\n"
+#| "  c[onnection]    NetworkManager's connections\n"
+#| "  d[evice]        devices managed by NetworkManager\n"
+#| "\n"
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -3931,6 +4784,8 @@ msgid ""
 "  -t[erse]                                   terse output\n"
 "  -p[retty]                                  pretty output\n"
 "  -m[ode] tabular|multiline                  output mode\n"
+"  -c[olors] auto|yes|no                      whether to use colors in "
+"output\n"
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
@@ -3948,6 +4803,7 @@ msgid ""
 "  r[adio]         NetworkManager radio switches\n"
 "  c[onnection]    NetworkManager's connections\n"
 "  d[evice]        devices managed by NetworkManager\n"
+"  a[gent]         NetworkManager secret agent or polkit agent\n"
 "\n"
 msgstr ""
 "Формат: %s [ПАРАМЕТРЫ] ОБЪЕКТ { КОМАНДА | help }\n"
@@ -3976,372 +4832,483 @@ msgstr ""
 "  d[evice]        устройства под управлением NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:132
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Неизвестный объект «%s». Попробуйте выполнить «nmcli help»."
 
-#: ../cli/src/nmcli.c:162
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Ошибка. Параметр «--terse» указан дважды."
 
-#: ../cli/src/nmcli.c:167
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Ошибка: параметры «--terse» и «--pretty» взаимоисключаемы."
 
-#: ../cli/src/nmcli.c:175
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Ошибка: параметр «--pretty» указан дважды."
 
-#: ../cli/src/nmcli.c:180
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Ошибка: параметры «--pretty» и «--terse» взаимоисключаемы."
 
-#: ../cli/src/nmcli.c:190 ../cli/src/nmcli.c:206 ../cli/src/nmcli.c:235
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:264
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Ошибка: отсутствует аргумент параметра «%s»."
 
-#: ../cli/src/nmcli.c:199 ../cli/src/nmcli.c:215
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Ошибка: недопустимый аргумент «%s» для параметра «%s»."
 
-#: ../cli/src/nmcli.c:222
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Ошибка: отсутствуют поля для параметров «%s»."
 
-#: ../cli/src/nmcli.c:240
+#: ../clients/cli/nmcli.c:269
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Ошибка. Недопустимое время ожидания («%s») для параметра «%s»."
 
-#: ../cli/src/nmcli.c:247
+#: ../clients/cli/nmcli.c:276
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "утилита nmcli, версия %s\n"
 
-#: ../cli/src/nmcli.c:253
+#: ../clients/cli/nmcli.c:282
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr ""
-"Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»."
+msgstr "Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»."
 
-#: ../cli/src/nmcli.c:288
-#, c-format
-msgid "\n"
-"Error: nmcli terminated by signal %d."
-msgstr "\n"
+#: ../clients/cli/nmcli.c:365 ../clients/cli/nmcli.c:375
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Error: nmcli terminated by signal %d."
+msgid ""
+"\n"
+"Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
+"\n"
 "Ошибка. Работа nmcli прервана по сигналу %d."
 
-#: ../cli/src/nmcli.c:318 ../src/main.c:130
-#, c-format
-msgid "Failed to set signal mask: %d"
+#: ../clients/cli/nmcli.c:406
+#, fuzzy, c-format
+#| msgid "Failed to set signal mask: %d"
+msgid "Failed to set signal mask: %d\n"
 msgstr "Ошибка установки маски сигнала: %d"
 
-#: ../cli/src/nmcli.c:325 ../src/main.c:139
-#, c-format
-msgid "Failed to create signal handling thread: %d"
+#: ../clients/cli/nmcli.c:413
+#, fuzzy, c-format
+#| msgid "Failed to create signal handling thread: %d"
+msgid "Failed to create signal handling thread: %d\n"
 msgstr "Ошибка создания потока обработки сигнала: %d"
 
-#: ../cli/src/nmcli.c:338 ../test/nm-online.c:149
-#, c-format
-msgid "Error: Could not create NMClient object."
+#: ../clients/cli/nmcli.c:510 ../clients/nm-online.c:197
+#, fuzzy, c-format
+#| msgid "Error: Could not create NMClient object."
+msgid "Error: Could not create NMClient object: %s."
 msgstr "Ошибка: невозможно создать объект NMClient."
 
-#: ../cli/src/nmcli.c:354
+#: ../clients/cli/nmcli.c:527
 msgid "Success"
 msgstr "Успешно"
 
-#: ../cli/src/settings.c:666
-#, c-format
-msgid "%d (hex-ascii-key)"
+#: ../clients/cli/polkit-agent.c:82
+#, fuzzy, c-format
+#| msgid "Authentication"
+msgid "Authentication message: %s\n"
+msgstr "Аутентификация"
+
+#: ../clients/cli/polkit-agent.c:88
+#, fuzzy, c-format
+#| msgid "Authentication"
+msgid "Authentication error: %s\n"
+msgstr "Аутентификация"
+
+#: ../clients/cli/polkit-agent.c:134
+#, fuzzy, c-format
+#| msgid "Modem initialization failed"
+msgid "Warning: polkit agent initialization failed: %s\n"
+msgstr "Не удалось инициализировать модем"
+
+#: ../clients/cli/settings.c:674
+#, fuzzy, c-format
+#| msgid "%d (hex-ascii-key)"
+msgid "%d (key)"
 msgstr "%d (16-теричный ASCII-ключ)"
 
-#: ../cli/src/settings.c:668
-#, c-format
-msgid "%d (104/128-bit passphrase)"
+#: ../clients/cli/settings.c:676
+#, fuzzy, c-format
+#| msgid "%d (104/128-bit passphrase)"
+msgid "%d (passphrase)"
 msgstr "%d (104/128-битная парольная фраза)"
 
-#: ../cli/src/settings.c:671 ../cli/src/settings.c:799
+#: ../clients/cli/settings.c:679 ../clients/cli/settings.c:760
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (неизвестно)"
 
-#: ../cli/src/settings.c:697
-msgid "0 (unknown)"
-msgstr "0 (неизвестно)"
-
-#: ../cli/src/settings.c:703
-msgid "any, "
-msgstr "любой, "
-
-#: ../cli/src/settings.c:705
-msgid "900 MHz, "
-msgstr "900 МГц, "
-
-#: ../cli/src/settings.c:707
-msgid "1800 MHz, "
-msgstr "1800 МГц, "
-
-#: ../cli/src/settings.c:709
-msgid "1900 MHz, "
-msgstr "1900 МГц, "
-
-#: ../cli/src/settings.c:711
-msgid "850 MHz, "
-msgstr "850 МГц, "
-
-#: ../cli/src/settings.c:713
-msgid "WCDMA 3GPP UMTS 2100 MHz, "
-msgstr "WCDMA 3GPP UMTS 2100 МГц, "
-
-#: ../cli/src/settings.c:715
-msgid "WCDMA 3GPP UMTS 1800 MHz, "
-msgstr "WCDMA 3GPP UMTS 1800 МГц, "
-
-#: ../cli/src/settings.c:717
-msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700/2100 МГц, "
-
-#: ../cli/src/settings.c:719
-msgid "WCDMA 3GPP UMTS 800 MHz, "
-msgstr "WCDMA 3GPP UMTS 800 МГц, "
-
-#: ../cli/src/settings.c:721
-msgid "WCDMA 3GPP UMTS 850 MHz, "
-msgstr "WCDMA 3GPP UMTS 850 МГц, "
-
-#: ../cli/src/settings.c:723
-msgid "WCDMA 3GPP UMTS 900 MHz, "
-msgstr "WCDMA 3GPP UMTS 900 МГц, "
-
-#: ../cli/src/settings.c:725
-msgid "WCDMA 3GPP UMTS 1700 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700 МГц, "
-
-#: ../cli/src/settings.c:727
-msgid "WCDMA 3GPP UMTS 1900 MHz, "
-msgstr "WCDMA 3GPP UMTS 1900 МГц, "
-
-#: ../cli/src/settings.c:729
-msgid "WCDMA 3GPP UMTS 2600 MHz, "
-msgstr "WCDMA 3GPP UMTS 2600 МГц, "
-
-#: ../cli/src/settings.c:747
+#: ../clients/cli/settings.c:708
 msgid "0 (NONE)"
 msgstr "0 (НЕТ)"
 
-#: ../cli/src/settings.c:753
+#: ../clients/cli/settings.c:714
 msgid "REORDER_HEADERS, "
 msgstr "УПОРЯДОЧИТЬ_ЗАГОЛОВКИ,"
 
-#: ../cli/src/settings.c:755
+#: ../clients/cli/settings.c:716
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:757
+#: ../clients/cli/settings.c:718
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../cli/src/settings.c:793
+#: ../clients/cli/settings.c:754
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (отключено)"
 
-#: ../cli/src/settings.c:795
+#: ../clients/cli/settings.c:756
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (включено, предпочитая открытый IP)"
 
-#: ../cli/src/settings.c:797
+#: ../clients/cli/settings.c:758
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (включено, предпочитая временный IP)"
 
-#: ../cli/src/settings.c:809
+#: ../clients/cli/settings.c:770
 msgid "0 (none)"
 msgstr "0 (нет)"
 
-#: ../cli/src/settings.c:815
+#: ../clients/cli/settings.c:776
 msgid "agent-owned, "
 msgstr "под управлением агента,"
 
-#: ../cli/src/settings.c:817
+#: ../clients/cli/settings.c:778
 msgid "not saved, "
 msgstr "не сохранено,"
 
-#: ../cli/src/settings.c:819
+#: ../clients/cli/settings.c:780
 msgid "not required, "
 msgstr "не требуется,"
 
-#: ../cli/src/settings.c:1124
+#: ../clients/cli/settings.c:1064
 msgid "0 (disabled)"
 msgstr "0 (отключено)"
 
-#: ../cli/src/settings.c:1130
+#: ../clients/cli/settings.c:1070
 msgid "enabled, "
 msgstr "включено,"
 
-#: ../cli/src/settings.c:1132
+#: ../clients/cli/settings.c:1072
 msgid "advertise, "
 msgstr "объявление,"
 
-#: ../cli/src/settings.c:1134
+#: ../clients/cli/settings.c:1074
 msgid "willing, "
 msgstr "разрешение,"
 
-#: ../cli/src/settings.c:1162
+#: ../clients/cli/settings.c:1102
 msgid "-1 (unset)"
 msgstr "-1 (не задано)"
 
-#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1453
-#: ../cli/src/settings.c:1493
+#: ../clients/cli/settings.c:1199 ../clients/cli/settings.c:1486
+#: ../clients/cli/settings.c:1528
 msgid "auto"
 msgstr "автоматически"
 
-#: ../cli/src/settings.c:1283
+#: ../clients/cli/settings.c:1212
 msgid "default"
 msgstr "по умолчанию"
 
-#: ../cli/src/settings.c:1614
+#: ../clients/cli/settings.c:1544
+#, c-format
+msgid "yes (%u)"
+msgstr ""
+
+#: ../clients/cli/settings.c:1670
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "Присвоить  «%s» значение  «%s»? [да]:"
+msgstr "Присвоить «%s» значение «%s»? [да]:"
 
-#: ../cli/src/settings.c:1616
+#: ../clients/cli/settings.c:1672
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "Очистить  «%s»? [да]:"
+msgstr "Очистить «%s»? [да]:"
+
+#: ../clients/cli/settings.c:1833
+#, c-format
+msgid ""
+"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:1852
+#, c-format
+msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
+msgstr ""
 
-#: ../cli/src/settings.c:1814 ../cli/src/settings.c:2069
-#: ../cli/src/settings.c:3673
+#: ../clients/cli/settings.c:1854
+#, fuzzy
+#| msgid "Do you want to provide them? (yes/no) [yes] "
+msgid "Do you want to remove them? [yes] "
+msgstr "Хотите их определить? (Да или нет)"
+
+#: ../clients/cli/settings.c:1950 ../clients/cli/settings.c:2272
+#: ../clients/cli/settings.c:4405
 #, c-format
 msgid "'%s' is not valid"
-msgstr "Недопустимое значение  «%s»"
+msgstr "Недопустимое значение «%s»"
 
-#: ../cli/src/settings.c:1837
+#: ../clients/cli/settings.c:1973
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
+msgstr "«%d» выходит за пределы диапазона <%d-%d>"
+
+#: ../clients/cli/settings.c:1995
+#, fuzzy, c-format
+#| msgid "'%d' is not valid; use <%d-%d>"
+msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "«%d» выходит за пределы диапазона  <%d-%d>"
 
-#: ../cli/src/settings.c:1859
-#, c-format
-msgid "'%u' is not valid; use <%d-%d>"
+#: ../clients/cli/settings.c:2017
+#, fuzzy, c-format
+#| msgid "'%u' is not valid; use <%d-%d>"
+msgid "'%u' is not valid; use <%u-%u>"
 msgstr "«%u» выходит за пределы  <%d-%d>"
 
-#: ../cli/src/settings.c:1925
+#: ../clients/cli/settings.c:2083
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
-msgstr ""
-"Недопустимое значение  «%s». Используйте формат: <параметр>=<значение>"
+msgstr "Недопустимое значение «%s». Используйте формат: <параметр>=<значение>"
 
-#: ../cli/src/settings.c:1959
+#: ../clients/cli/settings.c:2117
 #, c-format
 msgid "index '%s' is not valid"
-msgstr "Недопустимый индекс  «%s»."
+msgstr "Недопустимый индекс «%s»."
 
-#: ../cli/src/settings.c:1964
+#: ../clients/cli/settings.c:2122 ../clients/cli/settings.c:2147
 msgid "no item to remove"
 msgstr "нечего удалять"
 
-#: ../cli/src/settings.c:1968
+#: ../clients/cli/settings.c:2126 ../clients/cli/settings.c:2151
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
-msgstr "Индекс  «%d» выходит за пределы диапазона  <0-%d>"
+msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>"
 
-#: ../cli/src/settings.c:1983
+#: ../clients/cli/settings.c:2166
 #, c-format
 msgid "invalid option '%s'"
-msgstr "Недопустимый параметр  «%s»"
+msgstr "Недопустимый параметр «%s»"
 
-#: ../cli/src/settings.c:1985
+#: ../clients/cli/settings.c:2168
 msgid "missing option"
 msgstr "пропущен параметр"
 
-#: ../cli/src/settings.c:2015 ../cli/src/settings.c:2035
+#: ../clients/cli/settings.c:2198 ../clients/cli/settings.c:2218
+#: ../clients/cli/settings.c:2238
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
-msgstr "Число выходит за пределы диапазона или определено неверно:  «%s»"
+msgstr "Число выходит за пределы диапазона или определено неверно: «%s»"
 
-#: ../cli/src/settings.c:2089
+#: ../clients/cli/settings.c:2288
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
-msgstr "Недействительный MAC Ethernet:  «%s»"
+msgstr "Недействительный MAC Ethernet: «%s»"
 
-#: ../cli/src/settings.c:2115 ../libnm-util/nm-setting-bridge.c:277
-#: ../libnm-util/nm-setting-connection.c:752
-#: ../libnm-util/nm-setting-vlan.c:475
+#: ../clients/cli/settings.c:2313 ../libnm-core/nm-setting-connection.c:795
+#: ../libnm-core/nm-setting-infiniband.c:256
+#: ../libnm-util/nm-setting-connection.c:835
+#: ../libnm-util/nm-setting-infiniband.c:270
 #, c-format
 msgid "'%s' is not a valid interface name"
-msgstr "Недействительное имя интерфейса:  «%s»"
+msgstr "Недействительное имя интерфейса: «%s»"
+
+#: ../clients/cli/settings.c:2337
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid channel; use <1-13>"
+msgid "'%s' is not a valid flag number; use <0-%d>"
+msgstr "Недопустимое значение  «%s». Используйте значения от 1 до 13."
 
-#: ../cli/src/settings.c:2133 ../cli/src/settings.c:3212
-#: ../libnm-util/nm-setting-gsm.c:375
+#: ../clients/cli/settings.c:2349
 #, c-format
-msgid "'%s' is not a number"
-msgstr " «%s» не является числом"
+msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
+msgstr ""
 
-#: ../cli/src/settings.c:2185
+#: ../clients/cli/settings.c:2390
 #, c-format
 msgid "'%s' is not a valid hex character"
-msgstr "Неверное шестнадцатеричное значение:  «%s»"
+msgstr "Неверное шестнадцатеричное значение: «%s»"
 
-#: ../cli/src/settings.c:2215
+#: ../clients/cli/settings.c:2420
 #, c-format
 msgid "'%s' is not a valid MAC"
-msgstr "Недействительный MAC-адрес:  «%s»"
+msgstr "Недействительный MAC-адрес: «%s»"
 
-#: ../cli/src/settings.c:2252 ../libnm-util/nm-setting-connection.c:715
+#: ../clients/cli/settings.c:2457 ../libnm-core/nm-setting-connection.c:784
+#: ../libnm-util/nm-setting-connection.c:792
 #, c-format
 msgid "'%s' is not a valid UUID"
-msgstr "Недействительный UUID:  «%s»"
+msgstr "Недействительный UUID: «%s»"
+
+#: ../clients/cli/settings.c:2524
+#, c-format
+msgid "the property doesn't contain permission '%s'"
+msgstr ""
 
-#: ../cli/src/settings.c:2317
+#: ../clients/cli/settings.c:2536
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: alice bob charlie\n"
 msgstr ""
 "Введите список разрешений в виде:\n"
-"  [user:]<пользователь 1>, [user:]<пользователь 2>,...\n"
+" [user:]<пользователь 1>, [user:]<пользователь 2>,...\n"
 "Записи могут разделяться пробелом или запятой.\n"
 "\n"
 "Пример: alice bob charlie\n"
 
-#: ../cli/src/settings.c:2332
+#: ../clients/cli/settings.c:2555
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "Недействительный мастер: «%s». Используйте имя интерфейса или UUID "
 "соединения."
 
-#: ../cli/src/settings.c:2453
+#: ../clients/cli/settings.c:2599
+#, c-format
+msgid "Warning: %s is not an UUID of any existing connection profile\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2603 ../clients/cli/settings.c:2619
+#, fuzzy, c-format
+#| msgid "Error: '%s' is not a valid connection type."
+msgid "'%s' is not a VPN connection profile"
+msgstr "Ошибка. Недопустимый тип соединения: «%s»"
+
+#: ../clients/cli/settings.c:2612
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid team configuration or file name."
+msgid "'%s' is not a name of any exiting profile"
+msgstr "Недопустимое имя файла или неверная конфигурация группы: «%s»"
+
+#: ../clients/cli/settings.c:2646
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid UUID"
+msgid "the value '%s' is not a valid UUID"
+msgstr "Недействительный UUID:  «%s»"
+
+#: ../clients/cli/settings.c:2653
+#, c-format
+msgid "the property doesn't contain UUID '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:2665
+msgid ""
+"Enter secondary connections that should be activated when this connection "
+"is\n"
+"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+"transparently translates names to UUIDs. Note that NetworkManager only "
+"supports\n"
+"VPNs as secondary connections at the moment.\n"
+"The items can be separated by commas or spaces.\n"
+"\n"
+"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2742
 msgid "private key password not provided"
 msgstr "Не указан пароль частного ключа "
 
-#: ../cli/src/settings.c:2513
+#: ../clients/cli/settings.c:2769
+#, fuzzy, c-format
+#| msgid "the property can't be changed"
+msgid "the property doesn't contain EAP method '%s'"
+msgstr "свойство не может быть изменено"
+
+#: ../clients/cli/settings.c:2784
+msgid ""
+"Enter file path to CA certificate (optionally prefixed with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/cacert.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2803
+#, c-format
+msgid "the property doesn't contain alternative subject match '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:2819
+msgid ""
+"Enter file path to client certificate (optionally prefixed with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/jara.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2831
+msgid ""
+"Enter file path to CA certificate for inner authentication (optionally "
+"prefixed\n"
+"with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/ca-zweite-phase.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2851
+#, c-format
+msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:2867
+msgid ""
+"Enter file path to client certificate for inner authentication (optionally "
+"prefixed\n"
+"with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/jara-zweite-phase.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2887
+#, fuzzy
+#| msgid ""
+#| "Enter path to a private key and the key password (if not set yet):\n"
+#| "  <file path> [<password>]\n"
+#| "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
-"  <file path> [<password>]\n"
+"  [file://]<file path> [<password>]\n"
+"Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
 "Введите адрес закрытого ключа и пароль  (если еще не определен):\n"
 "  <путь> [<пароль>]\n"
 "Пример: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../cli/src/settings.c:2583
+#: ../clients/cli/settings.c:2958
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -4357,7 +5324,7 @@ msgstr ""
 "Примеры: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../cli/src/settings.c:2686
+#: ../clients/cli/settings.c:3061
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4374,7 +5341,7 @@ msgid ""
 "\n"
 "Example: mode=2,miimon=120\n"
 msgstr ""
-"Введите список параметров:\n"
+"Введите список параметров агрегации:\n"
 "  параметр = <значение>, параметр = <значение>,... \n"
 "Доступные параметры: %s\n"
 "«режим»  можно определить с помощью имени или кода:\n"
@@ -4388,38 +5355,68 @@ msgstr ""
 "\n"
 "Пример: mode=2,miimon=120\n"
 
-#: ../cli/src/settings.c:2727
+#: ../clients/cli/settings.c:3099
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
-msgstr "Недействительный MAC InfiniBand:  «%s»"
+msgstr "Недействительный MAC InfiniBand: «%s»"
 
-#: ../cli/src/settings.c:2765
+#: ../clients/cli/settings.c:3136
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "Недопустимое значение IBoIP P_Key: «%s»"
 
-#: ../cli/src/settings.c:2825
+#: ../clients/cli/settings.c:3167
+#, fuzzy, c-format
+#| msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])"
+msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
+msgstr ""
+"Недействительное значение  «%s». Допустимый формат:  ip[/префикс] next-hop "
+"[метрика]."
+
+#: ../clients/cli/settings.c:3215 ../clients/cli/settings.c:3234
+#, c-format
+msgid "invalid IPv4 address '%s'"
+msgstr "недопустимый адрес IPv4: «%s»"
+
+#: ../clients/cli/settings.c:3240 ../clients/cli/settings.c:3541
+#, c-format
+msgid "the property doesn't contain DNS server '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:3252
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr "Введите список адресов IPv4 серверов DNS.\n"
+msgstr ""
+"Введите список адресов IPv4 серверов DNS.\n"
 "\n"
 "Пример: 8.8.8.8, 8.8.4.4\n"
 
-#: ../cli/src/settings.c:2871 ../cli/src/settings.c:3123
+#: ../clients/cli/settings.c:3288 ../clients/cli/settings.c:3595
+#, c-format
+msgid "the property doesn't contain DNS search domain '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:3342 ../clients/cli/settings.c:3648
 #, c-format
-msgid "'%s' is not valid (use ip[/prefix] [gateway])"
+msgid "the property doesn't contain IP address '%s'"
 msgstr ""
-"Недействительное значение  «%s». Допустимый формат:  ip[/префикс] [шлюз]."
 
-#: ../cli/src/settings.c:2897
+#: ../clients/cli/settings.c:3355
+#, fuzzy
+#| msgid ""
+#| "Enter a list of IPv4 addresses formatted as:\n"
+#| "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+#| "Missing prefix is regarded as prefix of 32.\n"
+#| "\n"
+#| "Example: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 32.\n"
 "\n"
-"Example: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "Введите список адресов IPv4 в формате:\n"
 "  ip[/префикс] [шлюз], ip[/префикс] [шлюз],...\n"
@@ -4427,21 +5424,37 @@ msgstr ""
 "\n"
 "Пример: 92.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../cli/src/settings.c:2954
-#, c-format
-msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])"
-msgstr ""
-"Недействительное значение  «%s». Допустимый формат:  ip[/префикс] next-hop "
-"[метрика]."
+#: ../clients/cli/settings.c:3371 ../clients/cli/settings.c:3677
+#, fuzzy, c-format
+#| msgid "invalid gateway '%s'"
+msgid "invalid gateway address '%s'"
+msgstr "недопустимый шлюз «%s»"
+
+#: ../clients/cli/settings.c:3426 ../clients/cli/settings.c:3732
+#, fuzzy, c-format
+#| msgid "the property can't be changed"
+msgid "the property doesn't contain route '%s'"
+msgstr "свойство не может быть изменено"
 
-#: ../cli/src/settings.c:2980
+#: ../clients/cli/settings.c:3439
+#, fuzzy
+#| msgid ""
+#| "Enter a list of IPv4 routes formatted as:\n"
+#| "  ip/[prefix] next-hop [metric],...\n"
+#| "Missing prefix is regarded as a prefix of 32.\n"
+#| "Missing metric is regarded as a metric of 0.\n"
+#| "\n"
+#| "Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
-"  ip/[prefix] next-hop [metric],...\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
 "Missing prefix is regarded as a prefix of 32.\n"
-"Missing metric is regarded as a metric of 0.\n"
+"Missing next-hop is regarded as 0.0.0.0.\n"
+"Missing metric means default (NM/kernel will set a default value).\n"
 "\n"
-"Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"          10.1.2.0/24\n"
 msgstr ""
 "Введите список маршрутов IPv4 в формате:\n"
 "  ip/[префикс] след.переход [метрика],...\n"
@@ -4450,7 +5463,12 @@ msgstr ""
 "\n"
 "Пример: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 
-#: ../cli/src/settings.c:3071
+#: ../clients/cli/settings.c:3516 ../clients/cli/settings.c:3535
+#, c-format
+msgid "invalid IPv6 address '%s'"
+msgstr "недопустимый адрес IPv6: «%s»"
+
+#: ../clients/cli/settings.c:3553
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -4461,7 +5479,7 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
-"Введите список адресов IPv6 серверов DNS. Если IPv6 настроен в режиме  "
+"Введите список адресов IPv6 серверов DNS. Если IPv6 настроен в режиме "
 "«auto», серверы будут добавлены в список, полученный в результате "
 "автоматической конфигурации. Серверы DNS не могут использоваться в режимах "
 "«shared» и «link-local». В остальных режимах они рассматриваются как "
@@ -4469,38 +5487,50 @@ msgstr ""
 "\n"
 "Пример: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../cli/src/settings.c:3149
+#: ../clients/cli/settings.c:3661
+#, fuzzy
+#| msgid ""
+#| "Enter a list of IPv6 addresses formatted as:\n"
+#| "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+#| "Missing prefix is regarded as prefix of 128.\n"
+#| "\n"
+#| "Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
+#| "1050:0:0:0:5:600:300c:326b\n"
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 128.\n"
 "\n"
-"Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
-"326b\n"
+"Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 "Введите список адресов IPv6 в формате:\n"
 "  ip[/префикс] [шлюз], ip[/префикс] [шлюз],...\n"
 "По умолчанию исполльзуется префикс 128.\n"
 "\n"
-"Пример: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
-"326b\n"
-
-#: ../cli/src/settings.c:3171
-#, c-format
-msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
-msgstr ""
-"Недействительное значение  «%s». Допустимый формат:  <целевой_ip>/префикс "
-"<ip_перехода> [метрика]."
-
-#: ../cli/src/settings.c:3197
+"Пример: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
+"1050:0:0:0:5:600:300c:326b\n"
+
+#: ../clients/cli/settings.c:3745
+#, fuzzy
+#| msgid ""
+#| "Enter a list of IPv6 routes formatted as:\n"
+#| "  ip/[prefix] next-hop [metric],...\n"
+#| "Missing prefix is regarded as a prefix of 128.\n"
+#| "Missing metric is regarded as a metric of 0.\n"
+#| "\n"
+#| "Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+#| "db8:beef::3 2\n"
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
-"  ip/[prefix] next-hop [metric],...\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
 "Missing prefix is regarded as a prefix of 128.\n"
-"Missing metric is regarded as a metric of 0.\n"
+"Missing next-hop is regarded as \"::\".\n"
+"Missing metric means default (NM/kernel will set a default value).\n"
 "\n"
-"Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+"Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
+"          abbe::/64 55\n"
 msgstr ""
 "Введите список маршрутов IPv6 в формате:\n"
 "  ip/[префикс] след.переход [метрика],...\n"
@@ -4510,22 +5540,28 @@ msgstr ""
 "Пример: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
 "beef::3 2\n"
 
-#: ../cli/src/settings.c:3219
+#: ../clients/cli/settings.c:3762 ../libnm-core/nm-setting-gsm.c:317
+#: ../libnm-util/nm-setting-gsm.c:374
+#, c-format
+msgid "'%s' is not a number"
+msgstr " «%s» не является числом"
+
+#: ../clients/cli/settings.c:3769
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
-msgstr "Недопустимое значение  «%s». Используйте 0, 1 или 2."
+msgstr "Недопустимое значение «%s». Используйте 0, 1 или 2."
 
-#: ../cli/src/settings.c:3236
+#: ../clients/cli/settings.c:3786
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
-msgstr "Недопустимое значение  «%s». Используйте значения от 1 до 13."
+msgstr "Недопустимое значение «%s». Используйте значения от 1 до 13."
 
-#: ../cli/src/settings.c:3257
+#: ../clients/cli/settings.c:3823
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
-msgstr "Неверное значение «%s». Допустимые значения:  [e, o, n]."
+msgstr "Неверное значение «%s». Допустимые значения: [e, o, n]."
 
-#: ../cli/src/settings.c:3285
+#: ../clients/cli/settings.c:3851
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -4541,23 +5577,57 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../cli/src/settings.c:3325
+#: ../clients/cli/settings.c:3891
 msgid "no priority to remove"
 msgstr "нет приоритета для удаления"
 
-#: ../cli/src/settings.c:3329
+#: ../clients/cli/settings.c:3895
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
-msgstr "Индекс  «%d» выходит за пределы диапазона  <0-%d>"
+msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>"
+
+#: ../clients/cli/settings.c:3934
+#, c-format
+msgid ""
+"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:3941
+#, fuzzy, c-format
+#| msgid "the property can't be changed"
+msgid "the property doesn't contain mapping '%s'"
+msgstr "свойство не может быть изменено"
 
-#: ../cli/src/settings.c:3444
+#: ../clients/cli/settings.c:4050 ../clients/cli/settings.c:4213
+#: ../libnm-core/nm-setting-wired.c:604
+#: ../libnm-core/nm-setting-wireless.c:803
+#: ../libnm-core/nm-setting-wireless.c:815
+#: ../libnm-util/nm-setting-wired.c:647
+#: ../libnm-util/nm-setting-wireless.c:860
+#: ../libnm-util/nm-setting-wireless.c:874
 #, c-format
-msgid "'%s' is not valid; 3 strings should be provided"
+msgid "'%s' is not a valid MAC address"
+msgstr "Недействительный MAC-адрес: «%s»"
+
+#: ../clients/cli/settings.c:4056 ../clients/cli/settings.c:4219
+#, c-format
+msgid "the property doesn't contain MAC address '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:4075
+#, fuzzy, c-format
+#| msgid "'%s' is not valid; 3 strings should be provided"
+msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "Строка «%s» должна содержать три значения."
 
-#: ../cli/src/settings.c:3463
+#: ../clients/cli/settings.c:4089
+#, fuzzy
+#| msgid ""
+#| "Enter a list of three channels (comma or space separated).\n"
+#| "\n"
+#| "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgid ""
-"Enter a list of three channels (comma or space separated).\n"
+"Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
@@ -4565,7 +5635,7 @@ msgstr ""
 "\n"
 "Пример: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../cli/src/settings.c:3513
+#: ../clients/cli/settings.c:4139
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4576,28 +5646,60 @@ msgstr ""
 "  параметр = <значение>, параметр = <значение>,...\n"
 "Допустимые параметры: %s\n"
 
-#: ../cli/src/settings.c:3559
+#: ../clients/cli/settings.c:4185
 #, c-format
 msgid "'%s' is not a valid channel"
-msgstr "Недопустимый канал  «%s»."
+msgstr "Недопустимый канал «%s»."
 
-#: ../cli/src/settings.c:3565
+#: ../clients/cli/settings.c:4191
 #, c-format
 msgid "'%ld' is not a valid channel"
-msgstr "Недопустимый канал  «%ld»."
+msgstr "Недопустимый канал «%ld»."
+
+#: ../clients/cli/settings.c:4239
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid duplex value"
+msgid "'%s' is not a valid powersave value"
+msgstr "Недопустимое дуплексное значение:  «%s»"
+
+#: ../clients/cli/settings.c:4299 ../clients/cli/settings.c:4337
+#: ../clients/cli/settings.c:4375
+#, c-format
+msgid "the property doesn't contain protocol '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:4414
+#, c-format
+msgid ""
+"'%s' not compatible with %s '%s', please change the key or set the right %s "
+"first."
+msgstr ""
 
-#: ../cli/src/settings.c:3668 ../cli/src/settings.c:3671
+#: ../clients/cli/settings.c:4422
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Ключ WEP определен как «%s»\n"
 
-#: ../cli/src/settings.c:3695
+#: ../clients/cli/settings.c:4424
+#, fuzzy, c-format
+#| msgid "WEP key is guessed to be of '%s'\n"
+msgid "WEP key index set to '%d'\n"
+msgstr "Ключ WEP определен как «%s»\n"
+
+#: ../clients/cli/settings.c:4447
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
+msgstr "«%s» может быть равно [0 (неизвестно), 1 (ключ), 2 (парольная фраза)]"
+
+#: ../clients/cli/settings.c:4463 ../clients/cli/settings.c:4466
+#: ../clients/cli/settings.c:4469 ../clients/cli/settings.c:4472
+#, c-format
+msgid ""
+"Warning: '%s' is not compatible with '%s' type, please change or delete the "
+"key.\n"
 msgstr ""
-"«%s» может быть равно  [0 (неизвестно), 1 (ключ), 2 (парольная фраза)]"
 
-#: ../cli/src/settings.c:3715
+#: ../clients/cli/settings.c:4485
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -4606,127 +5708,144 @@ msgstr ""
 "Определите тип ключей WEP. Возможные значения: 0 (неизвестно), 1 (ключ), 2 "
 "(парольная фраза).\n"
 
-#: ../cli/src/settings.c:3728
+#: ../clients/cli/settings.c:4498
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "«%s» не является действительным PSK"
 
-#: ../cli/src/settings.c:3772
+#: ../clients/cli/settings.c:4542
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "«%s» не содержит допустимый флаг DCB"
 
-#: ../cli/src/settings.c:3795
+#: ../clients/cli/settings.c:4565
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "«%s» не содержит приоритет приложения DCB"
 
-#: ../cli/src/settings.c:3821
+#: ../clients/cli/settings.c:4591
 msgid "must contain 8 comma-separated numbers"
 msgstr "должен содержать 8 чисел, разделенных запятой"
 
-#: ../cli/src/settings.c:3838
+#: ../clients/cli/settings.c:4608
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "«%s» не является числом в диапазоне от 0 до %u включительно или %u"
 
-#: ../cli/src/settings.c:3841
+#: ../clients/cli/settings.c:4611
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "«%s» не является числом в диапазоне от 0 до %u включительно"
 
-#: ../cli/src/settings.c:3863
+#: ../clients/cli/settings.c:4633
 #, c-format
-msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid ""
+"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
-"Предупреждение. Изменения вступят в силу, только когда  «%s» будет равно 1 "
+"Предупреждение. Изменения вступят в силу, только когда «%s» будет равно 1 "
 "(включено)\n"
 "\n"
 
-#: ../cli/src/settings.c:3916
+#: ../clients/cli/settings.c:4686
 #, c-format
 msgid "bandwidth percentages must total 100%%"
-msgstr ""
-"сумма процентных частей пропускной способности должна быть равна 100%%"
+msgstr "сумма процентных частей пропускной способности должна быть равна 100%%"
 
-#: ../cli/src/settings.c:5594
+#: ../clients/cli/settings.c:6395
 msgid "don't know how to get the property value"
 msgstr "неизвестно, как получить значение свойства"
 
-#: ../cli/src/settings.c:5647 ../cli/src/settings.c:5687
+#: ../clients/cli/settings.c:6448 ../clients/cli/settings.c:6488
 msgid "the property can't be changed"
 msgstr "свойство не может быть изменено"
 
-#: ../cli/src/settings.c:5791
+#: ../clients/cli/settings.c:6572
+#, fuzzy
+#| msgid "unavailable"
+msgid "(not available)"
+msgstr "недоступен"
+
+#: ../clients/cli/settings.c:6597
 msgid "[NM property description]"
 msgstr "[описание свойства NM]"
 
-#: ../cli/src/settings.c:5797
+#: ../clients/cli/settings.c:6602
 msgid "[nmcli specific description]"
 msgstr "[описание в nmcli]"
 
-#: ../cli/src/utils.c:111
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:6651
+msgid "<hidden>"
+msgstr ""
+
+#: ../clients/cli/utils.c:127
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Ошибка. Значение «%s» является обязательным."
 
-#: ../cli/src/utils.c:136
+#: ../clients/cli/utils.c:152
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "Ошибка. Ожидается аргумент  «%s», а получен  «%s»."
+msgstr "Ошибка. Ожидается аргумент «%s», а получен «%s»."
 
-#: ../cli/src/utils.c:139
+#: ../clients/cli/utils.c:155
 #, c-format
 msgid "Error: Unexpected argument '%s'"
-msgstr "Ошибка. Непредвиденный аргумент:  «%s»"
+msgstr "Ошибка. Непредвиденный аргумент: «%s»"
 
-#: ../cli/src/utils.c:189
+#: ../clients/cli/utils.c:205
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
 msgstr "Ошибка преобразования адреса IP4 «0x%X» в текстовый формат"
 
-#: ../cli/src/utils.c:217
+#: ../clients/cli/utils.c:233
 #, c-format
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "Ошибка преобразования адреса IP6 «%s» в текстовый формат"
 
-#: ../cli/src/utils.c:393
+#: ../clients/cli/utils.c:503
+#, fuzzy, c-format
+#| msgid "'%s' is ambiguous (%s x %s)"
+msgid "'%s' is ambiguous (on x off)"
+msgstr "Неоднозначное значение  «%s» (%s x %s)"
+
+#: ../clients/cli/utils.c:513
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
-msgstr "Недопустимое значение  «%s». Ожидается  [%s] или  [%s]"
+msgstr "Недопустимое значение «%s». Ожидается [%s] или  [%s]"
 
-#: ../cli/src/utils.c:475
+#: ../clients/cli/utils.c:595
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
-msgstr "Неоднозначное значение  «%s» (%s x %s)"
+msgstr "Неоднозначное значение «%s» (%s x %s)"
 
-#: ../cli/src/utils.c:487
+#: ../clients/cli/utils.c:607
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "имя не определено, попробуйте выбрать значение из [%s]"
 
-#: ../cli/src/utils.c:718
+#: ../clients/cli/utils.c:869
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "поле «%s» должно быть единственным"
 
-#: ../cli/src/utils.c:720
+#: ../clients/cli/utils.c:872
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "неверное поле «%s»; допустимые поля: %s"
 
-#: ../cli/src/utils.c:747
+#: ../clients/cli/utils.c:929
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Параметр «--terse» требует указания «--fields»"
 
-#: ../cli/src/utils.c:751
+#: ../clients/cli/utils.c:933
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Параметр «--terse» требует определённых значений «--fields», но не «%s»"
 
-#: ../cli/src/utils.c:1070
+#: ../clients/cli/utils.c:1301
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -4735,7 +5854,7 @@ msgstr ""
 "Предупреждение: версии nmcli (%s) и NetworkManager (%s) не совпадают. "
 "Используйте --nocheck для подавления этого предупреждения.\n"
 
-#: ../cli/src/utils.c:1079
+#: ../clients/cli/utils.c:1310
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -4743,1943 +5862,3272 @@ msgid ""
 msgstr ""
 "Ошибка: версии nmcli (%s) и NetworkManager (%s) не совпадают. Для "
 "принудительного запуска используйте --nocheck, но результаты не предсказуемы."
-""
 
-#: ../libnm-util/crypto.c:133
-#, c-format
-msgid "PEM key file had no end tag '%s'."
-msgstr "Файл ключа PEM не содержит завершающий тег «%s»."
+#: ../clients/common/nm-polkit-listener.c:215
+msgid "An authentication session is already underway."
+msgstr ""
 
-#: ../libnm-util/crypto.c:146
-#, c-format
-msgid "Doesn't look like a PEM private key file."
-msgstr "Возможно, это не файл личного ключа PEM."
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#.
+#: ../clients/common/nm-secret-agent-simple.c:209
+#: ../clients/common/nm-secret-agent-simple.c:300
+#: ../clients/tui/nmt-page-dsl.c:69 ../clients/tui/nmt-page-wifi.c:335
+msgid "Username"
+msgstr "Пользователь"
 
-#: ../libnm-util/crypto.c:163
-#, c-format
-msgid "Malformed PEM file: Proc-Type was not first tag."
-msgstr "Некорректный файл PEM: Proc-Type не является первым тегом."
+#: ../clients/common/nm-secret-agent-simple.c:214
+#: ../clients/common/nm-secret-agent-simple.c:251
+#: ../clients/common/nm-secret-agent-simple.c:277
+#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:379
+#: ../clients/common/nm-secret-agent-simple.c:392
+#: ../clients/common/nm-secret-agent-simple.c:408
+#: ../clients/tui/nmt-page-dsl.c:78 ../clients/tui/nmt-page-wifi.c:280
+#: ../clients/tui/nmt-page-wifi.c:311 ../clients/tui/nmt-page-wifi.c:344
+msgid "Password"
+msgstr "Пароль"
 
-#: ../libnm-util/crypto.c:171
-#, c-format
-msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr "Некорректный файл PEM: неизвестный тег Proc-Type «%s»."
+#: ../clients/common/nm-secret-agent-simple.c:223
+msgid "Identity"
+msgstr "Идентификация"
 
-#: ../libnm-util/crypto.c:181
-#, c-format
-msgid "Malformed PEM file: DEK-Info was not the second tag."
-msgstr "Некорректный файл PEM: DEK-Info не является вторым тегом."
+#: ../clients/common/nm-secret-agent-simple.c:228
+msgid "Private key password"
+msgstr "Пароль секретного ключа"
 
-#: ../libnm-util/crypto.c:192
-#, c-format
-msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr "Ð\9dекоÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\84айл PEM: в Ñ\82еге DEK-Info не найден Ð\92Ð\98."
+#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/tui/nmt-page-wifi.c:292
+msgid "Key"
+msgstr "Ð\9aлÑ\8eÑ\87"
 
-#: ../libnm-util/crypto.c:199
-#, c-format
-msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
-msgstr "Ð\9dекоÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\84айл PEM: невеÑ\80нÑ\8bй Ñ\84оÑ\80маÑ\82 Ð\92Ð\98 в Ñ\82еге DEK-Info."
+#: ../clients/common/nm-secret-agent-simple.c:305
+#: ../clients/tui/nmt-page-dsl.c:81
+msgid "Service"
+msgstr "СлÑ\83жба"
 
-#: ../libnm-util/crypto.c:212
-#, c-format
-msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "Некорректный файл PEM: неизвестный шифр личного ключа «%s»."
+#: ../clients/common/nm-secret-agent-simple.c:339
+msgid "Authentication required by wireless network"
+msgstr "Для доступа к беспроводной сети требуется аутентификация"
 
-#: ../libnm-util/crypto.c:231
+#: ../clients/common/nm-secret-agent-simple.c:340
 #, c-format
-msgid "Could not decode private key."
-msgstr "Не удалось расшифровать личный ключ."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
+msgstr ""
+"Для доступа к беспроводной сети «%s» требуются пароли или ключи шифрования."
 
-#: ../libnm-util/crypto.c:283
-msgid "Failed to find expected PKCS#8 start tag."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и оÑ\82кÑ\80Ñ\8bваÑ\8eÑ\89ий Ñ\82ег PKCS#8."
+#: ../clients/common/nm-secret-agent-simple.c:348
+msgid "Wired 802.1X authentication"
+msgstr "Ð\90Ñ\83Ñ\82енÑ\82иÑ\84икаÑ\86иÑ\8f пÑ\80оводного Ñ\81оединениÑ\8f 802.1X"
 
-#: ../libnm-util/crypto.c:291
-#, c-format
-msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "Не удалось найти закрывающий тег PKCS#8 — «%s»."
+#: ../clients/common/nm-secret-agent-simple.c:351
+msgid "Network name"
+msgstr "Имя сети"
 
-#: ../libnm-util/crypto.c:310
-msgid "Failed to decode PKCS#8 private key."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80оваÑ\82Ñ\8c лиÑ\87нÑ\8bй клÑ\8eÑ\87 PKCS#8."
+#: ../clients/common/nm-secret-agent-simple.c:358
+msgid "DSL authentication"
+msgstr "Ð\90Ñ\83Ñ\82енÑ\82иÑ\84икаÑ\86иÑ\8f DSL"
 
-#: ../libnm-util/crypto.c:352
-#, c-format
-msgid "IV must be an even number of bytes in length."
-msgstr "Длина ВИ должна быть равна чётному количеству байт."
+#: ../clients/common/nm-secret-agent-simple.c:366
+msgid "PIN code required"
+msgstr "Требуется PIN"
 
-#: ../libnm-util/crypto.c:366
-#, c-format
-msgid "IV contains non-hexadecimal digits."
-msgstr "ВИ включает не шестнадцатеричные цифры."
+#: ../clients/common/nm-secret-agent-simple.c:367
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Для использования мобильного устройства требуется PIN-код"
 
-#: ../libnm-util/crypto.c:404 ../libnm-util/crypto_gnutls.c:147
-#: ../libnm-util/crypto_gnutls.c:259 ../libnm-util/crypto_nss.c:167
-#: ../libnm-util/crypto_nss.c:326
-#, c-format
-msgid "Private key cipher '%s' was unknown."
-msgstr "Неизвестный шифр личного ключа «%s»."
+#: ../clients/common/nm-secret-agent-simple.c:369
+msgid "PIN"
+msgstr "PIN"
 
-#: ../libnm-util/crypto.c:511
-#, c-format
-msgid "Unable to determine private key type."
-msgstr "Не удалось определить тип личного ключа."
+#: ../clients/common/nm-secret-agent-simple.c:375
+#: ../clients/common/nm-secret-agent-simple.c:388
+#: ../clients/common/nm-secret-agent-simple.c:404
+msgid "Mobile broadband network password"
+msgstr "Пароль мобильной сети"
 
-#: ../libnm-util/crypto.c:566
+#: ../clients/common/nm-secret-agent-simple.c:376
+#: ../clients/common/nm-secret-agent-simple.c:389
+#: ../clients/common/nm-secret-agent-simple.c:405
 #, c-format
-msgid "PEM certificate had no start tag '%s'."
-msgstr "СеÑ\80Ñ\82иÑ\84икаÑ\82 PEM не имееÑ\82 Ñ\82ега наÑ\87ала «%s»."
+msgid "A password is required to connect to '%s'."
+msgstr "Ð\94лÑ\8f подклÑ\8eÑ\87ениÑ\8f к «%s» Ñ\82Ñ\80ебÑ\83еÑ\82Ñ\81Ñ\8f паÑ\80олÑ\8c."
 
-#: ../libnm-util/crypto.c:575
+#: ../clients/nm-online.c:96
 #, c-format
-msgid "PEM certificate had no end tag '%s'."
-msgstr "СеÑ\80Ñ\82иÑ\84икаÑ\82 PEM не имееÑ\82 Ñ\82ега оконÑ\87аниÑ\8f «%s»."
+msgid "\rConnecting"
+msgstr "Ð\9fодклÑ\8eÑ\87ение..."
 
-#: ../libnm-util/crypto.c:593
-#, c-format
-msgid "Failed to decode certificate."
-msgstr "Не удалось расшифровать сертификат."
+#: ../clients/nm-online.c:149
+msgid ""
+"Time to wait for a connection, in seconds (without the option, default value "
+"is 30)"
+msgstr "Время ожидания соединения в секундах (по умолчанию 30)"
 
-#: ../libnm-util/crypto_gnutls.c:50
-msgid "Failed to initialize the crypto engine."
-msgstr "Не удалось инициализировать криптографический модуль."
+#: ../clients/nm-online.c:150
+#, fuzzy
+#| msgid "Exit immediately if NetworkManager is not running"
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Выйти немедленно, если NetworkManager не запущен"
 
-#: ../libnm-util/crypto_gnutls.c:92
-#, c-format
-msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "Не удалось инициализировать модуль MD5: %s / %s."
+#: ../clients/nm-online.c:151
+msgid "Don't print anything"
+msgstr "Ничего не выводить"
 
-#: ../libnm-util/crypto_gnutls.c:155
-#, c-format
-msgid "Invalid IV length (must be at least %zd)."
-msgstr "Недопустимая длина ВИ (минимально %zd)."
+#: ../clients/nm-online.c:152
+#, fuzzy
+#| msgid ""
+#| "Waits for NetworkManager to finish activating startup network connections."
+msgid "Wait for NetworkManager startup instead of a connection"
+msgstr "Ожидать успешного соединения в NetworkManager."
 
-#: ../libnm-util/crypto_gnutls.c:166
-#, c-format
-msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c конÑ\82екÑ\81Ñ\82 Ñ\88иÑ\84Ñ\80а декодиÑ\80ованиÑ\8f: %s / %s."
+#: ../clients/nm-online.c:173
+msgid ""
+"Waits for NetworkManager to finish activating startup network connections."
+msgstr "Ð\9eжидаÑ\82Ñ\8c Ñ\83Ñ\81пеÑ\88ного Ñ\81оединениÑ\8f в NetworkManager."
 
-#: ../libnm-util/crypto_gnutls.c:175
-#, c-format
-msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "Не удалось создать симметричный ключ для расшифровки: %s / %s."
+#: ../clients/nm-online.c:180 ../clients/nm-online.c:186
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "Неверный параметр. Используйте --help для вывода списка параметров."
 
-#: ../libnm-util/crypto_gnutls.c:184
-#, c-format
-msgid "Failed to set IV for decryption: %s / %s."
-msgstr "Не удалось создать ВИ для расшифровки: %s / %s."
+#: ../clients/tui/newt/nmt-newt-utils.c:180 ../clients/tui/nmt-editor.c:417
+#: ../clients/tui/nmt-password-dialog.c:174
+#: ../clients/tui/nmt-route-editor.c:125 ../clients/tui/nmtui-hostname.c:71
+#: ../clients/tui/nmtui.c:117
+msgid "OK"
+msgstr "OK"
 
-#: ../libnm-util/crypto_gnutls.c:193
+#: ../clients/tui/newt/nmt-newt-utils.c:328
+#: ../clients/tui/newt/nmt-newt-utils.c:360
 #, c-format
-msgid "Failed to decrypt the private key: %s / %s."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c Ð\92Ð\98 длÑ\8f Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80овки: %s / %s."
+msgid "Could not create temporary file: %s"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c вÑ\80еменнÑ\8bй Ñ\84айл: %s"
 
-#: ../libnm-util/crypto_gnutls.c:203 ../libnm-util/crypto_nss.c:257
+#: ../clients/tui/newt/nmt-newt-utils.c:368
 #, c-format
-msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80оваÑ\82Ñ\8c лиÑ\87нÑ\8bй клÑ\8eÑ\87: непÑ\80едвиденнаÑ\8f длина заполнениÑ\8f."
+msgid "Editor failed: %s"
+msgstr "Ð\9eÑ\88ибка Ñ\80едакÑ\82оÑ\80а: %s"
 
-#: ../libnm-util/crypto_gnutls.c:214 ../libnm-util/crypto_nss.c:268
-#, c-format
-msgid "Failed to decrypt the private key."
-msgstr "Не удалось расшифровать личный ключ."
+#: ../clients/tui/newt/nmt-newt-utils.c:376
+#, fuzzy, c-format
+#| msgid "Editor failed: %s"
+msgid "Editor failed with status %d"
+msgstr "Ошибка редактора: %s"
 
-#: ../libnm-util/crypto_gnutls.c:281
-#, c-format
-msgid "Failed to initialize the encryption cipher context: %s / %s."
-msgstr "Не удалось инициализировать контекст кода шифрования: %s / %s."
+#: ../clients/tui/newt/nmt-newt-utils.c:378
+#, fuzzy, c-format
+#| msgid "Editor failed: %s"
+msgid "Editor failed with signal %d"
+msgstr "Ошибка редактора: %s"
 
-#: ../libnm-util/crypto_gnutls.c:290
+#: ../clients/tui/newt/nmt-newt-utils.c:382
 #, c-format
-msgid "Failed to set symmetric key for encryption: %s / %s."
-msgstr "Не удалось создать симметричный ключ для шифрования: %s / %s."
+msgid "Could not re-read file: %s"
+msgstr "Не удалось заново прочитать файл: %s"
 
-#: ../libnm-util/crypto_gnutls.c:300
+#: ../clients/tui/nm-editor-utils.c:151
 #, c-format
-msgid "Failed to set IV for encryption: %s / %s."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c Ð\92Ð\98 длÑ\8f Ñ\88иÑ\84Ñ\80ованиÑ\8f: %s / %s."
+msgid "Ethernet connection %d"
+msgstr "Ð\9fÑ\80оводное Ñ\81оединение %d"
 
-#: ../libnm-util/crypto_gnutls.c:309
+#: ../clients/tui/nm-editor-utils.c:159
 #, c-format
-msgid "Failed to encrypt the data: %s / %s."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c заÑ\88иÑ\84Ñ\80оваÑ\82Ñ\8c даннÑ\8bе: %s / %s."
+msgid "Wi-Fi connection %d"
+msgstr "Соединение Wi-Fi %d"
 
-#: ../libnm-util/crypto_gnutls.c:349
+#: ../clients/tui/nm-editor-utils.c:168
 #, c-format
-msgid "Error initializing certificate data: %s"
-msgstr "Ð\9eÑ\88ибка иниÑ\86иализаÑ\86ии даннÑ\8bÑ\85 Ñ\81еÑ\80Ñ\82иÑ\84икаÑ\82а: %s"
+msgid "InfiniBand connection %d"
+msgstr "Соединение InfiniBand %d"
 
-#: ../libnm-util/crypto_gnutls.c:371
-#, c-format
-msgid "Couldn't decode certificate: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80оваÑ\82Ñ\8c Ñ\81еÑ\80Ñ\82иÑ\84икаÑ\82: %s"
+#: ../clients/tui/nm-editor-utils.c:173 ../libnm-glib/nm-device.c:1799
+#: ../libnm/nm-device.c:1621
+msgid "Mobile Broadband"
+msgstr "Ð\9cобилÑ\8cное"
 
-#: ../libnm-util/crypto_gnutls.c:395
+#: ../clients/tui/nm-editor-utils.c:176
 #, c-format
-msgid "Couldn't initialize PKCS#12 decoder: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c декодеÑ\80 PKCS#12: %s"
+msgid "Mobile broadband connection %d"
+msgstr "Ð\9cобилÑ\8cное Ñ\81оединение %d"
 
-#: ../libnm-util/crypto_gnutls.c:408
-#, c-format
-msgid "Couldn't decode PKCS#12 file: %s"
-msgstr "Не удалось расшифровать файл PKCS#12: %s"
+#: ../clients/tui/nm-editor-utils.c:182 ../clients/tui/nmt-page-dsl.c:65
+msgid "DSL"
+msgstr "DSL"
 
-#: ../libnm-util/crypto_gnutls.c:420
+#: ../clients/tui/nm-editor-utils.c:186
 #, c-format
-msgid "Couldn't verify PKCS#12 file: %s"
-msgstr "Не удалось проверить файл PKCS#12: %s"
+msgid "DSL connection %d"
+msgstr "Cоединение DSL %d"
 
-#: ../libnm-util/crypto_gnutls.c:448
-#, c-format
-msgid "Couldn't initialize PKCS#8 decoder: %s"
-msgstr "Не удалось инициализировать декодер PKCS#8: %s"
+#: ../clients/tui/nm-editor-utils.c:191 ../libnm-core/nm-connection.c:1567
+#: ../libnm-glib/nm-device.c:1803 ../libnm-util/nm-connection.c:1608
+#: ../libnm/nm-device.c:1625 ../src/settings/plugins/ifcfg-rh/reader.c:3921
+msgid "Bond"
+msgstr "Агрегированное (Bond)"
 
-#: ../libnm-util/crypto_gnutls.c:471
+#: ../clients/tui/nm-editor-utils.c:195
 #, c-format
-msgid "Couldn't decode PKCS#8 file: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80оваÑ\82Ñ\8c Ñ\84айл PKCS#12: %s"
+msgid "Bond connection %d"
+msgstr "Ð\90гÑ\80егиÑ\80ованное (Bond) Ñ\81оединение %d"
 
-#: ../libnm-util/crypto_nss.c:56
-#, c-format
-msgid "Failed to initialize the crypto engine: %d."
-msgstr "Не удалось инициализировать криптографический модуль: %d."
+#: ../clients/tui/nm-editor-utils.c:200 ../libnm-core/nm-connection.c:1571
+#: ../libnm-glib/nm-device.c:1807 ../libnm-util/nm-connection.c:1612
+#: ../libnm/nm-device.c:1629 ../src/settings/plugins/ifcfg-rh/reader.c:4218
+msgid "Bridge"
+msgstr "Мост"
 
-#: ../libnm-util/crypto_nss.c:107
+#: ../clients/tui/nm-editor-utils.c:205
 #, c-format
-msgid "Failed to initialize the MD5 context: %d."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c конÑ\82екÑ\81Ñ\82 MD5: %d."
+msgid "Bridge connection %d"
+msgstr "Соединение Ñ\82ипа «моÑ\81Ñ\82» %d"
 
-#: ../libnm-util/crypto_nss.c:175
-#, c-format
-msgid "Invalid IV length (must be at least %d)."
-msgstr "Недопустимая длина ВИ (минимально %d)."
+#: ../clients/tui/nm-editor-utils.c:209 ../libnm-core/nm-connection.c:1569
+#: ../libnm-glib/nm-device.c:1805 ../libnm-util/nm-connection.c:1610
+#: ../libnm/nm-device.c:1627 ../src/settings/plugins/ifcfg-rh/reader.c:4027
+msgid "Team"
+msgstr "Агрегированное (Team)"
 
-#: ../libnm-util/crypto_nss.c:186
+#: ../clients/tui/nm-editor-utils.c:214
 #, c-format
-msgid "Failed to initialize the decryption cipher slot."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c Ñ\81лоÑ\82 Ñ\88иÑ\84Ñ\80а декодиÑ\80ованиÑ\8f."
+msgid "Team connection %d"
+msgstr "Ð\90гÑ\80егиÑ\80ованное (Team) Ñ\81оединение %d"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../clients/tui/nm-editor-utils.c:222
 #, c-format
-msgid "Failed to set symmetric key for decryption."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c задаÑ\82Ñ\8c Ñ\81иммеÑ\82Ñ\80иÑ\87нÑ\8bй клÑ\8eÑ\87 Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80овки."
+msgid "VLAN connection %d"
+msgstr "Соединение VLAN %d"
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../clients/tui/nm-editor-utils.c:237
 #, c-format
-msgid "Failed to set IV for decryption."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c задаÑ\82Ñ\8c Ð\92Ð\98 Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80овки."
+msgid "VPN connection %d"
+msgstr "Соединение VPN %d"
 
-#: ../libnm-util/crypto_nss.c:214
-#, c-format
-msgid "Failed to initialize the decryption context."
-msgstr "Не удалось инициализировать контекст расшифровки."
+#: ../clients/tui/nmt-device-entry.c:371
+msgid "Select..."
+msgstr "Выбрать..."
 
-#: ../libnm-util/crypto_nss.c:227
-#, c-format
-msgid "Failed to decrypt the private key: %d."
-msgstr "Не удалось расшифровать личный ключ: %d."
+#: ../clients/tui/nmt-edit-connection-list.c:112
+msgid "Add"
+msgstr "Добавить"
 
-#: ../libnm-util/crypto_nss.c:235
-#, c-format
-msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr ""
-"Не удалось расшифровать личный ключ: слишком большой объем расшифрованных "
-"данных."
+#: ../clients/tui/nmt-edit-connection-list.c:115
+#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:170
+#: ../clients/tui/nmt-page-team-port.c:112 ../clients/tui/nmt-page-team.c:176
+msgid "Edit..."
+msgstr "Изменить..."
 
-#: ../libnm-util/crypto_nss.c:246
-#, c-format
-msgid "Failed to finalize decryption of the private key: %d."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c завеÑ\80Ñ\88иÑ\82Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80овкÑ\83 лиÑ\87ного клÑ\8eÑ\87а: %d."
+#: ../clients/tui/nmt-edit-connection-list.c:118
+#: ../clients/tui/nmtui-edit.c:527
+msgid "Delete"
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: ../libnm-util/crypto_nss.c:348
-#, c-format
-msgid "Failed to initialize the encryption cipher slot."
-msgstr "Не удалось инициализировать слот шифра декодирования."
+#: ../clients/tui/nmt-editor-section.c:105
+msgid "Hide"
+msgstr "Скрыть"
 
-#: ../libnm-util/crypto_nss.c:356
-#, c-format
-msgid "Failed to set symmetric key for encryption."
-msgstr "Не удалось задать симметричный ключ для шифрования."
+#: ../clients/tui/nmt-editor-section.c:105
+msgid "Show"
+msgstr "Показать"
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../clients/tui/nmt-editor.c:99
 #, c-format
-msgid "Failed to set IV for encryption."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c задаÑ\82Ñ\8c Ð\92Ð\98 Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80овки."
+msgid "Could not create editor for connection '%s' of type '%s'."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c окно Ñ\80едакÑ\82оÑ\80а длÑ\8f Ñ\81оединениÑ\8f «%s» Ñ\82ипа «%s»."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../clients/tui/nmt-editor.c:103
 #, c-format
-msgid "Failed to initialize the encryption context."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c конÑ\82екÑ\81Ñ\82 Ñ\88иÑ\84Ñ\80ованиÑ\8f."
+msgid "Could not create editor for invalid connection '%s'."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c окно Ñ\80едакÑ\82оÑ\80а длÑ\8f невеÑ\80ного Ñ\81оединениÑ\8f «%s»."
 
-#: ../libnm-util/crypto_nss.c:380
-#, c-format
-msgid "Failed to encrypt: %d."
-msgstr "Не удалось зашифровать: %d."
+#: ../clients/tui/nmt-editor.c:113
+msgid "Edit Connection"
+msgstr "Изменить соединение"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../clients/tui/nmt-editor.c:166
 #, c-format
-msgid "Unexpected amount of data after encrypting."
-msgstr "Непредвиденный объём данных после шифрования."
+msgid "Unable to save connection: %s"
+msgstr "Не удалось сохранить соединение: %s"
 
-#: ../libnm-util/crypto_nss.c:431
+#: ../clients/tui/nmt-editor.c:180
 #, c-format
-msgid "Couldn't decode certificate: %d"
-msgstr "Не удалось расшифровать сертификат: %d"
+msgid "Unable to add new connection: %s"
+msgstr "Не удалось добавить новое соединение: %s"
 
-#: ../libnm-util/crypto_nss.c:466
-#, c-format
-msgid "Couldn't convert password to UCS2: %d"
-msgstr "Не удалось преобразовать пароль в UCS2: %d"
+#: ../clients/tui/nmt-editor.c:322
+msgid "Profile name"
+msgstr "Имя профиля"
 
-#: ../libnm-util/crypto_nss.c:494
-#, c-format
-msgid "Couldn't initialize PKCS#12 decoder: %d"
-msgstr "Не удалось инициализировать декодер PKCS#12: %d"
+#: ../clients/tui/nmt-editor.c:333
+#, fuzzy
+#| msgid "Ethernet"
+msgid "Ethernet device"
+msgstr "Ethernet"
 
-#: ../libnm-util/crypto_nss.c:503
-#, c-format
-msgid "Couldn't decode PKCS#12 file: %d"
-msgstr "Не удалось расшифровать файл PKCS#12: %d"
+#: ../clients/tui/nmt-editor.c:335
+msgid "Device"
+msgstr "Устройство"
 
-#: ../libnm-util/crypto_nss.c:512
-#, c-format
-msgid "Couldn't verify PKCS#12 file: %d"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80овеÑ\80иÑ\82Ñ\8c Ñ\84айл PKCS#12: %d"
+#. And finally the bottom widgets
+#: ../clients/tui/nmt-editor.c:393
+msgid "Automatically connect"
+msgstr "Ð\9fодклÑ\8eÑ\87аÑ\82Ñ\8cÑ\81Ñ\8f авÑ\82омаÑ\82иÑ\87еÑ\81ки"
 
-#: ../libnm-util/crypto_nss.c:556
-msgid "Could not generate random data."
-msgstr "Ð\9eÑ\88ибка пÑ\80и генеÑ\80аÑ\86ии Ñ\81лÑ\83Ñ\87айнÑ\8bÑ\85 даннÑ\8bÑ\85."
+#: ../clients/tui/nmt-editor.c:399
+msgid "Available to all users"
+msgstr "Ð\94оÑ\81Ñ\82Ñ\83пно вÑ\81ем"
 
-#: ../libnm-util/nm-setting-8021x.c:2170 ../libnm-util/nm-setting-8021x.c:2187
-#: ../libnm-util/nm-setting-8021x.c:2228 ../libnm-util/nm-setting-8021x.c:2245
-#: ../libnm-util/nm-setting-8021x.c:2297 ../libnm-util/nm-setting-8021x.c:2309
-#: ../libnm-util/nm-setting-8021x.c:2327 ../libnm-util/nm-setting-8021x.c:2339
-#: ../libnm-util/nm-setting-8021x.c:2363 ../libnm-util/nm-setting-8021x.c:2539
-#: ../libnm-util/nm-setting-adsl.c:212
-#: ../libnm-util/nm-setting-bluetooth.c:144
-#: ../libnm-util/nm-setting-bluetooth.c:162
-#: ../libnm-util/nm-setting-bond.c:498 ../libnm-util/nm-setting-bridge.c:268
-#: ../libnm-util/nm-setting-cdma.c:163
-#: ../libnm-util/nm-setting-connection.c:692
-#: ../libnm-util/nm-setting-connection.c:708
-#: ../libnm-util/nm-setting-connection.c:763
-#: ../libnm-util/nm-setting-ip4-config.c:705
-#: ../libnm-util/nm-setting-ip4-config.c:715
-#: ../libnm-util/nm-setting-ip6-config.c:687
-#: ../libnm-util/nm-setting-ip6-config.c:697
-#: ../libnm-util/nm-setting-ip6-config.c:750
-#: ../libnm-util/nm-setting-olpc-mesh.c:127
-#: ../libnm-util/nm-setting-pppoe.c:165 ../libnm-util/nm-setting-team.c:131
-#: ../libnm-util/nm-setting-vpn.c:405 ../libnm-util/nm-setting-wimax.c:137
-#: ../libnm-util/nm-setting-wireless-security.c:795
-#: ../libnm-util/nm-setting-wireless.c:697
-msgid "property is missing"
-msgstr "свойство не определено"
+#: ../clients/tui/nmt-editor.c:414 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:118 ../clients/tui/nmtui-edit.c:218
+#: ../clients/tui/nmtui-edit.c:526 ../clients/tui/nmtui-hostname.c:69
+msgid "Cancel"
+msgstr "Отменить"
 
-#: ../libnm-util/nm-setting-8021x.c:2177 ../libnm-util/nm-setting-8021x.c:2194
-#: ../libnm-util/nm-setting-8021x.c:2235 ../libnm-util/nm-setting-8021x.c:2252
-#: ../libnm-util/nm-setting-8021x.c:2303 ../libnm-util/nm-setting-8021x.c:2315
-#: ../libnm-util/nm-setting-8021x.c:2333 ../libnm-util/nm-setting-8021x.c:2345
-#: ../libnm-util/nm-setting-8021x.c:2369 ../libnm-util/nm-setting-adsl.c:219
-#: ../libnm-util/nm-setting-adsl.c:228 ../libnm-util/nm-setting-cdma.c:179
-#: ../libnm-util/nm-setting-cdma.c:188
-#: ../libnm-util/nm-setting-connection.c:699
-#: ../libnm-util/nm-setting-connection.c:770
-#: ../libnm-util/nm-setting-gsm.c:284 ../libnm-util/nm-setting-gsm.c:341
-#: ../libnm-util/nm-setting-gsm.c:350
-#: ../libnm-util/nm-setting-ip4-config.c:766
-#: ../libnm-util/nm-setting-ip4-config.c:775
-#: ../libnm-util/nm-setting-pppoe.c:172 ../libnm-util/nm-setting-pppoe.c:181
-#: ../libnm-util/nm-setting-vpn.c:414 ../libnm-util/nm-setting-vpn.c:424
-#: ../libnm-util/nm-setting-wimax.c:146
-#: ../libnm-util/nm-setting-wireless-security.c:825
-#: ../libnm-util/nm-setting-wireless-security.c:833
-#: ../libnm-util/nm-setting-wireless-security.c:857
-msgid "property is empty"
-msgstr "пустое свойство"
+#: ../clients/tui/nmt-mtu-entry.c:86
+msgid "(default)"
+msgstr "(по умолчанию)"
 
-#: ../libnm-util/nm-setting-8021x.c:2205 ../libnm-util/nm-setting-8021x.c:2217
-#: ../libnm-util/nm-setting-8021x.c:2263 ../libnm-util/nm-setting-8021x.c:2275
-#, c-format
-msgid "has to match '%s' property for PKCS#12"
-msgstr "должно соответствовать свойству  «%s» для PKCS#12"
-
-#: ../libnm-util/nm-setting-8021x.c:2514 ../libnm-util/nm-setting-8021x.c:2548
-#: ../libnm-util/nm-setting-bluetooth.c:153
-#: ../libnm-util/nm-setting-bond.c:507
-#: ../libnm-util/nm-setting-infiniband.c:203
-#: ../libnm-util/nm-setting-infiniband.c:218
-#: ../libnm-util/nm-setting-ip4-config.c:757
-#: ../libnm-util/nm-setting-ip6-config.c:741
-#: ../libnm-util/nm-setting-olpc-mesh.c:155
-#: ../libnm-util/nm-setting-team.c:140 ../libnm-util/nm-setting-wimax.c:155
-#: ../libnm-util/nm-setting-wired.c:607 ../libnm-util/nm-setting-wired.c:616
-#: ../libnm-util/nm-setting-wireless-security.c:876
-#: ../libnm-util/nm-setting-wireless-security.c:885
-#: ../libnm-util/nm-setting-wireless-security.c:893
-#: ../libnm-util/nm-setting-wireless-security.c:901
-#: ../libnm-util/nm-setting-wireless-security.c:909
-#: ../libnm-util/nm-setting-wireless-security.c:918
-#: ../libnm-util/nm-setting-wireless-security.c:927
-#: ../libnm-util/nm-setting-wireless-security.c:936
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless.c:757
-#: ../libnm-util/nm-setting-wireless.c:766
-#: ../libnm-util/nm-setting-wireless.c:775
-msgid "property is invalid"
-msgstr "неверное свойство"
+#: ../clients/tui/nmt-mtu-entry.c:88 ../clients/tui/nmt-mtu-entry.c:119
+msgid "bytes"
+msgstr "байт"
 
-#: ../libnm-util/nm-setting-8021x.c:2573 ../libnm-util/nm-setting-8021x.c:2583
-#: ../libnm-util/nm-setting-8021x.c:2593 ../libnm-util/nm-setting-8021x.c:2603
-#: ../libnm-util/nm-setting-8021x.c:2613 ../libnm-util/nm-setting-adsl.c:239
-#: ../libnm-util/nm-setting-adsl.c:250
-#: ../libnm-util/nm-setting-bluetooth.c:170
-#: ../libnm-util/nm-setting-wireless-security.c:804
-#, c-format
-msgid "'%s' is not a valid value for the property"
-msgstr "«%s» — недопустимое значение свойства"
+#: ../clients/tui/nmt-page-bond.c:87
+msgid "Round-robin"
+msgstr "Циклический"
 
-#: ../libnm-util/nm-setting-bluetooth.c:188
-#, c-format
-msgid "requires '%s' or '%s' setting"
-msgstr "требует определения «%s» или  «%s»"
+#: ../clients/tui/nmt-page-bond.c:88
+msgid "Active Backup"
+msgstr "Активный и запасные"
 
-#: ../libnm-util/nm-setting-bond.c:518
-#, c-format
-msgid "invalid option '%s' or its value '%s'"
-msgstr "недопустимый параметр  «%s» или его значение  «%s»"
+#: ../clients/tui/nmt-page-bond.c:89
+msgid "XOR"
+msgstr "XOR"
 
-#: ../libnm-util/nm-setting-bond.c:537
-#, c-format
-msgid "only one of '%s' and '%s' can be set"
-msgstr "Может быть определено только одно из двух —  «%s» или «%s»."
+#: ../clients/tui/nmt-page-bond.c:90
+msgid "Broadcast"
+msgstr "Рассылка"
 
-#: ../libnm-util/nm-setting-bond.c:548
-#, c-format
-msgid "mandatory option '%s' is missing"
-msgstr "Обязательный параметр «%s» не определен."
+#: ../clients/tui/nmt-page-bond.c:91
+msgid "802.3ad"
+msgstr "802.3ad"
 
-#: ../libnm-util/nm-setting-bond.c:557
-#, c-format
-msgid "'%s' is not a valid value for '%s'"
-msgstr "«%s» — недопустимое значение «%s» "
+#: ../clients/tui/nmt-page-bond.c:92
+msgid "Adaptive Transmit Load Balancing (tlb)"
+msgstr "Адаптивное распределение нагрузки исходящего трафика (TLB)"
 
-#: ../libnm-util/nm-setting-bond.c:570
-#, c-format
-msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr " «%s=%s» несовместимо с  «%s > 0»"
+#: ../clients/tui/nmt-page-bond.c:93
+msgid "Adaptive Load Balancing (alb)"
+msgstr "Адаптивное распределение нагрузки (ALB)"
 
-#: ../libnm-util/nm-setting-bond.c:583
-#, c-format
-msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "Недопустимое имя интерфейса («%s») для параметра «%s»"
+#: ../clients/tui/nmt-page-bond.c:99
+msgid "MII (recommended)"
+msgstr "MII (рекомендуется)"
 
-#: ../libnm-util/nm-setting-bond.c:593
-#, c-format
-msgid "'%s' option is only valid for '%s=%s'"
-msgstr "Параметр «%s» действителен только для «%s=%s»."
+#: ../clients/tui/nmt-page-bond.c:100
+msgid "ARP"
+msgstr "ARP"
 
-#: ../libnm-util/nm-setting-bond.c:606
-#, c-format
-msgid "'%s=%s' is not a valid configuration for '%s'"
-msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имаÑ\8f конÑ\84игÑ\83Ñ\80аÑ\86иÑ\8f («%s=%s») длÑ\8f «%s»"
+#: ../clients/tui/nmt-page-bond.c:358 ../clients/tui/nmt-page-bridge.c:81
+#: ../clients/tui/nmt-page-team.c:155
+msgid "Slaves"
+msgstr "СлейвÑ\8b"
 
-#: ../libnm-util/nm-setting-bond.c:619 ../libnm-util/nm-setting-bond.c:628
-#: ../libnm-util/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:684
-#, c-format
-msgid "'%s' option requires '%s' option to be set"
-msgstr " Для «%s» необходимо, чтобы был определен параметр  «%s»"
+#: ../clients/tui/nmt-page-bond.c:370 ../clients/tui/nmt-page-wifi.c:233
+msgid "Mode"
+msgstr "Режим"
 
-#: ../libnm-util/nm-setting-bond.c:659
-#, c-format
-msgid "'%s' option is empty"
-msgstr "Пустой параметр: «%s»"
+#: ../clients/tui/nmt-page-bond.c:376
+msgid "Primary"
+msgstr "Основной"
 
-#: ../libnm-util/nm-setting-bond.c:671
-#, c-format
-msgid "'%s' is not a valid IPv4 address for '%s' option"
-msgstr "Недопустимый адрес IPv4 («%s») для «%s»."
+#: ../clients/tui/nmt-page-bond.c:382
+msgid "Link monitoring"
+msgstr "Мониторинг соединения"
 
-#: ../libnm-util/nm-setting-bridge-port.c:155
-#: ../libnm-util/nm-setting-bridge-port.c:167
-#, c-format
-msgid "'%d' is not a valid value for the property (should be <= %d)"
-msgstr "Недопустимое значение свойства:  «%d» (должно быть <= %d)."
+#: ../clients/tui/nmt-page-bond.c:388 ../clients/tui/nmt-page-bond.c:395
+#: ../clients/tui/nmt-page-bond.c:402 ../clients/tui/nmt-page-bond.c:409
+msgctxt "milliseconds"
+msgid "ms"
+msgstr "мс"
+
+#: ../clients/tui/nmt-page-bond.c:389 ../clients/tui/nmt-page-bond.c:410
+msgid "Monitoring frequency"
+msgstr "Частота мониторинга"
+
+#: ../clients/tui/nmt-page-bond.c:396
+msgid "Link up delay"
+msgstr "Задержка установки соединения"
+
+#: ../clients/tui/nmt-page-bond.c:403
+msgid "Link down delay"
+msgstr "Задержка разрыва соединения"
+
+#: ../clients/tui/nmt-page-bond.c:416
+msgid "ARP targets"
+msgstr "Получатели ARP"
+
+#: ../clients/tui/nmt-page-bridge-port.c:63
+msgid "BRIDGE PORT"
+msgstr "ПОРТ МОСТА"
+
+#: ../clients/tui/nmt-page-bridge-port.c:70
+#: ../clients/tui/nmt-page-bridge.c:107
+msgid "Priority"
+msgstr "Приоритет"
+
+#: ../clients/tui/nmt-page-bridge-port.c:76
+msgid "Path cost"
+msgstr "Стоимость пути"
+
+#: ../clients/tui/nmt-page-bridge-port.c:78
+msgid "Hairpin mode"
+msgstr "Режим разворота пакетов"
+
+#: ../clients/tui/nmt-page-bridge.c:91 ../clients/tui/nmt-page-bridge.c:116
+#: ../clients/tui/nmt-page-bridge.c:126 ../clients/tui/nmt-page-bridge.c:136
+msgid "seconds"
+msgstr "сек."
+
+#: ../clients/tui/nmt-page-bridge.c:92
+msgid "Aging time"
+msgstr "Время старения"
+
+#: ../clients/tui/nmt-page-bridge.c:94
+msgid "Enable STP (Spanning Tree Protocol)"
+msgstr "Включить STP (Spanning Tree Protocol)"
+
+#: ../clients/tui/nmt-page-bridge.c:117
+msgid "Forward delay"
+msgstr "Задержка переадресации"
+
+#: ../clients/tui/nmt-page-bridge.c:127
+msgid "Hello time"
+msgstr "Время приветствия"
+
+#: ../clients/tui/nmt-page-bridge.c:137
+msgid "Max age"
+msgstr "Максимальный срок"
+
+#: ../clients/tui/nmt-page-ethernet.c:73
+msgid "ETHERNET"
+msgstr "ETHERNET"
+
+#: ../clients/tui/nmt-page-ethernet.c:80 ../clients/tui/nmt-page-vlan.c:125
+#: ../clients/tui/nmt-page-wifi.c:367
+msgid "Cloned MAC address"
+msgstr "Клонированный MAC-адрес"
+
+#: ../clients/tui/nmt-page-infiniband.c:50
+msgid "Datagram"
+msgstr "Датаграмма"
+
+#: ../clients/tui/nmt-page-infiniband.c:51
+msgid "Connected"
+msgstr "Подключено"
+
+#: ../clients/tui/nmt-page-infiniband.c:84
+msgid "INFINIBAND"
+msgstr "INFINIBAND"
+
+#: ../clients/tui/nmt-page-infiniband.c:91
+msgid "Transport mode"
+msgstr "Транспортный режим"
+
+#: ../clients/tui/nmt-page-ip4.c:41
+msgid "Disabled"
+msgstr "Отключено"
+
+#: ../clients/tui/nmt-page-ip4.c:42 ../clients/tui/nmt-page-ip6.c:42
+msgid "Automatic"
+msgstr "Автоматически"
+
+#: ../clients/tui/nmt-page-ip4.c:43 ../clients/tui/nmt-page-ip6.c:44
+msgid "Link-Local"
+msgstr "Локальная связь"
+
+#: ../clients/tui/nmt-page-ip4.c:44 ../clients/tui/nmt-page-ip6.c:45
+msgid "Manual"
+msgstr "Вручную"
+
+#: ../clients/tui/nmt-page-ip4.c:45
+msgid "Shared"
+msgstr "Общее"
+
+#: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85
+msgid "(No custom routes)"
+msgstr "(нет дополнительных маршрутов)"
+
+#: ../clients/tui/nmt-page-ip4.c:88 ../clients/tui/nmt-page-ip6.c:88
+#, c-format
+msgid "One custom route"
+msgid_plural "%d custom routes"
+msgstr[0] "%d дополнительный маршрут"
+msgstr[1] "%d дополнительных маршрута"
+msgstr[2] "%d дополнительных маршрутов"
+
+#: ../clients/tui/nmt-page-ip4.c:131
+msgid "IPv4 CONFIGURATION"
+msgstr "КОНФИГУРАЦИЯ IPv4"
+
+#: ../clients/tui/nmt-page-ip4.c:139 ../clients/tui/nmt-page-ip6.c:139
+msgid "Addresses"
+msgstr "Адреса"
+
+#: ../clients/tui/nmt-page-ip4.c:146 ../clients/tui/nmt-page-ip6.c:146
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: ../clients/tui/nmt-page-ip4.c:153 ../clients/tui/nmt-page-ip6.c:153
+msgid "DNS servers"
+msgstr "Серверы DNS"
+
+#: ../clients/tui/nmt-page-ip4.c:159 ../clients/tui/nmt-page-ip6.c:159
+msgid "Search domains"
+msgstr "Поиск доменов"
+
+#: ../clients/tui/nmt-page-ip4.c:174 ../clients/tui/nmt-page-ip6.c:172
+msgid "Routing"
+msgstr "Маршрутизация"
+
+#: ../clients/tui/nmt-page-ip4.c:176 ../clients/tui/nmt-page-ip6.c:174
+msgid "Never use this network for default route"
+msgstr "Не использовать эту сеть для текущего маршрута"
+
+#: ../clients/tui/nmt-page-ip4.c:184
+msgid "Require IPv4 addressing for this connection"
+msgstr "Соединение требует адресацию IPv4"
+
+#: ../clients/tui/nmt-page-ip6.c:41
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#: ../clients/tui/nmt-page-ip6.c:43
+msgid "Automatic (DHCP-only)"
+msgstr "Автоматически (только DHCP)"
+
+#: ../clients/tui/nmt-page-ip6.c:131
+msgid "IPv6 CONFIGURATION"
+msgstr "КОНФИГУРАЦИЯ IPv6"
+
+#: ../clients/tui/nmt-page-ip6.c:182
+msgid "Require IPv6 addressing for this connection"
+msgstr "Соединение требует адресацию IPv6"
+
+#: ../clients/tui/nmt-page-ppp.c:134
+msgid "PPP CONFIGURATION"
+msgstr "КОНФИГУРАЦИЯ PPP"
+
+#: ../clients/tui/nmt-page-ppp.c:143
+#, fuzzy
+#| msgid "Authentication"
+msgid "Allowed authentication methods:"
+msgstr "Аутентификация"
+
+#: ../clients/tui/nmt-page-ppp.c:150
+msgid "EAP"
+msgstr "EAP"
+
+#: ../clients/tui/nmt-page-ppp.c:158
+msgid "PAP"
+msgstr "PAP"
+
+#: ../clients/tui/nmt-page-ppp.c:166
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../clients/tui/nmt-page-ppp.c:174
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../clients/tui/nmt-page-ppp.c:182
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../clients/tui/nmt-page-ppp.c:198
+msgid "Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:210
+msgid "Require 128-bit encryption"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:220
+msgid "Use stateful MPPE"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:232
+msgid "Allow BSD data compression"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:240
+msgid "Allow Deflate data compression"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:248
+msgid "Use TCP header compression"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:258
+msgid "Send PPP echo packets"
+msgstr ""
+
+#: ../clients/tui/nmt-page-team-port.c:95
+msgid "TEAM PORT"
+msgstr "ПОРТ АГРЕГАЦИИ (TEAM)"
+
+#: ../clients/tui/nmt-page-team-port.c:102 ../clients/tui/nmt-page-team.c:166
+msgid "JSON configuration"
+msgstr "Конфигурация JSON"
+
+#: ../clients/tui/nmt-page-vlan.c:102
+msgid "Parent"
+msgstr "Родительский"
+
+#: ../clients/tui/nmt-page-vlan.c:117
+msgid "VLAN id"
+msgstr "VLAN ID"
+
+#: ../clients/tui/nmt-page-wifi.c:67
+msgctxt "Wi-Fi"
+msgid "Client"
+msgstr "Клиент"
+
+#: ../clients/tui/nmt-page-wifi.c:68
+msgid "Access Point"
+msgstr "Точка доступа"
+
+#: ../clients/tui/nmt-page-wifi.c:69
+msgid "Ad-Hoc Network"
+msgstr "Динамическая сеть"
+
+#: ../clients/tui/nmt-page-wifi.c:74
+msgctxt "Wi-Fi"
+msgid "Automatic"
+msgstr "Автоматически"
+
+#. 802.11a Wi-Fi network
+#: ../clients/tui/nmt-page-wifi.c:76
+msgid "A (5 GHz)"
+msgstr "A (5 ГГц)"
+
+#. 802.11b / 802.11g Wi-Fi network
+#: ../clients/tui/nmt-page-wifi.c:78
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 ГГц)"
+
+#: ../clients/tui/nmt-page-wifi.c:83
+msgctxt "Wi-Fi security"
+msgid "None"
+msgstr "Нет"
+
+#: ../clients/tui/nmt-page-wifi.c:84
+msgid "WPA & WPA2 Personal"
+msgstr "WPA и WPA2 Personal"
+
+#: ../clients/tui/nmt-page-wifi.c:85
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA и WPA2 Enterprise"
+
+#: ../clients/tui/nmt-page-wifi.c:86
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "40/128-битный ключ WEP (Hex или ASCII))"
+
+#: ../clients/tui/nmt-page-wifi.c:87
+msgid "WEP 128-bit Passphrase"
+msgstr "128-битный ключ WEP"
+
+#: ../clients/tui/nmt-page-wifi.c:88
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамический WEP (802.1x)"
+
+#: ../clients/tui/nmt-page-wifi.c:89
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../clients/tui/nmt-page-wifi.c:94
+msgctxt "WEP key index"
+msgid "1 (Default)"
+msgstr "1 (по умолчанию)"
+
+#: ../clients/tui/nmt-page-wifi.c:95
+msgctxt "WEP key index"
+msgid "2"
+msgstr "2"
+
+#: ../clients/tui/nmt-page-wifi.c:96
+msgctxt "WEP key index"
+msgid "3"
+msgstr "3"
+
+#: ../clients/tui/nmt-page-wifi.c:97
+msgctxt "WEP key index"
+msgid "4"
+msgstr "4"
+
+#: ../clients/tui/nmt-page-wifi.c:102
+msgid "Open System"
+msgstr "Открытая система"
+
+#: ../clients/tui/nmt-page-wifi.c:103
+msgid "Shared Key"
+msgstr "Общий ключ"
+
+#: ../clients/tui/nmt-page-wifi.c:217
+msgid "WI-FI"
+msgstr "WI-FI"
+
+#: ../clients/tui/nmt-page-wifi.c:259
+msgid "Channel"
+msgstr "Канал"
+
+#: ../clients/tui/nmt-page-wifi.c:264
+msgid "Security"
+msgstr "Защита"
+
+#. "wpa-enterprise"
+#. FIXME
+#: ../clients/tui/nmt-page-wifi.c:285
+msgid "(No support for wpa-enterprise yet...)"
+msgstr "(wpa-enterprise не поддерживается)"
+
+#: ../clients/tui/nmt-page-wifi.c:295 ../clients/tui/nmt-page-wifi.c:314
+msgid "WEP index"
+msgstr "Индекс WEP"
+
+#: ../clients/tui/nmt-page-wifi.c:303 ../clients/tui/nmt-page-wifi.c:322
+msgid "Authentication"
+msgstr "Аутентификация"
+
+#. "dynamic-wep"
+#. FIXME
+#: ../clients/tui/nmt-page-wifi.c:328
+msgid "(No support for dynamic-wep yet...)"
+msgstr "(dynamic-wep не поддерживается)"
+
+#: ../clients/tui/nmt-password-fields.c:130
+msgid "Ask for this password every time"
+msgstr "Запрашивать пароль каждый раз"
+
+#: ../clients/tui/nmt-password-fields.c:131
+msgid "Show password"
+msgstr "Показать пароль"
+
+#: ../clients/tui/nmt-route-table.c:192
+msgid "Destination"
+msgstr "Назначение"
+
+#: ../clients/tui/nmt-route-table.c:192
+msgid "Prefix"
+msgstr "Префикс"
+
+#: ../clients/tui/nmt-route-table.c:201
+msgid "Next Hop"
+msgstr "Следующий переход"
+
+#: ../clients/tui/nmt-route-table.c:209
+msgid "Metric"
+msgstr "Метрика"
+
+#: ../clients/tui/nmt-route-table.c:229
+msgid "No custom routes are defined."
+msgstr "Нет дополнительных маршрутов."
+
+#: ../clients/tui/nmt-slave-list.c:137
+msgid "Select the type of slave connection you wish to add."
+msgstr "Выберите тип добавляемого подчиненного соединения."
+
+#: ../clients/tui/nmt-widget-list.c:141
+msgid "Add..."
+msgstr "Добавить..."
+
+#: ../clients/tui/nmt-widget-list.c:204
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../clients/tui/nmtui-connect.c:90
+msgid "Activation failed"
+msgstr "Ошибка подключения"
+
+#: ../clients/tui/nmtui-connect.c:145
+msgid "Connecting..."
+msgstr "Подключение..."
+
+#: ../clients/tui/nmtui-connect.c:180 ../clients/tui/nmtui-connect.c:211
+#, c-format
+msgid "Could not activate connection: %s"
+msgstr "Не удалось подключиться к %s"
+
+#: ../clients/tui/nmtui-connect.c:271 ../clients/tui/nmtui-connect.c:320
+msgid "Activate"
+msgstr "Включить"
+
+#: ../clients/tui/nmtui-connect.c:273
+msgid "Deactivate"
+msgstr "Отключить"
+
+#: ../clients/tui/nmtui-connect.c:325 ../clients/tui/nmtui-edit.c:121
+#: ../clients/tui/nmtui.c:111
+msgid "Quit"
+msgstr "Выйти"
+
+#: ../clients/tui/nmtui-connect.c:348
+#, c-format
+msgid "No such connection '%s'"
+msgstr "Нет соединения «%s»."
+
+#: ../clients/tui/nmtui-connect.c:350
+msgid "Connection is already active"
+msgstr "Соединение активно"
+
+#: ../clients/tui/nmtui-edit.c:226
+msgid "Create"
+msgstr "Создать"
+
+#: ../clients/tui/nmtui-edit.c:368
+msgid "Select the type of connection you wish to create."
+msgstr "Выберите тип нового соединения."
+
+#: ../clients/tui/nmtui-edit.c:376
+msgid ""
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
+msgstr ""
+"Отсутствие необходимого типа VPN в списке может говорить о том, что в "
+"системе не установлен соответствующий модуль VPN."
+
+#: ../clients/tui/nmtui-edit.c:412 ../clients/tui/nmtui-edit.c:428
+msgid "New Connection"
+msgstr "Новое соединение"
+
+#: ../clients/tui/nmtui-edit.c:467
+#, c-format
+msgid "Unable to delete connection: %s"
+msgstr "Не удалось удалить соединение: %s"
+
+#: ../clients/tui/nmtui-edit.c:506
+#, fuzzy, c-format
+#| msgid "Could not delete connection: %s"
+msgid "Could not delete connection '%s': %s"
+msgstr "Не удалось удалить соединение: %s"
+
+#: ../clients/tui/nmtui-edit.c:528
+#, c-format
+msgid "Are you sure you want to delete the connection '%s'?"
+msgstr "Действительно удалить соединение «%s»?"
+
+#: ../clients/tui/nmtui-hostname.c:47
+msgid "Set Hostname"
+msgstr "Измените имя узла"
+
+#: ../clients/tui/nmtui-hostname.c:55
+msgid "Hostname"
+msgstr "Имя узла"
+
+#. Translators: this indicates the result. ie, "I have set the hostname to ..."
+#: ../clients/tui/nmtui-hostname.c:118
+#, c-format
+msgid "Set hostname to '%s'"
+msgstr "Изменить имя узла на «%s»"
+
+#: ../clients/tui/nmtui-hostname.c:120
+#, c-format
+msgid "Unable to set hostname: %s"
+msgstr "Не удалось установить имя узла: %s"
+
+#: ../clients/tui/nmtui.c:56 ../clients/tui/nmtui.c:59
+msgid "connection"
+msgstr "соединение"
+
+#: ../clients/tui/nmtui.c:57
+msgid "Edit a connection"
+msgstr "Изменить соединение"
+
+#: ../clients/tui/nmtui.c:60
+msgid "Activate a connection"
+msgstr "Подключиться"
+
+#: ../clients/tui/nmtui.c:62
+msgid "new hostname"
+msgstr "новое имя узла"
+
+#: ../clients/tui/nmtui.c:63
+msgid "Set system hostname"
+msgstr "Измените имя узла"
+
+#: ../clients/tui/nmtui.c:86
+msgid "NetworkManager TUI"
+msgstr "TUI NetworkManager"
+
+#: ../clients/tui/nmtui.c:94
+msgid "Please select an option"
+msgstr "Выберите вариант"
+
+#: ../clients/tui/nmtui.c:146
+msgid "Usage"
+msgstr "Использование"
+
+#: ../clients/tui/nmtui.c:227
+msgid "Could not parse arguments"
+msgstr "Не удалось обработать аргументы"
+
+#: ../clients/tui/nmtui.c:237
+#, fuzzy, c-format
+#| msgid "Could not activate connection: %s"
+msgid "Could not contact NetworkManager: %s.\n"
+msgstr "Не удалось подключиться к %s"
+
+#: ../clients/tui/nmtui.c:242
+msgid "NetworkManager is not running."
+msgstr "NetworkManager не работает."
+
+#: ../libnm-core/crypto.c:120 ../libnm-util/crypto.c:133
+#, c-format
+msgid "PEM key file had no end tag '%s'."
+msgstr "Файл ключа PEM не содержит завершающий тег «%s»."
+
+#: ../libnm-core/crypto.c:133 ../libnm-util/crypto.c:146
+#, c-format
+msgid "Doesn't look like a PEM private key file."
+msgstr "Возможно, это не файл личного ключа PEM."
+
+#: ../libnm-core/crypto.c:150 ../libnm-util/crypto.c:163
+#, c-format
+msgid "Malformed PEM file: Proc-Type was not first tag."
+msgstr "Некорректный файл PEM: Proc-Type не является первым тегом."
+
+#: ../libnm-core/crypto.c:158 ../libnm-util/crypto.c:171
+#, c-format
+msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
+msgstr "Некорректный файл PEM: неизвестный тег Proc-Type «%s»."
+
+#: ../libnm-core/crypto.c:168 ../libnm-util/crypto.c:181
+#, c-format
+msgid "Malformed PEM file: DEK-Info was not the second tag."
+msgstr "Некорректный файл PEM: DEK-Info не является вторым тегом."
+
+#: ../libnm-core/crypto.c:179 ../libnm-util/crypto.c:192
+#, c-format
+msgid "Malformed PEM file: no IV found in DEK-Info tag."
+msgstr "Некорректный файл PEM: в теге DEK-Info не найден ВИ."
+
+#: ../libnm-core/crypto.c:186 ../libnm-util/crypto.c:199
+#, c-format
+msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
+msgstr "Некорректный файл PEM: неверный формат ВИ в теге DEK-Info."
+
+#: ../libnm-core/crypto.c:201 ../libnm-util/crypto.c:214
+#, c-format
+msgid "Malformed PEM file: unknown private key cipher '%s'."
+msgstr "Некорректный файл PEM: неизвестный шифр личного ключа «%s»."
+
+#: ../libnm-core/crypto.c:220 ../libnm-util/crypto.c:233
+#, c-format
+msgid "Could not decode private key."
+msgstr "Не удалось расшифровать личный ключ."
+
+#: ../libnm-core/crypto.c:274 ../libnm-util/crypto.c:285
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "Не удалось найти открывающий тег PKCS#8."
+
+#: ../libnm-core/crypto.c:282 ../libnm-util/crypto.c:293
+#, c-format
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "Не удалось найти закрывающий тег PKCS#8 — «%s»."
+
+#: ../libnm-core/crypto.c:301 ../libnm-util/crypto.c:312
+msgid "Failed to decode PKCS#8 private key."
+msgstr "Не удалось расшифровать личный ключ PKCS#8."
+
+#: ../libnm-core/crypto.c:343 ../libnm-util/crypto.c:354
+#, c-format
+msgid "IV must be an even number of bytes in length."
+msgstr "Длина ВИ должна быть равна чётному количеству байт."
+
+#: ../libnm-core/crypto.c:357 ../libnm-util/crypto.c:368
+#, c-format
+msgid "IV contains non-hexadecimal digits."
+msgstr "ВИ включает не шестнадцатеричные цифры."
+
+#: ../libnm-core/crypto.c:397 ../libnm-core/crypto_gnutls.c:93
+#: ../libnm-core/crypto_gnutls.c:214 ../libnm-core/crypto_nss.c:115
+#: ../libnm-core/crypto_nss.c:280 ../libnm-util/crypto.c:408
+#: ../libnm-util/crypto_gnutls.c:146 ../libnm-util/crypto_gnutls.c:263
+#: ../libnm-util/crypto_nss.c:165 ../libnm-util/crypto_nss.c:326
+#, c-format
+msgid "Private key cipher '%s' was unknown."
+msgstr "Неизвестный шифр личного ключа «%s»."
+
+#: ../libnm-core/crypto.c:496 ../libnm-util/crypto.c:518
+#, c-format
+msgid "Unable to determine private key type."
+msgstr "Не удалось определить тип личного ключа."
+
+#: ../libnm-core/crypto.c:504
+#, c-format
+msgid "Password provided, but key was not encrypted."
+msgstr ""
+
+#: ../libnm-core/crypto.c:557 ../libnm-util/crypto.c:573
+#, c-format
+msgid "PEM certificate had no start tag '%s'."
+msgstr "Сертификат PEM не имеет тега начала «%s»."
+
+#: ../libnm-core/crypto.c:566 ../libnm-util/crypto.c:582
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "Сертификат PEM не имеет тега окончания «%s»."
+
+#: ../libnm-core/crypto.c:584 ../libnm-util/crypto.c:600
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "Не удалось расшифровать сертификат."
+
+#: ../libnm-core/crypto_gnutls.c:51 ../libnm-util/crypto_gnutls.c:51
+msgid "Failed to initialize the crypto engine."
+msgstr "Не удалось инициализировать криптографический модуль."
+
+#: ../libnm-core/crypto_gnutls.c:101 ../libnm-util/crypto_gnutls.c:154
+#, c-format
+msgid "Invalid IV length (must be at least %zd)."
+msgstr "Недопустимая длина ВИ (минимально %zd)."
+
+#: ../libnm-core/crypto_gnutls.c:112 ../libnm-util/crypto_gnutls.c:165
+#, c-format
+msgid "Failed to initialize the decryption cipher context: %s / %s."
+msgstr "Не удалось инициализировать контекст шифра декодирования: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:121 ../libnm-util/crypto_gnutls.c:174
+#, c-format
+msgid "Failed to set symmetric key for decryption: %s / %s."
+msgstr "Не удалось создать симметричный ключ для расшифровки: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:130 ../libnm-util/crypto_gnutls.c:183
+#, c-format
+msgid "Failed to set IV for decryption: %s / %s."
+msgstr "Не удалось создать ВИ для расшифровки: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:139 ../libnm-util/crypto_gnutls.c:192
+#, c-format
+msgid "Failed to decrypt the private key: %s / %s."
+msgstr "Не удалось создать ВИ для расшифровки: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:149 ../libnm-core/crypto_nss.c:205
+#: ../libnm-util/crypto_gnutls.c:202 ../libnm-util/crypto_nss.c:255
+#, c-format
+msgid "Failed to decrypt the private key: unexpected padding length."
+msgstr "Не удалось расшифровать личный ключ: непредвиденная длина заполнения."
+
+#: ../libnm-core/crypto_gnutls.c:160 ../libnm-core/crypto_nss.c:216
+#: ../libnm-util/crypto_gnutls.c:213 ../libnm-util/crypto_nss.c:266
+#, c-format
+msgid "Failed to decrypt the private key."
+msgstr "Не удалось расшифровать личный ключ."
+
+#: ../libnm-core/crypto_gnutls.c:236 ../libnm-util/crypto_gnutls.c:285
+#, c-format
+msgid "Failed to initialize the encryption cipher context: %s / %s."
+msgstr "Не удалось инициализировать контекст кода шифрования: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:245 ../libnm-util/crypto_gnutls.c:294
+#, c-format
+msgid "Failed to set symmetric key for encryption: %s / %s."
+msgstr "Не удалось создать симметричный ключ для шифрования: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:255 ../libnm-util/crypto_gnutls.c:304
+#, c-format
+msgid "Failed to set IV for encryption: %s / %s."
+msgstr "Не удалось создать ВИ для шифрования: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:264 ../libnm-util/crypto_gnutls.c:313
+#, c-format
+msgid "Failed to encrypt the data: %s / %s."
+msgstr "Не удалось зашифровать данные: %s / %s."
+
+#: ../libnm-core/crypto_gnutls.c:307 ../libnm-util/crypto_gnutls.c:353
+#, c-format
+msgid "Error initializing certificate data: %s"
+msgstr "Ошибка инициализации данных сертификата: %s"
+
+#: ../libnm-core/crypto_gnutls.c:329 ../libnm-util/crypto_gnutls.c:375
+#, c-format
+msgid "Couldn't decode certificate: %s"
+msgstr "Не удалось расшифровать сертификат: %s"
 
-#: ../libnm-util/nm-setting-bridge.c:251
+#: ../libnm-core/crypto_gnutls.c:357 ../libnm-util/crypto_gnutls.c:399
 #, c-format
-msgid "value '%d' is out of range <%d-%d>"
-msgstr "знаÑ\87ение «%d» вÑ\8bÑ\85одиÑ\82 за пÑ\80еделÑ\8b допÑ\83Ñ\81Ñ\82имого диапазона: <%d-%d>"
+msgid "Couldn't initialize PKCS#12 decoder: %s"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c декодеÑ\80 PKCS#12: %s"
 
-#: ../libnm-util/nm-setting-cdma.c:170
-msgid "property is empty'"
-msgstr "пустое свойство"
+#: ../libnm-core/crypto_gnutls.c:370 ../libnm-util/crypto_gnutls.c:412
+#, c-format
+msgid "Couldn't decode PKCS#12 file: %s"
+msgstr "Не удалось расшифровать файл PKCS#12: %s"
 
-#: ../libnm-util/nm-setting-connection.c:734
+#: ../libnm-core/crypto_gnutls.c:382 ../libnm-util/crypto_gnutls.c:424
 #, c-format
-msgid "'%s' doesn't match the virtual interface name '%s'"
-msgstr "«%s» не соответствует виртуальному интерфейсу «%s»."
+msgid "Couldn't verify PKCS#12 file: %s"
+msgstr "Не удалось проверить файл PKCS#12: %s"
 
-#: ../libnm-util/nm-setting-connection.c:780
+#: ../libnm-core/crypto_gnutls.c:414 ../libnm-util/crypto_gnutls.c:452
 #, c-format
-msgid "requires presence of '%s' setting in the connection"
-msgstr "требует наличия  «%s» в определении соединения"
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "Не удалось инициализировать декодер PKCS#8: %s"
 
-#: ../libnm-util/nm-setting-connection.c:802
-msgid "IPv4 configuration is not allowed for slave"
-msgstr "Для подчиненных интерфейсов нельзя использовать конфигурацию IPv4"
+#: ../libnm-core/crypto_gnutls.c:437 ../libnm-util/crypto_gnutls.c:475
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "Не удалось расшифровать файл PKCS#12: %s"
 
-#: ../libnm-util/nm-setting-connection.c:815
-msgid "IPv6 configuration is not allowed for slave"
-msgstr "Для подчиненных интерфейсов нельзя использовать конфигурацию IPv6"
+#: ../libnm-core/crypto_nss.c:57 ../libnm-util/crypto_nss.c:56
+#, c-format
+msgid "Failed to initialize the crypto engine: %d."
+msgstr "Не удалось инициализировать криптографический модуль: %d."
 
-#: ../libnm-util/nm-setting-dcb.c:595
-msgid "flags invalid"
-msgstr "неверные флаги"
+#: ../libnm-core/crypto_nss.c:123 ../libnm-util/crypto_nss.c:173
+#, c-format
+msgid "Invalid IV length (must be at least %d)."
+msgstr "Недопустимая длина ВИ (минимально %d)."
 
-#: ../libnm-util/nm-setting-dcb.c:604
-msgid "flags invalid - disabled"
-msgstr "флаги не установлены или установлены неверно"
+#: ../libnm-core/crypto_nss.c:134 ../libnm-util/crypto_nss.c:184
+#, c-format
+msgid "Failed to initialize the decryption cipher slot."
+msgstr "Не удалось инициализировать слот шифра декодирования."
 
-#: ../libnm-util/nm-setting-dcb.c:630 ../libnm-util/nm-setting-dcb.c:679
-msgid "property invalid (not enabled)"
-msgstr "неверное свойство (отключено)"
+#: ../libnm-core/crypto_nss.c:144 ../libnm-util/crypto_nss.c:194
+#, c-format
+msgid "Failed to set symmetric key for decryption."
+msgstr "Не удалось задать симметричный ключ расшифровки."
 
-#: ../libnm-util/nm-setting-dcb.c:639
-msgid "element invalid"
-msgstr "недопустимый элемент"
+#: ../libnm-core/crypto_nss.c:154 ../libnm-util/crypto_nss.c:204
+#, c-format
+msgid "Failed to set IV for decryption."
+msgstr "Не удалось задать ВИ расшифровки."
 
-#: ../libnm-util/nm-setting-dcb.c:654
-msgid "sum not 100%"
-msgstr "сумма не равна 100%"
+#: ../libnm-core/crypto_nss.c:162 ../libnm-util/crypto_nss.c:212
+#, c-format
+msgid "Failed to initialize the decryption context."
+msgstr "Не удалось инициализировать контекст расшифровки."
 
-#: ../libnm-util/nm-setting-dcb.c:688 ../libnm-util/nm-setting-dcb.c:720
-msgid "property invalid"
-msgstr "неверное свойство"
+#: ../libnm-core/crypto_nss.c:175 ../libnm-util/crypto_nss.c:225
+#, c-format
+msgid "Failed to decrypt the private key: %d."
+msgstr "Не удалось расшифровать личный ключ: %d."
 
-#: ../libnm-util/nm-setting-dcb.c:710
-msgid "property missing"
-msgstr "свойство не определено"
+#: ../libnm-core/crypto_nss.c:183 ../libnm-util/crypto_nss.c:233
+#, c-format
+msgid "Failed to decrypt the private key: decrypted data too large."
+msgstr ""
+"Не удалось расшифровать личный ключ: слишком большой объем расшифрованных "
+"данных."
 
-#: ../libnm-util/nm-setting-gsm.c:297
+#: ../libnm-core/crypto_nss.c:194 ../libnm-util/crypto_nss.c:244
 #, c-format
-msgid "property value '%s' is empty or too long (>64)"
-msgstr "пÑ\83Ñ\81Ñ\82ое знаÑ\87ение «%s» или Ñ\81войÑ\81Ñ\82во не опÑ\80еделено (>64)"
+msgid "Failed to finalize decryption of the private key: %d."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c завеÑ\80Ñ\88иÑ\82Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\84Ñ\80овкÑ\83 лиÑ\87ного клÑ\8eÑ\87а: %d."
 
-#: ../libnm-util/nm-setting-gsm.c:329
+#: ../libnm-core/crypto_nss.c:302 ../libnm-util/crypto_nss.c:348
 #, c-format
-msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
-msgstr "«%s» содержит недопустимые символы. Используйте [A-Za-z._-]."
+msgid "Failed to initialize the encryption cipher slot."
+msgstr "Не удалось инициализировать слот шифра декодирования."
 
-#: ../libnm-util/nm-setting-gsm.c:364
+#: ../libnm-core/crypto_nss.c:310 ../libnm-util/crypto_nss.c:356
 #, c-format
-msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "«%s» должно содержать 5-6 цифр"
+msgid "Failed to set symmetric key for encryption."
+msgstr "Не удалось задать симметричный ключ для шифрования."
 
-#: ../libnm-util/nm-setting-infiniband.c:228
-msgid "not a valid interface name"
-msgstr "недействительное имя интерфейса"
+#: ../libnm-core/crypto_nss.c:318 ../libnm-util/crypto_nss.c:364
+#, c-format
+msgid "Failed to set IV for encryption."
+msgstr "Не удалось задать ВИ расшифровки."
 
-#: ../libnm-util/nm-setting-infiniband.c:236
-msgid "Must specify a P_Key if specifying parent"
-msgstr "При определении родительского интерфейса необходимо определить P_Key"
+#: ../libnm-core/crypto_nss.c:326 ../libnm-util/crypto_nss.c:372
+#, c-format
+msgid "Failed to initialize the encryption context."
+msgstr "Не удалось инициализировать контекст шифрования."
 
-#: ../libnm-util/nm-setting-infiniband.c:246
-msgid "InfiniBand P_Key connection did not specify parent interface name"
-msgstr "InfiniBand P_Key не содержит имя родительского интерфеса"
+#: ../libnm-core/crypto_nss.c:334 ../libnm-util/crypto_nss.c:380
+#, c-format
+msgid "Failed to encrypt: %d."
+msgstr "Не удалось зашифровать: %d."
 
-#: ../libnm-util/nm-setting-ip4-config.c:726
-#: ../libnm-util/nm-setting-ip4-config.c:736
-#: ../libnm-util/nm-setting-ip4-config.c:746
-#: ../libnm-util/nm-setting-ip6-config.c:709
-#: ../libnm-util/nm-setting-ip6-config.c:719
-#: ../libnm-util/nm-setting-ip6-config.c:729
+#: ../libnm-core/crypto_nss.c:342 ../libnm-util/crypto_nss.c:388
 #, c-format
-msgid "this property is not allowed for '%s=%s'"
-msgstr "это свойство не может использоваться для «%s=%s»"
+msgid "Unexpected amount of data after encrypting."
+msgstr "Непредвиденный объём данных после шифрования."
 
-#: ../libnm-util/nm-setting-ip4-config.c:789
+#: ../libnm-core/crypto_nss.c:385 ../libnm-util/crypto_nss.c:428
 #, c-format
-msgid "%d. IPv4 address is invalid"
-msgstr "%d. Неверный адрес IPv4"
+msgid "Couldn't decode certificate: %d"
+msgstr "Не удалось расшифровать сертификат: %d"
 
-#: ../libnm-util/nm-setting-ip4-config.c:799
+#: ../libnm-core/crypto_nss.c:423
 #, c-format
-msgid "%d. IPv4 address has invalid prefix"
-msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
+msgid "Password must be UTF-8"
+msgstr ""
 
-#: ../libnm-util/nm-setting-ip4-config.c:815
+#: ../libnm-core/crypto_nss.c:453 ../libnm-util/crypto_nss.c:491
 #, c-format
-msgid "%d. route is invalid"
-msgstr "%d. Неверный маршрут"
+msgid "Couldn't initialize PKCS#12 decoder: %d"
+msgstr "Не удалось инициализировать декодер PKCS#12: %d"
 
-#: ../libnm-util/nm-setting-ip4-config.c:825
+#: ../libnm-core/crypto_nss.c:462 ../libnm-util/crypto_nss.c:500
 #, c-format
-msgid "%d. route has invalid prefix"
-msgstr "%d. Маршрут содержит недопустимый префикс"
+msgid "Couldn't decode PKCS#12 file: %d"
+msgstr "Не удалось расшифровать файл PKCS#12: %d"
 
-#: ../libnm-util/nm-setting-ip6-config.c:708
+#: ../libnm-core/crypto_nss.c:471 ../libnm-util/crypto_nss.c:509
 #, c-format
-msgid "'%s' not allowed for %s=%s"
-msgstr "«%s» не может использоваться для  «%s=%s»"
+msgid "Couldn't verify PKCS#12 file: %d"
+msgstr "Не удалось проверить файл PKCS#12: %d"
 
-#: ../libnm-util/nm-setting-olpc-mesh.c:136
-#: ../libnm-util/nm-setting-wireless.c:706
-msgid "SSID length is out of range <1-32> bytes"
-msgstr "Длина SSID  должна быть в пределах от 1 до 32 байт."
+#: ../libnm-core/crypto_nss.c:522 ../libnm-util/crypto_nss.c:553
+msgid "Could not generate random data."
+msgstr "Ошибка при генерации случайных данных."
+
+#: ../libnm-core/nm-connection.c:225
+msgid "wrong type; should be a list of strings."
+msgstr ""
+
+#: ../libnm-core/nm-connection.c:280
+#, fuzzy
+#| msgid "Error: unknown setting '%s'\n"
+msgid "unknown setting name"
+msgstr "Ошибка: неизвестный параметр: %s\n"
+
+#: ../libnm-core/nm-connection.c:804
+msgid "setting not found"
+msgstr ""
+
+#: ../libnm-core/nm-connection.c:868
+#, fuzzy
+#| msgid "Setting '%s' is not present in the connection.\n"
+msgid "setting not allowed in slave connection"
+msgstr "Параметр «%s» не определен в соединении.\n"
+
+#: ../libnm-core/nm-connection.c:879
+msgid "setting is required for non-slave connections"
+msgstr ""
+
+#: ../libnm-core/nm-connection.c:945
+#, fuzzy
+#| msgid "Unable to delete connection: %s"
+msgid "Unexpected failure to verify the connection"
+msgstr "Не удалось удалить соединение: %s"
+
+#: ../libnm-core/nm-connection.c:978
+#, fuzzy
+#| msgid "Unable to delete connection: %s"
+msgid "Unexpected failure to normalize the connection"
+msgstr "Не удалось удалить соединение: %s"
 
-#: ../libnm-util/nm-setting-olpc-mesh.c:145
-#: ../libnm-util/nm-setting-wireless.c:746
+#: ../libnm-core/nm-connection.c:1442 ../libnm-core/nm-setting-8021x.c:2275
+#: ../libnm-core/nm-setting-8021x.c:2292 ../libnm-core/nm-setting-8021x.c:2323
+#: ../libnm-core/nm-setting-8021x.c:2340 ../libnm-core/nm-setting-8021x.c:2382
+#: ../libnm-core/nm-setting-8021x.c:2394 ../libnm-core/nm-setting-8021x.c:2412
+#: ../libnm-core/nm-setting-8021x.c:2424 ../libnm-core/nm-setting-8021x.c:2448
+#: ../libnm-core/nm-setting-8021x.c:2630 ../libnm-core/nm-setting-adsl.c:190
+#: ../libnm-core/nm-setting-bluetooth.c:121
+#: ../libnm-core/nm-setting-bluetooth.c:139
+#: ../libnm-core/nm-setting-cdma.c:142
+#: ../libnm-core/nm-setting-connection.c:768
+#: ../libnm-core/nm-setting-connection.c:807
+#: ../libnm-core/nm-setting-connection.c:908
+#: ../libnm-core/nm-setting-ip-config.c:1841
+#: ../libnm-core/nm-setting-olpc-mesh.c:113
+#: ../libnm-core/nm-setting-pppoe.c:143 ../libnm-core/nm-setting-vpn.c:400
+#: ../libnm-core/nm-setting-wimax.c:117
+#: ../libnm-core/nm-setting-wireless-security.c:862
+#: ../libnm-core/nm-setting-wireless.c:712 ../libnm-util/nm-setting.c:1366
+#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1403
+#: ../libnm-util/nm-setting-8021x.c:2284 ../libnm-util/nm-setting-8021x.c:2301
+#: ../libnm-util/nm-setting-8021x.c:2342 ../libnm-util/nm-setting-8021x.c:2359
+#: ../libnm-util/nm-setting-8021x.c:2411 ../libnm-util/nm-setting-8021x.c:2423
+#: ../libnm-util/nm-setting-8021x.c:2441 ../libnm-util/nm-setting-8021x.c:2453
+#: ../libnm-util/nm-setting-8021x.c:2477 ../libnm-util/nm-setting-8021x.c:2655
+#: ../libnm-util/nm-setting-adsl.c:210
+#: ../libnm-util/nm-setting-bluetooth.c:143
+#: ../libnm-util/nm-setting-bluetooth.c:161
+#: ../libnm-util/nm-setting-cdma.c:163
+#: ../libnm-util/nm-setting-connection.c:769
+#: ../libnm-util/nm-setting-connection.c:785
+#: ../libnm-util/nm-setting-connection.c:846
+#: ../libnm-util/nm-setting-ip4-config.c:852
+#: ../libnm-util/nm-setting-ip6-config.c:833
+#: ../libnm-util/nm-setting-ip6-config.c:897
+#: ../libnm-util/nm-setting-olpc-mesh.c:124
+#: ../libnm-util/nm-setting-pppoe.c:164 ../libnm-util/nm-setting-vpn.c:424
+#: ../libnm-util/nm-setting-wimax.c:139
+#: ../libnm-util/nm-setting-wireless-security.c:892
+#: ../libnm-util/nm-setting-wireless.c:770
+msgid "property is missing"
+msgstr "свойство не определено"
+
+#: ../libnm-core/nm-setting-8021x.c:579 ../libnm-util/nm-setting-8021x.c:598
+msgid "CA certificate must be in X.509 format"
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:894 ../libnm-core/nm-setting-8021x.c:1158
+#: ../libnm-core/nm-setting-8021x.c:1478 ../libnm-util/nm-setting-8021x.c:916
+#: ../libnm-util/nm-setting-8021x.c:1179 ../libnm-util/nm-setting-8021x.c:1502
+#, fuzzy
+#| msgid "Error initializing certificate data: %s"
+msgid "invalid certificate format"
+msgstr "Ошибка инициализации данных сертификата: %s"
+
+#: ../libnm-core/nm-setting-8021x.c:1761 ../libnm-util/nm-setting-8021x.c:1771
+#, fuzzy
+#| msgid "invalid gateway '%s'"
+msgid "invalid private key"
+msgstr "недопустимый шлюз «%s»"
+
+#: ../libnm-core/nm-setting-8021x.c:2072 ../libnm-util/nm-setting-8021x.c:2082
+#, fuzzy
+#| msgid "Failed to decrypt the private key."
+msgid "invalid phase2 private key"
+msgstr "Не удалось расшифровать личный ключ."
+
+#: ../libnm-core/nm-setting-8021x.c:2282 ../libnm-core/nm-setting-8021x.c:2299
+#: ../libnm-core/nm-setting-8021x.c:2330 ../libnm-core/nm-setting-8021x.c:2347
+#: ../libnm-core/nm-setting-8021x.c:2388 ../libnm-core/nm-setting-8021x.c:2400
+#: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2430
+#: ../libnm-core/nm-setting-8021x.c:2455 ../libnm-core/nm-setting-adsl.c:197
+#: ../libnm-core/nm-setting-adsl.c:206 ../libnm-core/nm-setting-cdma.c:158
+#: ../libnm-core/nm-setting-cdma.c:167
+#: ../libnm-core/nm-setting-connection.c:775
+#: ../libnm-core/nm-setting-connection.c:818
+#: ../libnm-core/nm-setting-gsm.c:226 ../libnm-core/nm-setting-gsm.c:283
+#: ../libnm-core/nm-setting-gsm.c:292
+#: ../libnm-core/nm-setting-ip-config.c:1848
+#: ../libnm-core/nm-setting-ip4-config.c:178
+#: ../libnm-core/nm-setting-pppoe.c:150 ../libnm-core/nm-setting-pppoe.c:159
+#: ../libnm-core/nm-setting-vpn.c:409 ../libnm-core/nm-setting-vpn.c:419
+#: ../libnm-core/nm-setting-wimax.c:126
+#: ../libnm-core/nm-setting-wireless-security.c:892
+#: ../libnm-core/nm-setting-wireless-security.c:900
+#: ../libnm-core/nm-setting-wireless-security.c:924
+#: ../libnm-util/nm-setting-8021x.c:2291 ../libnm-util/nm-setting-8021x.c:2308
+#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2366
+#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
+#: ../libnm-util/nm-setting-8021x.c:2447 ../libnm-util/nm-setting-8021x.c:2459
+#: ../libnm-util/nm-setting-8021x.c:2484 ../libnm-util/nm-setting-adsl.c:217
+#: ../libnm-util/nm-setting-adsl.c:226 ../libnm-util/nm-setting-cdma.c:179
+#: ../libnm-util/nm-setting-cdma.c:188
+#: ../libnm-util/nm-setting-connection.c:776
+#: ../libnm-util/nm-setting-connection.c:853
+#: ../libnm-util/nm-setting-gsm.c:283 ../libnm-util/nm-setting-gsm.c:340
+#: ../libnm-util/nm-setting-gsm.c:349
+#: ../libnm-util/nm-setting-ip4-config.c:917
+#: ../libnm-util/nm-setting-ip4-config.c:926
+#: ../libnm-util/nm-setting-pppoe.c:171 ../libnm-util/nm-setting-pppoe.c:180
+#: ../libnm-util/nm-setting-vpn.c:433 ../libnm-util/nm-setting-vpn.c:443
+#: ../libnm-util/nm-setting-wimax.c:148
+#: ../libnm-util/nm-setting-wireless-security.c:922
+#: ../libnm-util/nm-setting-wireless-security.c:930
+#: ../libnm-util/nm-setting-wireless-security.c:954
+msgid "property is empty"
+msgstr "пустое свойство"
+
+#: ../libnm-core/nm-setting-8021x.c:2312 ../libnm-core/nm-setting-8021x.c:2360
+#: ../libnm-util/nm-setting-8021x.c:2319 ../libnm-util/nm-setting-8021x.c:2331
+#: ../libnm-util/nm-setting-8021x.c:2377 ../libnm-util/nm-setting-8021x.c:2389
 #, c-format
-msgid "'%d' is not a valid channel"
-msgstr "Недопустимый канал  «%d»."
+msgid "has to match '%s' property for PKCS#12"
+msgstr "должно соответствовать свойству «%s» для PKCS#12"
+
+#: ../libnm-core/nm-setting-8021x.c:2605 ../libnm-core/nm-setting-8021x.c:2639
+#: ../libnm-core/nm-setting-bluetooth.c:130
+#: ../libnm-core/nm-setting-infiniband.c:193
+#: ../libnm-core/nm-setting-infiniband.c:208
+#: ../libnm-core/nm-setting-ip4-config.c:169
+#: ../libnm-core/nm-setting-ip6-config.c:166
+#: ../libnm-core/nm-setting-olpc-mesh.c:142
+#: ../libnm-core/nm-setting-wimax.c:135 ../libnm-core/nm-setting-wired.c:618
+#: ../libnm-core/nm-setting-wired.c:628
+#: ../libnm-core/nm-setting-wireless-security.c:943
+#: ../libnm-core/nm-setting-wireless-security.c:952
+#: ../libnm-core/nm-setting-wireless-security.c:960
+#: ../libnm-core/nm-setting-wireless-security.c:968
+#: ../libnm-core/nm-setting-wireless-security.c:976
+#: ../libnm-core/nm-setting-wireless-security.c:985
+#: ../libnm-core/nm-setting-wireless-security.c:994
+#: ../libnm-core/nm-setting-wireless-security.c:1003
+#: ../libnm-core/nm-setting-wireless-security.c:1039
+#: ../libnm-core/nm-setting-wireless-security.c:1049
+#: ../libnm-core/nm-setting-wireless.c:773
+#: ../libnm-core/nm-setting-wireless.c:782
+#: ../libnm-core/nm-setting-wireless.c:791 ../libnm-util/nm-setting.c:1376
+#: ../libnm-util/nm-setting.c:1394 ../libnm-util/nm-setting.c:1413
+#: ../libnm-util/nm-setting-8021x.c:2630 ../libnm-util/nm-setting-8021x.c:2664
+#: ../libnm-util/nm-setting-bluetooth.c:152
+#: ../libnm-util/nm-setting-infiniband.c:206
+#: ../libnm-util/nm-setting-infiniband.c:222
+#: ../libnm-util/nm-setting-ip4-config.c:908
+#: ../libnm-util/nm-setting-ip6-config.c:888
+#: ../libnm-util/nm-setting-olpc-mesh.c:152
+#: ../libnm-util/nm-setting-wimax.c:157 ../libnm-util/nm-setting-wired.c:659
+#: ../libnm-util/nm-setting-wired.c:668
+#: ../libnm-util/nm-setting-wireless-security.c:973
+#: ../libnm-util/nm-setting-wireless-security.c:982
+#: ../libnm-util/nm-setting-wireless-security.c:990
+#: ../libnm-util/nm-setting-wireless-security.c:998
+#: ../libnm-util/nm-setting-wireless-security.c:1006
+#: ../libnm-util/nm-setting-wireless-security.c:1015
+#: ../libnm-util/nm-setting-wireless-security.c:1024
+#: ../libnm-util/nm-setting-wireless-security.c:1033
+#: ../libnm-util/nm-setting-wireless-security.c:1069
+#: ../libnm-util/nm-setting-wireless-security.c:1079
+#: ../libnm-util/nm-setting-wireless.c:830
+#: ../libnm-util/nm-setting-wireless.c:839
+#: ../libnm-util/nm-setting-wireless.c:848
+msgid "property is invalid"
+msgstr "неверное свойство"
 
-#: ../libnm-util/nm-setting-ppp.c:390
+#: ../libnm-core/nm-setting-8021x.c:2664 ../libnm-core/nm-setting-8021x.c:2674
+#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2694
+#: ../libnm-core/nm-setting-8021x.c:2704 ../libnm-core/nm-setting-adsl.c:218
+#: ../libnm-core/nm-setting-adsl.c:230
+#: ../libnm-core/nm-setting-bluetooth.c:147
+#: ../libnm-core/nm-setting-wireless-security.c:871
+#: ../libnm-util/nm-setting-8021x.c:2689 ../libnm-util/nm-setting-8021x.c:2699
+#: ../libnm-util/nm-setting-8021x.c:2709 ../libnm-util/nm-setting-8021x.c:2719
+#: ../libnm-util/nm-setting-8021x.c:2729 ../libnm-util/nm-setting-adsl.c:238
+#: ../libnm-util/nm-setting-adsl.c:250
+#: ../libnm-util/nm-setting-bluetooth.c:169
+#: ../libnm-util/nm-setting-wireless-security.c:901
 #, c-format
-msgid "'%d' is out of valid range <128-16384>"
-msgstr "«%d» выходит за пределы диапазона  <128-16384>"
+msgid "'%s' is not a valid value for the property"
+msgstr "«%s» — недопустимое значение свойства"
+
+#: ../libnm-core/nm-setting-bluetooth.c:169
+#, fuzzy, c-format
+#| msgid "requires '%s' or '%s' setting"
+msgid "'%s' connection requires '%s' or '%s' setting"
+msgstr "требует определения «%s» или  «%s»"
 
-#: ../libnm-util/nm-setting-ppp.c:403
+#: ../libnm-core/nm-setting-bond.c:455 ../libnm-util/nm-setting-bond.c:503
 #, c-format
-msgid "setting this property requires non-zero '%s' property"
-msgstr ""
-"для определения этого свойства необходимо, чтобы  «%s» имело ненулевое "
-"значение"
+msgid "invalid option '%s' or its value '%s'"
+msgstr "недопустимый параметр «%s» или его значение «%s»"
 
-#: ../libnm-util/nm-setting-vlan.c:497
+#: ../libnm-core/nm-setting-bond.c:474 ../libnm-util/nm-setting-bond.c:522
 #, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "Ð\97наÑ\87ение  «%s» не Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83еÑ\82  «%s=%s»"
+msgid "only one of '%s' and '%s' can be set"
+msgstr "Ð\9cожеÑ\82 бÑ\8bÑ\82Ñ\8c опÑ\80еделено Ñ\82олÑ\8cко одно из двÑ\83Ñ\85 â\80\94 «%s» или «%s»."
 
-#: ../libnm-util/nm-setting-vlan.c:508
+#: ../libnm-core/nm-setting-bond.c:486 ../libnm-util/nm-setting-bond.c:533
 #, c-format
-msgid "'%s' is neither an UUID nor an interface name"
-msgstr "«%s»  может содержать UUID или имя интерфейса."
+msgid "mandatory option '%s' is missing"
+msgstr "Обязательный параметр «%s» не определен."
 
-#: ../libnm-util/nm-setting-vlan.c:521
+#: ../libnm-core/nm-setting-bond.c:496 ../libnm-util/nm-setting-bond.c:542
 #, c-format
-msgid "property is not specified and neither is '%s:%s'"
-msgstr "Не определено свойство и «%s:%s»"
+msgid "'%s' is not a valid value for '%s'"
+msgstr "«%s» — недопустимое значение «%s» "
 
-#: ../libnm-util/nm-setting-vlan.c:534
-msgid "flags are invalid"
-msgstr "неверные флаги"
+#: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:555
+#, c-format
+msgid "'%s=%s' is incompatible with '%s > 0'"
+msgstr " «%s=%s» несовместимо с «%s > 0»"
 
-#: ../libnm-util/nm-setting-wired.c:562
+#: ../libnm-core/nm-setting-bond.c:523 ../libnm-util/nm-setting-bond.c:568
 #, c-format
-msgid "'%s' is not a valid ethernet port value"
-msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое знаÑ\87ение длÑ\8f поÑ\80Ñ\82а Ethernet:  «%s»"
+msgid "'%s' is not a valid interface name for '%s' option"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое имÑ\8f инÑ\82еÑ\80Ñ\84ейÑ\81а («%s») длÑ\8f паÑ\80амеÑ\82Ñ\80а «%s»"
 
-#: ../libnm-util/nm-setting-wired.c:572
+#: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:578
 #, c-format
-msgid "'%s' is not a valid duplex value"
-msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое дÑ\83плекÑ\81ное знаÑ\87ение:  «%s»"
+msgid "'%s' option is only valid for '%s=%s'"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80 «%s» дейÑ\81Ñ\82виÑ\82елен Ñ\82олÑ\8cко длÑ\8f «%s=%s»."
 
-#: ../libnm-util/nm-setting-wired.c:582 ../libnm-util/nm-setting-wired.c:640
-msgid "is not a valid MAC address"
-msgstr "недопустимый MAC-адрес"
+#: ../libnm-core/nm-setting-bond.c:546 ../libnm-util/nm-setting-bond.c:591
+#, c-format
+msgid "'%s=%s' is not a valid configuration for '%s'"
+msgstr "Недопустимая конфигурация («%s=%s») для «%s»"
 
-#: ../libnm-util/nm-setting-wired.c:595
-#: ../libnm-util/nm-setting-wireless.c:787
-#: ../libnm-util/nm-setting-wireless.c:801
+#: ../libnm-core/nm-setting-bond.c:559 ../libnm-core/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:588 ../libnm-core/nm-setting-bond.c:624
+#: ../libnm-util/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:613
+#: ../libnm-util/nm-setting-bond.c:633 ../libnm-util/nm-setting-bond.c:669
 #, c-format
-msgid "'%s' is not a valid MAC address"
-msgstr "Недействительный MAC-адрес:  «%s»"
+msgid "'%s' option requires '%s' option to be set"
+msgstr " Для «%s» необходимо, чтобы был определен параметр «%s»"
 
-#: ../libnm-util/nm-setting-wired.c:629
+#: ../libnm-core/nm-setting-bond.c:599 ../libnm-util/nm-setting-bond.c:644
 #, c-format
-msgid "invalid '%s' or its value '%s'"
-msgstr "недопÑ\83Ñ\81Ñ\82имÑ\8bй паÑ\80амеÑ\82Ñ\80  «%s» или его знаÑ\87ение  «%s»"
+msgid "'%s' option is empty"
+msgstr "Ð\9fÑ\83Ñ\81Ñ\82ой паÑ\80амеÑ\82Ñ\80: «%s»"
 
-#: ../libnm-util/nm-setting-wireless-security.c:816
+#: ../libnm-core/nm-setting-bond.c:611 ../libnm-util/nm-setting-bond.c:656
 #, c-format
-msgid "'%s' security requires '%s=%s'"
-msgstr "Ð\94лÑ\8f заÑ\89иÑ\82Ñ\8b «%s» необÑ\85одимо вÑ\8bÑ\80ажение  «%s=%s»"
+msgid "'%s' is not a valid IPv4 address for '%s' option"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имÑ\8bй адÑ\80еÑ\81 IPv4 («%s») длÑ\8f «%s»."
 
-#: ../libnm-util/nm-setting-wireless-security.c:845
+#: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:683
+#, fuzzy, c-format
+#| msgid "'%s' option is only valid for '%s=%s'"
+msgid "'%s' option is only valid with mode '%s'"
+msgstr "Параметр «%s» действителен только для «%s=%s»."
+
+#: ../libnm-core/nm-setting-bond.c:653
+#, fuzzy, c-format
+#| msgid "'%s' option is empty"
+msgid "'%s' option should be string"
+msgstr "Пустой параметр: «%s»"
+
+#: ../libnm-core/nm-setting-bridge-port.c:125
+#: ../libnm-core/nm-setting-bridge-port.c:137
+#: ../libnm-util/nm-setting-bridge-port.c:155
+#: ../libnm-util/nm-setting-bridge-port.c:167
 #, c-format
-msgid "'%s' security requires '%s' setting presence"
-msgstr "Ð\94лÑ\8f заÑ\89иÑ\82Ñ\8b «%s» необÑ\85одимо опÑ\80еделиÑ\82Ñ\8c  «%s»"
+msgid "'%d' is not a valid value for the property (should be <= %d)"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое знаÑ\87ение Ñ\81войÑ\81Ñ\82ва: «%d» (должно бÑ\8bÑ\82Ñ\8c <= %d)."
 
-#: ../libnm-util/nm-setting-wireless-security.c:866
+#: ../libnm-core/nm-setting-bridge-port.c:155
+#: ../libnm-core/nm-setting-team-port.c:98
+#, fuzzy, c-format
+#| msgid "requires '%s' or '%s' setting"
+msgid "missing setting"
+msgstr "требует определения «%s» или  «%s»"
+
+#: ../libnm-core/nm-setting-bridge-port.c:166
+#: ../libnm-core/nm-setting-team-port.c:109
 #, c-format
-msgid "'%d' value is out of range <0-3>"
-msgstr "Допустимые значения «%d»: <0-3>"
+msgid ""
+"A connection with a '%s' setting must have the slave-type set to '%s'. "
+"Instead it is '%s'"
+msgstr ""
 
-#: ../libnm-util/nm-setting-wireless-security.c:963
+#: ../libnm-core/nm-setting-bridge.c:228 ../libnm-util/nm-setting-bridge.c:270
 #, c-format
-msgid "'%s' connections require '%s' in this property"
-msgstr "Соединения  «%s» требуют, чтобы свойство содержало  «%s»"
+msgid "value '%d' is out of range <%d-%d>"
+msgstr "значение «%d» выходит за пределы допустимого диапазона: <%d-%d>"
+
+#: ../libnm-core/nm-setting-bridge.c:245 ../libnm-core/nm-setting-wired.c:592
+#: ../libnm-core/nm-setting-wired.c:652 ../libnm-util/nm-setting-bridge.c:287
+#: ../libnm-util/nm-setting-wired.c:634 ../libnm-util/nm-setting-wired.c:692
+msgid "is not a valid MAC address"
+msgstr "недопустимый MAC-адрес"
+
+#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-util/nm-setting-cdma.c:170
+msgid "property is empty'"
+msgstr "пустое свойство"
+
+#: ../libnm-core/nm-setting-connection.c:747
+#, fuzzy, c-format
+#| msgid "Could not create editor for connection '%s' of type '%s'."
+msgid "setting required for connection of type '%s'"
+msgstr "Не удалось открыть окно редактора для соединения  «%s» типа  «%s»."
+
+#: ../libnm-core/nm-setting-connection.c:828
+#, fuzzy, c-format
+#| msgid "index '%s' is not valid"
+msgid "connection type '%s' is not valid"
+msgstr "Недопустимый индекс  «%s»."
+
+#: ../libnm-core/nm-setting-connection.c:863
+#: ../libnm-util/nm-setting-connection.c:878
+#, fuzzy, c-format
+#| msgid "Unknown log level '%s'"
+msgid "Unknown slave type '%s'"
+msgstr "Неизвестный уровень журналирования «%s»"
+
+#: ../libnm-core/nm-setting-connection.c:873
+#: ../libnm-util/nm-setting-connection.c:888
+#, fuzzy, c-format
+#| msgid "Shared connection service failed"
+msgid "Slave connections need a valid '%s' property"
+msgstr "Сбой службы общего подключения"
+
+#: ../libnm-core/nm-setting-connection.c:894
+#: ../libnm-util/nm-setting-connection.c:898
+#, fuzzy, c-format
+#| msgid "not saved, "
+msgid "Cannot set '%s' without '%s'"
+msgstr "не сохранено,"
+
+#: ../libnm-core/nm-setting-connection.c:917
+#, c-format
+msgid "property type should be set to '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-setting-connection.c:932
+#, fuzzy, c-format
+#| msgid "requires presence of '%s' setting in the connection"
+msgid "slave-type '%s' requires a '%s' setting in the connection"
+msgstr "требует наличия  «%s» в определении соединения"
+
+#: ../libnm-core/nm-setting-connection.c:942
+#, c-format
+msgid ""
+"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
+"set to '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-setting-dcb.c:523 ../libnm-util/nm-setting-dcb.c:595
+msgid "flags invalid"
+msgstr "неверные флаги"
+
+#: ../libnm-core/nm-setting-dcb.c:532 ../libnm-util/nm-setting-dcb.c:604
+msgid "flags invalid - disabled"
+msgstr "флаги не установлены или установлены неверно"
+
+#: ../libnm-core/nm-setting-dcb.c:558 ../libnm-core/nm-setting-dcb.c:607
+#: ../libnm-util/nm-setting-dcb.c:630 ../libnm-util/nm-setting-dcb.c:679
+msgid "property invalid (not enabled)"
+msgstr "неверное свойство (отключено)"
+
+#: ../libnm-core/nm-setting-dcb.c:567 ../libnm-util/nm-setting-dcb.c:639
+msgid "element invalid"
+msgstr "недопустимый элемент"
+
+#: ../libnm-core/nm-setting-dcb.c:582 ../libnm-util/nm-setting-dcb.c:654
+msgid "sum not 100%"
+msgstr "сумма не равна 100%"
+
+#: ../libnm-core/nm-setting-dcb.c:616 ../libnm-core/nm-setting-dcb.c:648
+#: ../libnm-util/nm-setting-dcb.c:688 ../libnm-util/nm-setting-dcb.c:720
+msgid "property invalid"
+msgstr "неверное свойство"
+
+#: ../libnm-core/nm-setting-dcb.c:638 ../libnm-util/nm-setting-dcb.c:710
+msgid "property missing"
+msgstr "свойство не определено"
 
-#: ../libnm-util/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-gsm.c:239 ../libnm-util/nm-setting-gsm.c:296
 #, c-format
-msgid "'%s' can only be used with '%s=%s' (WEP)"
-msgstr " «%s» может использоваться только вместе с  «%s=%s» (WEP)"
+msgid "property value '%s' is empty or too long (>64)"
+msgstr "пустое значение «%s» или свойство не определено (>64)"
 
-#: ../libnm-util/nm-setting-wireless.c:715
+#: ../libnm-core/nm-setting-gsm.c:271 ../libnm-util/nm-setting-gsm.c:328
 #, c-format
-msgid "'%s' is not a valid Wi-Fi mode"
-msgstr "Недопустимый режим Wi-Fi:  «%s»"
+msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
+msgstr "«%s» содержит недопустимые символы. Используйте [A-Za-z._-]."
 
-#: ../libnm-util/nm-setting-wireless.c:725
+#: ../libnm-core/nm-setting-gsm.c:306 ../libnm-util/nm-setting-gsm.c:363
 #, c-format
-msgid "'%s' is not a valid band"
-msgstr "Недопустимый диапазон «%s»"
+msgid "'%s' length is invalid (should be 5 or 6 digits)"
+msgstr "«%s» должно содержать 5-6 цифр"
 
-#: ../libnm-util/nm-setting-wireless.c:735
-#, c-format
-msgid "requires setting '%s' property"
-msgstr "требует определения свойства «%s»"
+#: ../libnm-core/nm-setting-infiniband.c:218
+#: ../libnm-util/nm-setting-infiniband.c:232
+msgid "not a valid interface name"
+msgstr "недействительное имя интерфейса"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
-msgid "Enable or disable system networking"
-msgstr "Включение или выключение сетевой подсистемы"
+#: ../libnm-core/nm-setting-infiniband.c:226
+#: ../libnm-util/nm-setting-infiniband.c:240
+msgid "Must specify a P_Key if specifying parent"
+msgstr "При определении родительского интерфейса необходимо определить P_Key"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
-msgid "System policy prevents enabling or disabling system networking"
-msgstr ""
-"Системная политика препятствует включению или отключению сетевой подсистемы"
+#: ../libnm-core/nm-setting-infiniband.c:236
+#: ../libnm-util/nm-setting-infiniband.c:250
+msgid "InfiniBand P_Key connection did not specify parent interface name"
+msgstr "InfiniBand P_Key не содержит имя родительского интерфеса"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+#: ../libnm-core/nm-setting-infiniband.c:272
+#: ../libnm-util/nm-setting-infiniband.c:286
+#, c-format
 msgid ""
-"Put NetworkManager to sleep or wake it up (should only be used by system "
-"power management)"
+"interface name of software infiniband device must be '%s' or unset (instead "
+"it is '%s')"
 msgstr ""
-"Перевести NetworkManager в режим сна или пробудить его (должно "
-"использоваться только системой управления питанием)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+#: ../libnm-core/nm-setting-infiniband.c:287
+#, c-format
+msgid "mtu for transport mode '%s' can be at most %d but it is %d"
 msgstr ""
-"Системная политика не разрешает переводить NetworkManager в режим сна или "
-"пробуждать его"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
-msgid "Enable or disable WiFi devices"
-msgstr "Включить или выключить устройства WiFi"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
-msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "Системная политика запрещает включение и выключение WiFi устройств"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
-msgid "Enable or disable mobile broadband devices"
-msgstr "Включить или выключить устройства широкополосных мобильных сетей"
+#: ../libnm-core/nm-setting-ip-config.c:79
+#, fuzzy, c-format
+#| msgid "invalid IPv4 address '%s'"
+msgid "Invalid IPv4 address '%s'"
+msgstr "недопустимый адрес IPv4: «%s»"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
-msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr ""
-"Системная политика запрещает включение или выключение устройств "
-"широкополосной мобильной связи"
+#: ../libnm-core/nm-setting-ip-config.c:79
+#, fuzzy, c-format
+#| msgid "invalid IPv6 address '%s'"
+msgid "Invalid IPv6 address '%s"
+msgstr "недопустимый адрес IPv6: «%s»"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
-msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "Включить или выключить устройства мобильных сетей WiMax"
+#: ../libnm-core/nm-setting-ip-config.c:93
+#, fuzzy, c-format
+#| msgid "invalid IPv4 address '%s'"
+msgid "Invalid IPv4 address prefix '%u'"
+msgstr "недопустимый адрес IPv4: «%s»"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
-msgid ""
-"System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr ""
-"Системная политика запрещает включение или выключение устройств мобильной "
-"связи WiMAX"
+#: ../libnm-core/nm-setting-ip-config.c:93
+#, fuzzy, c-format
+#| msgid "invalid IPv6 address '%s'"
+msgid "Invalid IPv6 address prefix '%u"
+msgstr "недопустимый адрес IPv6: «%s»"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
-msgid "Allow control of network connections"
-msgstr "Разрешить контроль сетевых подключений"
+#: ../libnm-core/nm-setting-ip-config.c:111
+#, fuzzy, c-format
+#| msgid "invalid metric '%s'"
+msgid "Invalid routing metric '%s'"
+msgstr "недопустимая метрика «%s»"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
-msgid "System policy prevents control of network connections"
-msgstr "Системная политика запрещает управление подключениями."
+#: ../libnm-core/nm-setting-ip-config.c:1861
+#, fuzzy, c-format
+#| msgid "%d. IPv4 address is invalid"
+msgid "%d. DNS server address is invalid"
+msgstr "%d. Неверный адрес IPv4"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Совместное использование соединений в закрытой сети WiFi"
+#: ../libnm-core/nm-setting-ip-config.c:1877
+#, fuzzy, c-format
+#| msgid "%d. IPv4 address is invalid"
+msgid "%d. IP address is invalid"
+msgstr "%d. Неверный адрес IPv4"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
-msgid ""
-"System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Системная политика запрещает совместное использование соединений в закрытой "
-"сети WiFi"
+#: ../libnm-core/nm-setting-ip-config.c:1889
+#, fuzzy, c-format
+#| msgid "%d. IPv4 address has invalid prefix"
+msgid "%d. IP address has 'label' property with invalid type"
+msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
-msgid "Connection sharing via an open WiFi network"
-msgstr "Совместное использование соединений в открытой сети WiFi"
+#: ../libnm-core/nm-setting-ip-config.c:1898
+#, fuzzy, c-format
+#| msgid "%d. IPv4 address has invalid prefix"
+msgid "%d. IP address has invalid label '%s'"
+msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../libnm-core/nm-setting-ip-config.c:1912
+msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
-"Системная политика запрещает совместное использование соединений в открытой "
-"сети WiFi"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
-msgid "Modify personal network connections"
-msgstr "Редактировать личные настройки подключения"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
-msgid "System policy prevents modification of personal network settings"
-msgstr "Системная политика запрещает изменение персональных настроек сети"
+#: ../libnm-core/nm-setting-ip-config.c:1921
+#, fuzzy
+#| msgid "property is invalid"
+msgid "gateway is invalid"
+msgstr "неверное свойство"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
-msgid "Modify network connections for all users"
-msgstr "Изменить подключения доступные всем пользователям"
+#: ../libnm-core/nm-setting-ip-config.c:1935
+#: ../libnm-util/nm-setting-ip4-config.c:966
+#, c-format
+msgid "%d. route is invalid"
+msgstr "%d. Неверный маршрут"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
-msgid "System policy prevents modification of network settings for all users"
+#: ../libnm-core/nm-setting-ip-config.c:1944
+#, c-format
+msgid "%d. route cannot be a default route"
 msgstr ""
-"Системная политика запрещает изменение настроек для всех пользователей"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
-msgid "Modify persistent system hostname"
-msgstr "Изменить постоянное имя узла компьютера"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"Системная политика запрещает изменение постоянного имени узла компьютера"
+#: ../libnm-core/nm-setting-ip4-config.c:123
+#: ../libnm-core/nm-setting-ip6-config.c:121
+#: ../libnm-util/nm-setting-ip4-config.c:862
+#: ../libnm-util/nm-setting-ip6-config.c:843
+#, fuzzy, c-format
+#| msgid "this property is not allowed for '%s=%s'"
+msgid "this property cannot be empty for '%s=%s'"
+msgstr "это свойство не может использоваться для «%s=%s»"
 
-#: ../src/main.c:154
+#: ../libnm-core/nm-setting-ip4-config.c:135
+#: ../libnm-core/nm-setting-ip4-config.c:145
+#: ../libnm-core/nm-setting-ip4-config.c:157
+#: ../libnm-core/nm-setting-ip6-config.c:134
+#: ../libnm-core/nm-setting-ip6-config.c:144
+#: ../libnm-core/nm-setting-ip6-config.c:154
+#: ../libnm-util/nm-setting-ip4-config.c:874
+#: ../libnm-util/nm-setting-ip4-config.c:884
+#: ../libnm-util/nm-setting-ip4-config.c:896
+#: ../libnm-util/nm-setting-ip6-config.c:856
+#: ../libnm-util/nm-setting-ip6-config.c:866
+#: ../libnm-util/nm-setting-ip6-config.c:876
 #, c-format
-msgid "Opening %s failed: %s\n"
-msgstr "При открытии %s произошла ошибка: %s\n"
+msgid "this property is not allowed for '%s=%s'"
+msgstr "это свойство не может использоваться для «%s=%s»"
 
-#: ../src/main.c:160
+#: ../libnm-core/nm-setting-ip6-config.c:133
+#: ../libnm-util/nm-setting-ip6-config.c:855
 #, c-format
-msgid "Writing to %s failed: %s\n"
-msgstr "При записи в %s произошла ошибка: %s\n"
+msgid "'%s' not allowed for %s=%s"
+msgstr "«%s» не может использоваться для «%s=%s»"
 
-#: ../src/main.c:165
-#, c-format
-msgid "Closing %s failed: %s\n"
-msgstr "При закрытии %s произошла ошибка: %s\n"
+#: ../libnm-core/nm-setting-olpc-mesh.c:123
+#: ../libnm-core/nm-setting-wireless.c:722
+#: ../libnm-util/nm-setting-olpc-mesh.c:133
+#: ../libnm-util/nm-setting-wireless.c:779
+msgid "SSID length is out of range <1-32> bytes"
+msgstr "Длина SSID должна быть в пределах от 1 до 32 байт."
 
-#: ../src/main.c:208
+#: ../libnm-core/nm-setting-olpc-mesh.c:132
+#: ../libnm-core/nm-setting-wireless.c:762
+#: ../libnm-util/nm-setting-olpc-mesh.c:142
+#: ../libnm-util/nm-setting-wireless.c:819
 #, c-format
-msgid "NetworkManager is already running (pid %ld)\n"
-msgstr "NetworkManager уже запущен (pid %ld)\n"
-
-#: ../src/main.c:329
-msgid "Print NetworkManager version and exit"
-msgstr "Показать версию NetworkManager и выйти"
-
-#: ../src/main.c:330
-msgid "Don't become a daemon"
-msgstr "Не использовать в качестве службы"
-
-#: ../src/main.c:331
-msgid "Don't become a daemon, and log to stderr"
-msgstr "Не работать в режиме службы и не входить в stderr"
+msgid "'%d' is not a valid channel"
+msgstr "Недопустимый канал «%d»."
 
-#: ../src/main.c:332
+#: ../libnm-core/nm-setting-ppp.c:367 ../libnm-util/nm-setting-ppp.c:389
 #, c-format
-msgid "Log level: one of [%s]"
-msgstr "Уровень журнала: одно значение из  [%s]"
+msgid "'%d' is out of valid range <128-16384>"
+msgstr "«%d» выходит за пределы диапазона <128-16384>"
 
-#: ../src/main.c:334
+#: ../libnm-core/nm-setting-ppp.c:380 ../libnm-util/nm-setting-ppp.c:402
 #, c-format
-msgid "Log domains separated by ',': any combination of [%s]"
+msgid "setting this property requires non-zero '%s' property"
 msgstr ""
-"Ð\94оменÑ\8b жÑ\83Ñ\80налов должнÑ\8b бÑ\8bÑ\82Ñ\8c пеÑ\80еÑ\87иÑ\81ленÑ\8b Ñ\87еÑ\80ез запÑ\8fÑ\82Ñ\83Ñ\8e и могÑ\83Ñ\82 Ñ\81одеÑ\80жаÑ\82Ñ\8c "
-"лÑ\8eбÑ\83Ñ\8e комбинаÑ\86иÑ\8e  [%s]. "
+"длÑ\8f опÑ\80еделениÑ\8f Ñ\8dÑ\82ого Ñ\81войÑ\81Ñ\82ва необÑ\85одимо, Ñ\87Ñ\82обÑ\8b «%s» имело ненÑ\83левое "
+"знаÑ\87ение"
 
-#: ../src/main.c:336
-msgid "Make all warnings fatal"
-msgstr "Сделать все предупреждения критическими"
+#: ../libnm-core/nm-setting-vlan.c:516 ../libnm-util/nm-setting-vlan.c:557
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "Значение «%s» не соответствует «%s=%s»"
 
-#: ../src/main.c:337
-msgid "Specify the location of a PID file"
-msgstr "Укажите расположение PID файла"
+#: ../libnm-core/nm-setting-vlan.c:527 ../libnm-util/nm-setting-vlan.c:568
+#, c-format
+msgid "'%s' is neither an UUID nor an interface name"
+msgstr "«%s» может содержать UUID или имя интерфейса."
 
-#: ../src/main.c:337
-msgid "filename"
-msgstr "имя файла"
+#: ../libnm-core/nm-setting-vlan.c:541 ../libnm-util/nm-setting-vlan.c:581
+#, c-format
+msgid "property is not specified and neither is '%s:%s'"
+msgstr "Не определено свойство и «%s:%s»"
 
-#: ../src/main.c:338
-msgid "State file location"
-msgstr "РаÑ\81положение Ñ\84айла Ñ\81оÑ\81Ñ\82оÑ\8fниÑ\8f"
+#: ../libnm-core/nm-setting-vlan.c:554 ../libnm-util/nm-setting-vlan.c:594
+msgid "flags are invalid"
+msgstr "невеÑ\80нÑ\8bе Ñ\84лаги"
 
-#: ../src/main.c:338
-msgid "/path/to/state.file"
-msgstr "/путь/к/state.file"
+#: ../libnm-core/nm-setting-vpn.c:441
+#, fuzzy, c-format
+#| msgid "property is empty"
+msgid "secret was empty"
+msgstr "пустое свойство"
 
-#: ../src/main.c:364
-#, c-format
-msgid "GModules are not supported on your platform!\n"
-msgstr "GModules не поддерживаются на вашей платформе.\n"
+#: ../libnm-core/nm-setting-vpn.c:471
+msgid "setting contained a secret with an empty name"
+msgstr ""
 
-#: ../src/main.c:369
+#: ../libnm-core/nm-setting-vpn.c:479
 #, c-format
-msgid "You must be root to run NetworkManager!\n"
-msgstr "Для запуска NetworkManager, необходимы права администратора.\n"
+msgid "secret value was empty"
+msgstr ""
 
-#: ../src/main.c:392
-msgid ""
-"NetworkManager monitors all network connections and automatically\n"
-"chooses the best connection to use.  It also allows the user to\n"
-"specify wireless access points which wireless cards in the computer\n"
-"should associate with."
+#: ../libnm-core/nm-setting-vpn.c:526 ../libnm-core/nm-setting.c:1607
+msgid "not a secret property"
 msgstr ""
-"NetworkManager отслеживает все сетевые соединения и автоматически\n"
-"выбирает для использования наиболее подходящее соединение. А также позволяет\n"
-"пользователю задать беспроводным картам точки доступа, с которыми они \n"
-"должны ассоциироваться."
 
-#: ../src/main.c:398
-#, c-format
-msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+#: ../libnm-core/nm-setting-vpn.c:532
+msgid "secret is not of correct type"
 msgstr ""
-"Неверный параметр. Используйте --help для вывода списка возможных параметров."
-"\n"
 
-#: ../src/main.c:412
-#, c-format
-msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s. Используйте --help для вывода списка допустимых параметров.\n"
+#: ../libnm-core/nm-setting-vpn.c:567
+#, fuzzy, c-format
+#| msgid "Error: failed to remove value of '%s': %s\n"
+msgid "failed to convert value '%s' to uint"
+msgstr "Ошибка. Не удалось изменить значение  «%s»: %s\n"
 
-#: ../src/main.c:417
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "Неизвестные домены журналов «%s» в строке команды. Пропускаются...\n"
+#: ../libnm-core/nm-setting-vpn.c:575
+msgid "secret flags property not found"
+msgstr ""
 
-#: ../src/main.c:468
+#: ../libnm-core/nm-setting-wired.c:572 ../libnm-util/nm-setting-wired.c:614
 #, c-format
-msgid "Failed to read configuration: (%d) %s\n"
-msgstr "Не удалось прочитать конфигурацию: (%d) %s\n"
+#| msgid "'%s' is not a valid ethernet port value"
+msgid "'%s' is not a valid Ethernet port value"
+msgstr "«%s» не является допустимым значением порта Ethernet"
 
-#: ../src/main.c:482
+#: ../libnm-core/nm-setting-wired.c:582 ../libnm-util/nm-setting-wired.c:624
 #, c-format
-msgid "Error in configuration file: %s.\n"
-msgstr "Ошибка в файле конфигурации: %s\n"
+msgid "'%s' is not a valid duplex value"
+msgstr "«%s» не является допустимым значением дуплекса"
 
-#: ../src/main.c:487
+#: ../libnm-core/nm-setting-wired.c:641 ../libnm-util/nm-setting-wired.c:681
 #, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr ""
-"Неизвестный домен журналов «%s» в файле конфигурации. Пропускается...\n"
+msgid "invalid '%s' or its value '%s'"
+msgstr "недопустимый параметр «%s» или его значение «%s»"
 
-#: ../src/main.c:495
+#: ../libnm-core/nm-setting-wireless-security.c:883
+#: ../libnm-util/nm-setting-wireless-security.c:913
 #, c-format
-msgid "State file %s parsing failed: (%d) %s\n"
-msgstr "Сбой пÑ\80и Ñ\80азбоÑ\80е Ñ\84айла Ñ\81оÑ\81Ñ\82оÑ\8fниÑ\8f %s: (%d) %s\n"
+msgid "'%s' security requires '%s=%s'"
+msgstr "Ð\94лÑ\8f заÑ\89иÑ\82Ñ\8b «%s» необÑ\85одимо вÑ\8bÑ\80ажение «%s=%s»"
 
-#: ../src/main.c:508
+#: ../libnm-core/nm-setting-wireless-security.c:912
+#: ../libnm-util/nm-setting-wireless-security.c:942
 #, c-format
-msgid "Could not daemonize: %s [error %u]\n"
-msgstr "Ð\9dевозможно пÑ\80еобÑ\80азоваÑ\82Ñ\8c в Ñ\81лÑ\83жбÑ\83: %s [оÑ\88ибка %u]\n"
+msgid "'%s' security requires '%s' setting presence"
+msgstr "Ð\94лÑ\8f заÑ\89иÑ\82Ñ\8b «%s» необÑ\85одимо опÑ\80еделиÑ\82Ñ\8c «%s»"
 
-#: ../src/bluez-manager/nm-bluez-device.c:198
+#: ../libnm-core/nm-setting-wireless-security.c:933
+#: ../libnm-util/nm-setting-wireless-security.c:963
 #, c-format
-msgid "%s Network"
-msgstr "Сеть %s"
-
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:143
-msgid "# Created by NetworkManager\n"
-msgstr "# Создано в NetworkManager\n"
+msgid "'%d' value is out of range <0-3>"
+msgstr "Значение «%d» вне диапазона <0-3>"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:150
+#: ../libnm-core/nm-setting-wireless-security.c:1030
+#: ../libnm-util/nm-setting-wireless-security.c:1060
 #, c-format
-msgid "# Merged from %s\n"
-"\n"
-msgstr "# Объединено с %s\n"
-"\n"
-
-#: ../src/dhcp-manager/nm-dhcp-manager.c:313
-msgid "no usable DHCP client could be found."
-msgstr "не найден клиент DHCP."
-
-#: ../src/dhcp-manager/nm-dhcp-manager.c:322
-msgid "'dhclient' could be found."
-msgstr "«dhclient» не найден."
-
-#: ../src/dhcp-manager/nm-dhcp-manager.c:332
-msgid "'dhcpcd' could be found."
-msgstr "«dhcpcd» не найден."
+msgid "'%s' connections require '%s' in this property"
+msgstr "Соединения «%s» требуют «%s» в этот свойстве"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:340
+#: ../libnm-core/nm-setting-wireless-security.c:1060
+#: ../libnm-util/nm-setting-wireless-security.c:1090
 #, c-format
-msgid "unsupported DHCP client '%s'"
-msgstr "клиент DHCP «%s» не поддерживается"
-
-#: ../src/dns-manager/nm-dns-manager.c:401
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr ""
-"ЗАМЕЧАНИЕ: преобразователь имён glibc не поддерживает более трёх серверов "
-"имён."
-
-#: ../src/dns-manager/nm-dns-manager.c:403
-msgid "The nameservers listed below may not be recognized."
-msgstr "Нижеперечисленные серверы имён могут быть не распознаны."
+msgid "'%s' can only be used with '%s=%s' (WEP)"
+msgstr " «%s» может использоваться только вместе с «%s=%s» (WEP)"
 
-#: ../src/logging/nm-logging.c:149
+#: ../libnm-core/nm-setting-wireless.c:731
+#: ../libnm-util/nm-setting-wireless.c:788
 #, c-format
-msgid "Unknown log level '%s'"
-msgstr "Неизвестный уровень журналирования «%s»"
+msgid "'%s' is not a valid Wi-Fi mode"
+msgstr "«%s» не является допустимым режимом Wi-Fi"
 
-#: ../src/logging/nm-logging.c:226
+#: ../libnm-core/nm-setting-wireless.c:741
+#: ../libnm-util/nm-setting-wireless.c:798
 #, c-format
-msgid "Unknown log domain '%s'"
-msgstr "Неизвестный домен журналирования «%s»"
+msgid "'%s' is not a valid band"
+msgstr "«%s» не является допустимым диапазоном"
 
-#: ../src/config/nm-config.c:271
-msgid "Config file location"
-msgstr "Расположение файла конфигурации"
+#: ../libnm-core/nm-setting-wireless.c:751
+#, c-format
+#| msgid "requires setting '%s' property"
+msgid "'%s' requires setting '%s' property"
+msgstr "«%s» требует установки свойства «%s»"
 
-#: ../src/config/nm-config.c:271
-msgid "/path/to/config.file"
-msgstr "/путь/к/config.file"
+#: ../libnm-core/nm-setting.c:827
+#, c-format
+msgid "can't set property of type '%s' from value of type '%s'"
+msgstr ""
 
-#: ../src/config/nm-config.c:272
-msgid "Config directory location"
-msgstr "Путь к каталогу конфигурации"
+#: ../libnm-core/nm-setting.c:1505
+msgid "secret not found"
+msgstr ""
 
-#: ../src/config/nm-config.c:272
-msgid "/path/to/config/dir"
-msgstr "/путь/к/каталогу"
+#: ../libnm-core/nm-setting.c:1597
+msgid "secret is not set"
+msgstr ""
 
-#: ../src/config/nm-config.c:274
-msgid "List of plugins separated by ','"
-msgstr "Список модулей (через запятую)"
+#: ../libnm-core/nm-utils.c:2276 ../libnm-util/nm-utils.c:1813
+#, c-format
+msgid "Could not find \"%s\" binary"
+msgstr "Не удалось найти бинарный файл «%s»"
 
-#: ../src/config/nm-config.c:274
-msgid "plugin1,plugin2"
-msgstr "модуль1,модуль2"
+#: ../libnm-glib/nm-device.c:1793 ../libnm/nm-device.c:1615
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/config/nm-config.c:277
-msgid "An http(s) address for checking internet connectivity"
-msgstr "http(s) адрес для проверки соединения с Интернетом"
+#: ../libnm-glib/nm-device.c:1811 ../libnm/nm-device.c:1633
+msgid "ADSL"
+msgstr "ADSL"
 
-#: ../src/config/nm-config.c:278
-msgid "The interval between connectivity checks (in seconds)"
-msgstr "Ð\98нÑ\82еÑ\80вал междÑ\83 пÑ\80овеÑ\80ками Ñ\81оединениÑ\8f (в Ñ\81екÑ\83ндаÑ\85)"
+#: ../libnm-glib/nm-device.c:1839 ../libnm/nm-device.c:1661
+msgid "Wired"
+msgstr "Ð\9fÑ\80оводное"
 
-#: ../src/config/nm-config.c:279
-msgid "The expected start of the response"
-msgstr "Ожидается начало ответа"
+#: ../libnm-glib/nm-device.c:1870 ../libnm/nm-device.c:1692
+msgid "PCI"
+msgstr "PCI"
 
-#: ../src/config/nm-config.c:279
-msgid "Bingo!"
-msgstr "Бинго!"
+#: ../libnm-glib/nm-device.c:1872 ../libnm/nm-device.c:1694
+msgid "USB"
+msgstr "USB"
 
-#: ../src/modem-manager/nm-modem-broadband.c:459
-#: ../src/modem-manager/nm-modem-old.c:864 ../src/devices/nm-device-bt.c:333
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../libnm-glib/nm-device.c:1968 ../libnm-glib/nm-device.c:1987
+#: ../libnm/nm-device.c:1788 ../libnm/nm-device.c:1807
 #, c-format
-msgid "GSM connection %d"
-msgstr "Подключение GSM %d"
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
 
-#: ../src/modem-manager/nm-modem-broadband.c:481
-#: ../src/modem-manager/nm-modem-old.c:891 ../src/devices/nm-device-bt.c:337
-#, c-format
-msgid "CDMA connection %d"
-msgstr "Подключение CDMA %d"
+#: ../libnm-glib/nm-remote-connection.c:151
+#| msgid "disconnected"
+msgid "Disconnected by D-Bus"
+msgstr "Отключено через D-Bus"
 
-#: ../src/devices/nm-device-bond.c:146 ../tui/nm-editor-utils.c:204
+#: ../libnm-util/crypto_gnutls.c:88
 #, c-format
-msgid "Bond connection %d"
-msgstr "Ð\9fодклÑ\8eÑ\87ение Bond %d"
+msgid "Failed to initialize the MD5 engine: %s / %s."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c модÑ\83лÑ\8c MD5: %s / %s."
 
-#: ../src/devices/nm-device-adsl.c:150
+#: ../libnm-util/crypto_nss.c:102
 #, c-format
-msgid "ADSL connection %d"
-msgstr "Ð\9fодклÑ\8eÑ\87ение ADSL %d"
+msgid "Failed to initialize the MD5 context: %d."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c иниÑ\86иализиÑ\80оваÑ\82Ñ\8c конÑ\82екÑ\81Ñ\82 MD5: %d."
 
-#: ../src/devices/nm-device-bridge.c:143 ../tui/nm-editor-utils.c:214
+#: ../libnm-util/crypto_nss.c:463
 #, c-format
-msgid "Bridge connection %d"
-msgstr "Ð\9fодклÑ\8eÑ\87ение моÑ\81Ñ\82а %d"
+msgid "Couldn't convert password to UCS2: %d"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80еобÑ\80азоваÑ\82Ñ\8c паÑ\80олÑ\8c в UCS2: %d"
 
-#: ../src/devices/nm-device-bt.c:308
+#: ../libnm-util/nm-setting-bluetooth.c:187
 #, c-format
-msgid "PAN connection %d"
-msgstr "Подключение PAN %d"
+msgid "requires '%s' or '%s' setting"
+msgstr "требует определения «%s» или «%s»"
 
-#: ../src/devices/nm-device-bt.c:341
+#: ../libnm-util/nm-setting-connection.c:863
 #, c-format
-msgid "DUN connection %d"
-msgstr "Подключение DUN %d"
+msgid "requires presence of '%s' setting in the connection"
+msgstr "требует наличия «%s» в определении соединения"
 
-#: ../src/devices/nm-device-ethernet.c:1254
+#: ../libnm-util/nm-setting-ip4-config.c:940
 #, c-format
-msgid "PPPoE connection %d"
-msgstr "Подключение PPoE %d"
+msgid "%d. IPv4 address is invalid"
+msgstr "%d. Неверный адрес IPv4"
 
-#: ../src/devices/nm-device-ethernet.c:1254
-#: ../src/settings/nm-settings-utils.c:50
+#: ../libnm-util/nm-setting-ip4-config.c:950
 #, c-format
-msgid "Wired connection %d"
-msgstr "Проводное соединение %d"
+msgid "%d. IPv4 address has invalid prefix"
+msgstr "%d. Адрес IPv4 содержит недопустимый префикс"
 
-#: ../src/devices/nm-device-infiniband.c:270 ../tui/nm-editor-utils.c:177
+#: ../libnm-util/nm-setting-ip4-config.c:976
 #, c-format
-msgid "InfiniBand connection %d"
-msgstr "Подключение InfiniBand %d"
+msgid "%d. route has invalid prefix"
+msgstr "%d. Маршрут содержит недопустимый префикс"
 
-#: ../src/devices/nm-device-olpc-mesh.c:242
+#: ../libnm-util/nm-setting-vpn.c:583
 #, c-format
-msgid "Mesh %d"
-msgstr "Mesh %d"
+msgid "Failed to convert '%s' value '%s' to uint"
+msgstr ""
 
-#: ../src/devices/nm-device-team.c:158 ../tui/nm-editor-utils.c:223
+#: ../libnm-util/nm-setting-vpn.c:590
 #, c-format
-msgid "Team connection %d"
-msgstr "Групповое соединение %d"
+msgid "Secret flags property '%s' not found"
+msgstr ""
 
-#: ../src/devices/nm-device-vlan.c:255 ../tui/nm-editor-utils.c:231
+#: ../libnm-util/nm-setting-wireless.c:808
 #, c-format
-msgid "VLAN connection %d"
-msgstr "Подключение VLAN %d"
+msgid "requires setting '%s' property"
+msgstr "требует определения свойства «%s»"
 
-#: ../src/nm-manager.c:3420 ../tui/nm-editor-utils.c:246
-#, c-format
-msgid "VPN connection %d"
-msgstr "Подключение VPN %d"
+#: ../libnm/nm-device-adsl.c:73
+#, fuzzy
+#| msgid "connecting (starting secondary connections)"
+msgid "The connection was not an ADSL connection."
+msgstr "подключение (запуск второстепенных соединений)"
 
-#: ../src/nm-netlink-monitor.c:219
-msgid "error occurred while waiting for data on socket"
-msgstr "произошла ошибка при ожидании данных из сокета"
+#: ../libnm/nm-device-bond.c:115
+#, fuzzy
+#| msgid "connecting (starting secondary connections)"
+msgid "The connection was not a bond connection."
+msgstr "подключение (запуск второстепенных соединений)"
 
-#: ../src/nm-netlink-monitor.c:240
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "ошибка обработки сообщения netlink: %s"
+#: ../libnm/nm-device-bridge.c:115
+#, fuzzy
+#| msgid "connecting (starting secondary connections)"
+msgid "The connection was not a bridge connection."
+msgstr "подключение (запуск второстепенных соединений)"
 
-#: ../src/nm-netlink-monitor.c:264
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+#: ../libnm/nm-device-bt.c:140
+#, fuzzy, c-format
+#| msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
+msgid "The connection was not a Bluetooth connection."
+msgstr "Для соединений Bluetooth доступен один дополнительный аргумент.\n"
+
+#: ../libnm/nm-device-bt.c:149
+msgid "Invalid device Bluetooth address."
 msgstr ""
-"не удалось подключиться к netlink для отслеживания состояния соединения: %s"
 
-#: ../src/nm-netlink-monitor.c:275
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "не удалось включить передачу мандата идентификатора netlink: %s"
+#: ../libnm/nm-device-bt.c:156
+msgid "The Bluetooth addresses of the device and the connection didn't match."
+msgstr ""
 
-#: ../src/nm-netlink-monitor.c:319 ../src/nm-netlink-monitor.c:381
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../libnm/nm-device-bt.c:165
+msgid ""
+"The device is lacking Bluetooth capabilities required by the connection."
 msgstr ""
-"не удалось создать идентификатор netlink для отслеживания состояния "
-"соединения: %s"
 
-#: ../src/nm-netlink-monitor.c:469
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "не удалось войти в группу netlink: %s"
+#: ../libnm/nm-device-ethernet.c:138
+#, fuzzy
+#| msgid "There are 4 optional arguments for 'PPPoE' connection type.\n"
+msgid "The connection was not an Ethernet or PPPoE connection."
+msgstr ""
+"При настройке соединений PPPoE допускается использование четырех "
+"дополнительных аргументов.\n"
 
-#: ../src/nm-sleep-monitor-systemd.c:116
-msgid "NetworkManager needs to turn off networks"
-msgstr "NetworkManager должен отключить сети"
+#: ../libnm/nm-device-ethernet.c:154 ../libnm/nm-device-infiniband.c:105
+#: ../libnm/nm-device-wifi.c:492 ../libnm/nm-device-wimax.c:311
+#, fuzzy
+#| msgid "is not a valid MAC address"
+msgid "Invalid device MAC address."
+msgstr "недопустимый MAC-адрес"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:115
-msgid "System"
-msgstr "Система"
+#: ../libnm/nm-device-ethernet.c:160 ../libnm/nm-device-infiniband.c:113
+#: ../libnm/nm-device-wifi.c:499 ../libnm/nm-device-wimax.c:318
+msgid "The MACs of the device and the connection didn't match."
+msgstr ""
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4158 ../tui/nm-editor-utils.c:200
-#: ../tui/nm-ui-utils.c:349 ../tui/nm-ui-utils.c:574
-msgid "Bond"
-msgstr "Bond"
+#: ../libnm/nm-device-generic.c:92
+#, fuzzy
+#| msgid "connecting (starting secondary connections)"
+msgid "The connection was not a generic connection."
+msgstr "подключение (запуск второстепенных соединений)"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4240 ../tui/nm-editor-utils.c:218
-#: ../tui/nm-ui-utils.c:351 ../tui/nm-ui-utils.c:576
-msgid "Team"
-msgstr "Группа"
+#: ../libnm/nm-device-generic.c:99
+#, fuzzy
+#| msgid "InfiniBand P_Key connection did not specify parent interface name"
+msgid "The connection did not specify an interface name."
+msgstr "InfiniBand P_Key не содержит имя родительского интерфеса"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4424 ../tui/nm-editor-utils.c:209
-#: ../tui/nm-ui-utils.c:353 ../tui/nm-ui-utils.c:578
-msgid "Bridge"
-msgstr "Мост"
+#: ../libnm/nm-device-infiniband.c:97
+#, fuzzy
+#| msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
+msgid "The connection was not an InfiniBand connection."
+msgstr "Для соединений «InfiniBand» доступно пять дополнительных аргументов.\n"
 
-#: ../test/nm-online.c:73
-#, c-format
-msgid "\rConnecting"
-msgstr "Подключение..."
+#: ../libnm/nm-device-modem.c:123
+#, fuzzy
+#| msgid "the connection was removed"
+msgid "The connection was not a modem connection."
+msgstr "соединение удалено"
 
-#: ../test/nm-online.c:104
-msgid ""
-"Time to wait for a connection, in seconds (without the option, default value "
-"is 30)"
-msgstr "Ð\92Ñ\80емÑ\8f ожиданиÑ\8f Ñ\81оединениÑ\8f в Ñ\81екÑ\83ндаÑ\85 (по Ñ\83молÑ\87аниÑ\8e 30)"
+#: ../libnm/nm-device-modem.c:131
+#, fuzzy
+#| msgid "connecting (starting secondary connections)"
+msgid "The connection was not a valid modem connection."
+msgstr "подклÑ\8eÑ\87ение (запÑ\83Ñ\81к вÑ\82оÑ\80оÑ\81Ñ\82епеннÑ\8bÑ\85 Ñ\81оединений)"
 
-#: ../test/nm-online.c:105
-msgid "Exit immediately if NetworkManager is not running"
-msgstr "Выйти немедленно, если NetworkManager не запущен"
+#: ../libnm/nm-device-modem.c:138
+msgid "The device is lacking capabilities required by the connection."
+msgstr ""
 
-#: ../test/nm-online.c:106
-msgid "Don't print anything"
-msgstr "Ничего не выводить"
+#: ../libnm/nm-device-olpc-mesh.c:118
+#, fuzzy
+#| msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
+msgid "The connection was not an OLPC Mesh connection."
+msgstr "Для соединений «OLPC Mesh» доступно два дополнительных аргумента.\n"
 
-#: ../test/nm-online.c:124
-msgid ""
-"Waits for NetworkManager to finish activating startup network connections."
-msgstr "Ожидать успешного соединения в NetworkManager."
+#: ../libnm/nm-device-team.c:121
+#, fuzzy
+#| msgid "the connection was removed"
+msgid "The connection was not a team connection."
+msgstr "соединение удалено"
 
-#: ../test/nm-online.c:131 ../test/nm-online.c:141
-msgid "Invalid option.  Please use --help to see a list of valid options."
-msgstr "Неверный параметр. Используйте --help для вывода списка параметров."
+#: ../libnm/nm-device-vlan.c:131
+#, fuzzy
+#| msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
+msgid "The connection was not a VLAN connection."
+msgstr "Для соединений «VLAN» доступно четыре дополнительных аргумента.\n"
 
-#: ../tui/newt/nmt-newt-utils.c:168 ../tui/nmt-editor.c:231
-#: ../tui/nmt-password-dialog.c:175 ../tui/nmt-route-editor.c:135
-#: ../tui/nmtui-hostname.c:71 ../tui/nmtui.c:120
-msgid "OK"
-msgstr "OK"
+#: ../libnm/nm-device-vlan.c:138
+msgid "The VLAN identifiers of the device and the connection didn't match."
+msgstr ""
 
-#: ../tui/newt/nmt-newt-utils.c:316 ../tui/newt/nmt-newt-utils.c:348
-#, c-format
-msgid "Could not create temporary file: %s"
-msgstr "Не удалось создать временный файл: %s"
+#: ../libnm/nm-device-vlan.c:151
+msgid "The hardware address of the device and the connection didn't match."
+msgstr ""
 
-#: ../tui/newt/nmt-newt-utils.c:354
-#, c-format
-msgid "Editor failed: %s"
-msgstr "Ошибка редактора: %s"
+#: ../libnm/nm-device-wifi.c:483
+msgid "The connection was not a Wi-Fi connection."
+msgstr ""
 
-#: ../tui/newt/nmt-newt-utils.c:360
-#, c-format
-msgid "Could not re-read file: %s"
-msgstr "Не удалось заново прочитать файл: %s"
+#: ../libnm/nm-device-wifi.c:519
+msgid "The device is lacking WPA capabilities required by the connection."
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:160
-#, c-format
-msgid "Ethernet connection %d"
-msgstr "Проводное соединение %d"
+#: ../libnm/nm-device-wifi.c:526
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:168
-#, c-format
-msgid "Wi-Fi connection %d"
-msgstr "Соединение Wi-Fi %d"
+#: ../libnm/nm-device-wimax.c:302
+#, fuzzy
+#| msgid "There is 1 optional argument for 'WiMax' connection type.\n"
+msgid "The connection was not a WiMAX connection."
+msgstr "Для соединений «WiMax» доступен один дополнительный аргумент.\n"
 
-#: ../tui/nm-editor-utils.c:182 ../tui/nm-ui-utils.c:345
-msgid "Mobile Broadband"
-msgstr "Мобильное"
+#: ../libnm/nm-device.c:2152
+#, fuzzy, c-format
+#| msgid "Error: connection is not valid: %s\n"
+msgid "The connection was not valid: %s"
+msgstr "Ошибка. Недействительное соединение: %s\n"
 
-#: ../tui/nm-editor-utils.c:185
+#: ../libnm/nm-device.c:2161
 #, c-format
-msgid "Mobile broadband connection %d"
-msgstr "Мобильное соединение %d"
+msgid "The interface names of the device and the connection didn't match."
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:190
-msgid "DSL"
-msgstr "DSL"
+#: ../libnm/nm-manager.c:858
+#, fuzzy
+#| msgid "no active connection or device"
+msgid "Active connection could not be attached to the device"
+msgstr "на устройстве нет активных соединений"
 
-#: ../tui/nm-editor-utils.c:194
-#, c-format
-msgid "DSL connection %d"
-msgstr "DSL-соединение %d"
+#: ../libnm/nm-manager.c:1082
+#, fuzzy
+#| msgid "Active connection details"
+msgid "Active connection removed before it was initialized"
+msgstr "Сведения об активном соединении"
 
-#: ../tui/nm-ui-utils.c:316 ../tui/nm-ui-utils.c:385
-msgid "Wired"
-msgstr "Проводное"
+#: ../libnm/nm-object.c:1439 ../libnm/nm-object.c:1585
+msgid "Caller did not specify D-Bus path for object"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:339
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../libnm/nm-remote-settings.c:261
+msgid "Connection removed before it was initialized"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:341
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../libnm/nm-vpn-plugin-old.c:885
+#, fuzzy
+#| msgid "Error: No interface specified."
+msgid "No service name specified"
+msgstr "Ошибка. Интерфейс не определен."
 
-#: ../tui/nm-ui-utils.c:343
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "Включение или выключение сетевой подсистемы"
 
-#: ../tui/nm-ui-utils.c:357
-msgid "ADSL"
-msgstr "ADSL"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"Системная политика препятствует включению или отключению сетевой подсистемы"
 
-#: ../tui/nm-ui-utils.c:420
-msgid "PCI"
-msgstr "PCI"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"Перевести NetworkManager в режим сна или пробудить его (должно "
+"использоваться только системой управления питанием)"
 
-#: ../tui/nm-ui-utils.c:422
-msgid "USB"
-msgstr "USB"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"Системная политика не разрешает переводить NetworkManager в режим сна или "
+"пробуждать его"
 
-#: ../tui/nm-ui-utils.c:498 ../tui/nm-ui-utils.c:518
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "Включить или выключить устройства WiFi"
 
-#: ../tui/nmt-device-entry.c:391
-msgid "Select..."
-msgstr "Ð\92Ñ\8bбÑ\80аÑ\82Ñ\8c..."
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "СиÑ\81Ñ\82емнаÑ\8f полиÑ\82ика запÑ\80еÑ\89аеÑ\82 вклÑ\8eÑ\87ение и вÑ\8bклÑ\8eÑ\87ение WiFi Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82в"
 
-#: ../tui/nmt-edit-connection-list.c:129
-msgid "Add"
-msgstr "Ð\94обавиÑ\82Ñ\8c"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "Ð\92клÑ\8eÑ\87иÑ\82Ñ\8c или вÑ\8bклÑ\8eÑ\87иÑ\82Ñ\8c Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва Ñ\88иÑ\80окополоÑ\81нÑ\8bÑ\85 мобилÑ\8cнÑ\8bÑ\85 Ñ\81еÑ\82ей"
 
-#: ../tui/nmt-edit-connection-list.c:132 ../tui/nmt-page-ip4.c:172
-#: ../tui/nmt-page-ip6.c:170 ../tui/nmt-page-team-port.c:110
-#: ../tui/nmt-page-team.c:180
-msgid "Edit..."
-msgstr "Изменить..."
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"Системная политика запрещает включение или выключение устройств "
+"широкополосной мобильной связи"
 
-#: ../tui/nmt-edit-connection-list.c:135 ../tui/nmtui-edit.c:471
-msgid "Delete"
-msgstr "УдалиÑ\82Ñ\8c"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Ð\92клÑ\8eÑ\87иÑ\82Ñ\8c или вÑ\8bклÑ\8eÑ\87иÑ\82Ñ\8c Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва мобилÑ\8cнÑ\8bÑ\85 Ñ\81еÑ\82ей WiMax"
 
-#: ../tui/nmt-editor.c:81
-#, c-format
-msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "Не удалось открыть окно редактора для соединения  «%s» типа  «%s»."
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"Системная политика запрещает включение или выключение устройств мобильной "
+"связи WiMAX"
 
-#: ../tui/nmt-editor.c:85
-#, c-format
-msgid "Could not create editor for invalid connection '%s'."
-msgstr "Не удалось открыть окно редактора для неверного соединения  «%s»."
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "Разрешить контроль сетевых подключений"
 
-#: ../tui/nmt-editor.c:95
-msgid "Edit connection"
-msgstr "Ð\98змениÑ\82Ñ\8c Ñ\81оединение"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "СиÑ\81Ñ\82емнаÑ\8f полиÑ\82ика запÑ\80еÑ\89аеÑ\82 Ñ\83пÑ\80авление подклÑ\8eÑ\87ениÑ\8fми."
 
-#: ../tui/nmt-editor.c:134
-#, c-format
-msgid "Error saving connection: %s"
-msgstr "Ошибка при сохранении соединения: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Совместное использование соединений в закрытой сети WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"Системная политика запрещает совместное использование соединений в закрытой "
+"сети WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "Совместное использование соединений в открытой сети WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"Системная политика запрещает совместное использование соединений в открытой "
+"сети WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "Редактировать личные настройки подключения"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "Системная политика запрещает изменение персональных настроек сети"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "Изменить подключения доступные всем пользователям"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "Системная политика запрещает изменение настроек для всех пользователей"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "Изменить постоянное имя узла компьютера"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"Системная политика запрещает изменение постоянного имени узла компьютера"
 
-#: ../tui/nmt-editor.c:144
+#. Translators: the first %s is a prefix for the connection id, such
+#. * as "Wired Connection" or "VPN Connection". The %d is a number
+#. * that is combined with the first argument to create a unique
+#. * connection id.
+#: ../src/NetworkManagerUtils.c:1294
 #, c-format
-msgid "Unable to save connection: %s"
-msgstr "Не удалось сохранить соединение: %s"
+#| msgctxt "long device name"
+#| msgid "%s %s"
+msgctxt "connection id fallback"
+msgid "%s %d"
+msgstr "%s %d"
 
-#: ../tui/nmt-editor.c:158
-#, c-format
-msgid "Unable to add new connection: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c добавиÑ\82Ñ\8c новое Ñ\81оединение: %s"
+#. Logging/debugging
+#: ../src/main.c:223 ../src/nm-iface-helper.c:300
+msgid "Print NetworkManager version and exit"
+msgstr "Ð\9fоказаÑ\82Ñ\8c веÑ\80Ñ\81иÑ\8e NetworkManager и вÑ\8bйÑ\82и"
 
-#: ../tui/nmt-editor.c:228 ../tui/nmt-password-dialog.c:172
-#: ../tui/nmt-route-editor.c:128 ../tui/nmtui-edit.c:201
-#: ../tui/nmtui-edit.c:470 ../tui/nmtui-hostname.c:69
-msgid "Cancel"
-msgstr "Отмена"
+#: ../src/main.c:224 ../src/nm-iface-helper.c:301
+msgid "Don't become a daemon"
+msgstr "Не использовать в качестве службы"
 
-#: ../tui/nmt-mtu-entry.c:86
-msgid "(default)"
-msgstr "(по умолчанию)"
+#: ../src/main.c:225 ../src/nm-iface-helper.c:302
+msgid "Don't become a daemon, and log to stderr"
+msgstr "Не работать в режиме службы и не входить в stderr"
 
-#: ../tui/nmt-mtu-entry.c:88 ../tui/nmt-mtu-entry.c:119
-msgid "bytes"
-msgstr "байт"
+#: ../src/main.c:226 ../src/nm-iface-helper.c:303
+#, c-format
+msgid "Log level: one of [%s]"
+msgstr "Уровень журнала: одно значение из [%s]"
 
-#: ../tui/nmt-page-bond.c:88
-msgid "Round-robin"
-msgstr "Циклический"
+#: ../src/main.c:228 ../src/nm-iface-helper.c:305
+#, c-format
+msgid "Log domains separated by ',': any combination of [%s]"
+msgstr ""
+"Домены журналов должны быть перечислены через запятую и могут содержать "
+"любую комбинацию [%s]. "
 
-#: ../tui/nmt-page-bond.c:89
-msgid "Active Backup"
-msgstr "Ð\90кÑ\82ивнÑ\8bй и запаÑ\81нÑ\8bе"
+#: ../src/main.c:230 ../src/nm-iface-helper.c:307
+msgid "Make all warnings fatal"
+msgstr "СделаÑ\82Ñ\8c вÑ\81е пÑ\80едÑ\83пÑ\80еждениÑ\8f кÑ\80иÑ\82иÑ\87еÑ\81кими"
 
-#: ../tui/nmt-page-bond.c:90
-msgid "XOR"
-msgstr "XOR"
+#: ../src/main.c:231
+msgid "Specify the location of a PID file"
+msgstr "Укажите расположение PID файла"
 
-#: ../tui/nmt-page-bond.c:91
-msgid "Broadcast"
-msgstr "РаÑ\81Ñ\81Ñ\8bлка"
+#: ../src/main.c:231
+msgid "filename"
+msgstr "имÑ\8f Ñ\84айла"
 
-#: ../tui/nmt-page-bond.c:92
-msgid "802.3ad"
-msgstr "802.3ad"
+#: ../src/main.c:232
+msgid "State file location"
+msgstr "Расположение файла состояния"
 
-#: ../tui/nmt-page-bond.c:93
-msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "Адаптивное распределение нагрузки исходящего трафика (TLB)"
+#: ../src/main.c:232
+msgid "/path/to/state.file"
+msgstr "/путь/к/state.file"
 
-#: ../tui/nmt-page-bond.c:94
-msgid "Adaptive Load Balancing (alb)"
-msgstr "Адаптивное распределение нагрузки (ATLB)"
+#: ../src/main.c:248
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager отслеживает все сетевые соединения и автоматически\n"
+"выбирает для использования наиболее подходящее соединение. А также "
+"позволяет\n"
+"пользователю задать беспроводным картам точки доступа, с которыми они \n"
+"должны ассоциироваться."
 
-#: ../tui/nmt-page-bond.c:100
-msgid "MII (recommended)"
-msgstr "MII (рекомендуется)"
+#: ../src/main.c:261 ../src/main-utils.c:228 ../src/nm-iface-helper.c:337
+#, c-format
+msgid "%s.  Please use --help to see a list of valid options.\n"
+msgstr "%s. Используйте --help для вывода списка допустимых параметров.\n"
 
-#: ../tui/nmt-page-bond.c:101
-msgid "ARP"
-msgstr "ARP"
+#: ../src/main.c:266 ../src/nm-iface-helper.c:342
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr "Неизвестные домены журналов «%s» в строке команды. Пропускаются...\n"
 
-#: ../tui/nmt-page-bond.c:359 ../tui/nmt-page-bridge.c:86
-#: ../tui/nmt-page-team.c:159
-msgid "Slaves"
-msgstr "Ð\9fодÑ\87иненнÑ\8bе"
+#: ../src/main.c:313
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c конÑ\84игÑ\83Ñ\80аÑ\86иÑ\8e: (%d) %s\n"
 
-#: ../tui/nmt-page-bond.c:371 ../tui/nmt-page-wifi.c:227
-msgid "Mode"
-msgstr "Режим"
+#: ../src/main.c:327
+#, c-format
+msgid "Error in configuration file: %s.\n"
+msgstr "Ошибка в файле конфигурации: %s\n"
 
-#: ../tui/nmt-page-bond.c:377
-msgid "Primary"
-msgstr "Основной"
+#: ../src/main.c:332
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
+msgstr ""
+"Неизвестный домен журналов «%s» в файле конфигурации. Пропускается...\n"
 
-#: ../tui/nmt-page-bond.c:383
-msgid "Link monitoring"
-msgstr "Мониторинг соединения"
+#: ../src/main.c:340
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "Сбой при разборе файла состояния %s: (%d) %s\n"
 
-#: ../tui/nmt-page-bond.c:389 ../tui/nmt-page-bond.c:396
-#: ../tui/nmt-page-bond.c:403 ../tui/nmt-page-bond.c:410
-msgctxt "milliseconds"
-msgid "ms"
-msgstr "мс"
+#: ../src/main.c:353 ../src/nm-iface-helper.c:359
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "Невозможно преобразовать в службу: %s [ошибка %u]\n"
 
-#: ../tui/nmt-page-bond.c:390 ../tui/nmt-page-bond.c:411
-msgid "Monitoring frequency"
-msgstr "Частота мониторинга"
+#: ../src/main-utils.c:95
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr "При открытии %s произошла ошибка: %s\n"
 
-#: ../tui/nmt-page-bond.c:397
-msgid "Link up delay"
-msgstr "Задержка установки соединения"
+#: ../src/main-utils.c:101
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "При записи в %s произошла ошибка: %s\n"
 
-#: ../tui/nmt-page-bond.c:404
-msgid "Link down delay"
-msgstr "Задержка  разрыва соединения"
+#: ../src/main-utils.c:106
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "При закрытии %s произошла ошибка: %s\n"
 
-#: ../tui/nmt-page-bond.c:417
-msgid "ARP targets"
-msgstr "Получатели ARP"
+#: ../src/main-utils.c:162
+#, c-format
+#| msgid "NetworkManager is already running (pid %ld)\n"
+msgid "%s is already running (pid %ld)\n"
+msgstr "%s уже запущен (pid %ld)\n"
 
-#: ../tui/nmt-page-bridge-port.c:38
-msgid "BRIDGE PORT"
-msgstr "ПОРТ МОСТА"
+#: ../src/main-utils.c:205
+#, c-format
+#| msgid "You must be root to run NetworkManager!\n"
+msgid "You must be root to run %s!\n"
+msgstr "Вы должны быть суперпользователем для запуска %s\n"
 
-#: ../tui/nmt-page-bridge-port.c:69 ../tui/nmt-page-bridge.c:112
-msgid "Priority"
-msgstr "Приоритет"
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:205
+msgid "# Created by NetworkManager\n"
+msgstr "# Создано в NetworkManager\n"
 
-#: ../tui/nmt-page-bridge-port.c:75
-msgid "Path cost"
-msgstr "Стоимость пути"
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:212
+#, c-format
+msgid ""
+"# Merged from %s\n"
+"\n"
+msgstr ""
+"# Объединено с %s\n"
+"\n"
 
-#: ../tui/nmt-page-bridge-port.c:77
-msgid "Hairpin mode"
-msgstr "Режим разворота пакетов"
+#: ../src/dhcp-manager/nm-dhcp-manager.c:130
+#, fuzzy, c-format
+#| msgid "'dhcpcd' could be found."
+msgid "'%s' support not found or not enabled."
+msgstr "«dhcpcd» не найден."
 
-#: ../tui/nmt-page-bridge.c:42
-msgid "BRIDGE"
-msgstr "МОСТ"
+#: ../src/dhcp-manager/nm-dhcp-manager.c:177
+#, fuzzy
+msgid "no usable DHCP client could be found."
+msgstr "невозможно найти клиентов DHCP."
 
-#: ../tui/nmt-page-bridge.c:96 ../tui/nmt-page-bridge.c:121
-#: ../tui/nmt-page-bridge.c:131 ../tui/nmt-page-bridge.c:141
-msgid "seconds"
-msgstr "сек."
+#: ../src/dns-manager/nm-dns-manager.c:363
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr ""
+"ЗАМЕЧАНИЕ: преобразователь имён glibc не поддерживает более трёх серверов "
+"имён."
 
-#: ../tui/nmt-page-bridge.c:97
-msgid "Aging time"
-msgstr "Ð\92Ñ\80емÑ\8f Ñ\81Ñ\82аÑ\80ениÑ\8f"
+#: ../src/dns-manager/nm-dns-manager.c:365
+msgid "The nameservers listed below may not be recognized."
+msgstr "Ð\9dижепеÑ\80еÑ\87иÑ\81леннÑ\8bе Ñ\81еÑ\80веÑ\80Ñ\8b имÑ\91н могÑ\83Ñ\82 бÑ\8bÑ\82Ñ\8c не Ñ\80аÑ\81познанÑ\8b."
 
-#: ../tui/nmt-page-bridge.c:99
-msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "Включить STP (Spanning Tree Protocol)"
+#: ../src/devices/adsl/nm-device-adsl.c:129
+#| msgid "ADSL connection %d"
+msgid "ADSL connection"
+msgstr "Соединение ADSL"
 
-#: ../tui/nmt-page-bridge.c:122
-msgid "Forward delay"
-msgstr "Задержка переадресации"
+#: ../src/devices/bluetooth/nm-bluez-device.c:200
+#, c-format
+msgid "%s Network"
+msgstr "Сеть %s"
 
-#: ../tui/nmt-page-bridge.c:132
-msgid "Hello time"
-msgstr "Время приветствия"
+#: ../src/devices/bluetooth/nm-device-bt.c:255
+msgid "PAN requested, but Bluetooth device does not support NAP"
+msgstr ""
 
-#: ../tui/nmt-page-bridge.c:142
-msgid "Max age"
-msgstr "Максимальный срок"
+#: ../src/devices/bluetooth/nm-device-bt.c:265
+msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
+msgstr ""
 
-#: ../tui/nmt-page-ethernet.c:41
-msgid "ETHERNET"
-msgstr "ETHERNET"
+#: ../src/devices/bluetooth/nm-device-bt.c:278
+#| msgid "PAN connection %d"
+msgid "PAN connection"
+msgstr "Соединение PAN"
 
-#: ../tui/nmt-page-ethernet.c:80 ../tui/nmt-page-vlan.c:132
-#: ../tui/nmt-page-wifi.c:358
-msgid "Cloned MAC address"
-msgstr "Клонированный MAC-адрес"
+#: ../src/devices/bluetooth/nm-device-bt.c:285
+msgid "DUN requested, but Bluetooth device does not support DUN"
+msgstr ""
 
-#: ../tui/nmt-page-infiniband.c:40
-msgid "INFINIBAND"
-msgstr "INFINIBAND"
+#: ../src/devices/bluetooth/nm-device-bt.c:295
+msgid "DUN connection must include a GSM or CDMA setting"
+msgstr ""
 
-#: ../tui/nmt-page-infiniband.c:51
-msgid "Datagram"
-msgstr "Датаграмма"
+#: ../src/devices/bluetooth/nm-device-bt.c:305
+#: ../src/devices/wwan/nm-modem-broadband.c:540
+#| msgid "GSM connection %d"
+msgid "GSM connection"
+msgstr "Соединение GSM"
 
-#: ../tui/nmt-page-infiniband.c:52
-msgid "Connected"
-msgstr "Подключено"
+#: ../src/devices/bluetooth/nm-device-bt.c:309
+#: ../src/devices/wwan/nm-modem-broadband.c:563
+#| msgid "CDMA connection %d"
+msgid "CDMA connection"
+msgstr "Соединение CDMA"
 
-#: ../tui/nmt-page-infiniband.c:84
-msgid "Transport mode"
-msgstr "Транспортный режим"
+#: ../src/devices/bluetooth/nm-device-bt.c:317
+msgid "Unknown/unhandled Bluetooth connection type"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:41
-msgid "Disabled"
-msgstr "Отключено"
+#: ../src/devices/bluetooth/nm-device-bt.c:337
+#: ../src/devices/nm-device-ethernet.c:1442
+#: ../src/devices/nm-device-infiniband.c:196
+#: ../src/devices/wifi/nm-device-wifi.c:1116
+#: ../src/devices/wimax/nm-device-wimax.c:454
+#, fuzzy
+#| msgid "index '%s' is not valid"
+msgid "connection does not match device"
+msgstr "Недопустимый индекс  «%s»."
 
-#: ../tui/nmt-page-ip4.c:42 ../tui/nmt-page-ip6.c:42
-msgid "Automatic"
-msgstr "Автоматически"
+#: ../src/devices/nm-device-bond.c:126
+#| msgid "Bond connection %d"
+msgid "Bond connection"
+msgstr "Агрегированное (Bond) соединение"
 
-#: ../tui/nmt-page-ip4.c:43 ../tui/nmt-page-ip6.c:44
-msgid "Link-Local"
-msgstr "Локальная связь"
+#: ../src/devices/nm-device-bridge.c:132
+#| msgid "Bridge connection %d"
+msgid "Bridge connection"
+msgstr "Соединение типа «мост»"
 
-#: ../tui/nmt-page-ip4.c:44 ../tui/nmt-page-ip6.c:45
-msgid "Manual"
-msgstr "Вручную"
+#: ../src/devices/nm-device-ethernet.c:1425
+#| msgid "PPPoE connection %d"
+msgid "PPPoE connection"
+msgstr "Соединение PPPoE"
 
-#: ../tui/nmt-page-ip4.c:45
-msgid "Shared"
-msgstr "Общее"
+#: ../src/devices/nm-device-ethernet.c:1425
+#| msgid "Wired connection %d"
+msgid "Wired connection"
+msgstr "Проводное соединение"
 
-#: ../tui/nmt-page-ip4.c:54
-msgid "IPv4 CONFIGURATION"
-msgstr "КОНФИГУРАЦИЯ IPv4"
+#: ../src/devices/nm-device-ethernet-utils.c:40
+#, c-format
+msgid "Wired connection %d"
+msgstr "Проводное соединение %d"
 
-#: ../tui/nmt-page-ip4.c:100 ../tui/nmt-page-ip6.c:100
-msgid "(No custom routes)"
-msgstr "(нет дополнительных маршрутов)"
+#: ../src/devices/nm-device-infiniband.c:178
+#| msgid "InfiniBand connection %d"
+msgid "InfiniBand connection"
+msgstr "Соединение InfiniBand"
+
+#: ../src/devices/nm-device-vlan.c:218
+#| msgid "VLAN connection %d"
+msgid "VLAN connection"
+msgstr "Соединение VLAN"
+
+#: ../src/devices/team/nm-device-team.c:132
+#| msgid "Team connection %d"
+msgid "Team connection"
+msgstr "Агрегированное (Team) соединение"
+
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:151
+#, fuzzy
+#| msgid "Mesh %d"
+msgid "Mesh"
+msgstr "Mesh %d"
 
-#: ../tui/nmt-page-ip4.c:103 ../tui/nmt-page-ip6.c:103
-#, c-format
-msgid "One custom route"
-msgid_plural "%d custom routes"
-msgstr[0] "%d дополнительный маршрут"
-msgstr[1] "%d дополнительных маршрута"
-msgstr[2] "%d дополнительных маршрутов"
+#: ../src/devices/wifi/nm-device-wifi.c:1086
+msgid "WPA Ad-Hoc disabled due to kernel bugs"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:141 ../tui/nmt-page-ip6.c:141
-msgid "Addresses"
-msgstr "Адреса"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:44
+#, fuzzy, c-format
+#| msgid "'%s=%s' is incompatible with '%s > 0'"
+msgid "%s is incompatible with static WEP keys"
+msgstr " «%s=%s» несовместимо с  «%s > 0»"
 
-#: ../tui/nmt-page-ip4.c:147 ../tui/nmt-page-ip6.c:147
-msgid "Gateway"
-msgstr "Шлюз"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:78
+#, fuzzy
+#| msgid "Authentication required by wireless network"
+msgid "LEAP authentication requires a LEAP username"
+msgstr "Для доступа к беспроводной сети требуется аутентификация"
 
-#: ../tui/nmt-page-ip4.c:153 ../tui/nmt-page-ip6.c:153
-msgid "DNS servers"
-msgstr "DNS-серверы"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:88
+msgid "LEAP username requires 'leap' authentication"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:159 ../tui/nmt-page-ip6.c:159
-msgid "Search domains"
-msgstr "Поиск доменов"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:101
+msgid "LEAP authentication requires IEEE 802.1x key management"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:174 ../tui/nmt-page-ip6.c:172
-msgid "Routing"
-msgstr "Маршрутизация"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:121
+msgid "LEAP authentication is incompatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:176 ../tui/nmt-page-ip6.c:174
-msgid "Never use this network for default route"
-msgstr "Не использовать эту сеть для текущего маршрута"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:133
+msgid "LEAP authentication is incompatible with 802.1x setting"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:184
-msgid "Require IPv4 addressing for this connection"
-msgstr "Соединение требует адресацию IPv4"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:155
+#, c-format
+msgid "a connection using '%s' authentication cannot use WPA key management"
+msgstr ""
 
-#: ../tui/nmt-page-ip6.c:41
-msgid "Ignore"
-msgstr "Игнорировать"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:166
+#, c-format
+msgid "a connection using '%s' authentication cannot specific WPA protocols"
+msgstr ""
 
-#: ../tui/nmt-page-ip6.c:43
-msgid "Automatic (DHCP-only)"
-msgstr "Автоматически (только DHCP)"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:182
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:199
+#, c-format
+msgid "a connection using '%s' authentication cannot specific WPA ciphers"
+msgstr ""
 
-#: ../tui/nmt-page-ip6.c:54
-msgid "IPv6 CONFIGURATION"
-msgstr "КОНФИГУРАЦИЯ IPv6"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:211
+#, c-format
+msgid "a connection using '%s' authentication cannot specific a WPA password"
+msgstr ""
 
-#: ../tui/nmt-page-ip6.c:182
-msgid "Require IPv6 addressing for this connection"
-msgstr "Соединение требует адресацию IPv6"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:242
+#, fuzzy
+#| msgid "Dynamic WEP (802.1x)"
+msgid "Dynamic WEP requires an 802.1x setting"
+msgstr "Динамический WEP (802.1x)"
 
-#: ../tui/nmt-page-main.c:134
-msgid "Hide"
-msgstr "Скрыть"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:252
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:280
+msgid "Dynamic WEP requires 'open' authentication"
+msgstr ""
 
-#: ../tui/nmt-page-main.c:134
-msgid "Show"
-msgstr "Показать"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:267
+msgid "Dynamic WEP requires 'ieee8021x' key management"
+msgstr ""
 
-#: ../tui/nmt-page-main.c:181
-msgid "Profile name"
-msgstr "Имя профиля"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:314
+msgid "WPA-PSK authentication is incompatible with 802.1x"
+msgstr ""
 
-#: ../tui/nmt-page-main.c:188
-msgid "Device"
-msgstr "Устройство"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:324
+#, fuzzy
+#| msgid "Wired 802.1X authentication"
+msgid "WPA-PSK requires 'open' authentication"
+msgstr "Аутентификация проводного соединения 802.1X"
 
-#: ../tui/nmt-page-main.c:252
-msgid "Automatically connect"
-msgstr "Подключаться автоматически"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:336
+msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
+msgstr ""
 
-#: ../tui/nmt-page-main.c:258
-msgid "Available to all users"
-msgstr "Доступно всем"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:349
+msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
+msgstr ""
 
-#: ../tui/nmt-page-team-port.c:45
-msgid "TEAM PORT"
-msgstr "ПОРТ ГРУППЫ"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:361
+#, fuzzy
+#| msgid "Authentication required by wireless network"
+msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
+msgstr "Для доступа к беспроводной сети требуется аутентификация"
 
-#: ../tui/nmt-page-team-port.c:100 ../tui/nmt-page-team.c:170
-msgid "JSON configuration"
-msgstr "Конфигурация JSON"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:373
+msgid "WPA Ad-Hoc requires 'tkip' group cipher"
+msgstr ""
 
-#: ../tui/nmt-page-team.c:51
-msgid "TEAM"
-msgstr "ГРУППА"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:387
+msgid "Access point does not support PSK but setting requires it"
+msgstr ""
+
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:417
+msgid "WPA-EAP authentication requires an 802.1x setting"
+msgstr ""
 
-#: ../tui/nmt-page-vlan.c:109
-msgid "Parent"
-msgstr "Родительский"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:427
+#, fuzzy
+#| msgid "Wired 802.1X authentication"
+msgid "WPA-EAP requires 'open' authentication"
+msgstr "Аутентификация проводного соединения 802.1X"
 
-#: ../tui/nmt-page-vlan.c:124
-msgid "VLAN id"
-msgstr "VLAN ID"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:438
+msgid "802.1x setting requires 'wpa-eap' key management"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:58
-msgid "WI-FI"
-msgstr "WI-FI"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:451
+msgid "Access point does not support 802.1x but setting requires it"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:69
-msgctxt "Wi-Fi"
-msgid "Client"
-msgstr "Клиент"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:479
+msgid ""
+"Access point mode is Ad-Hoc but setting requires Infrastructure security"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:70
-msgid "Access Point"
-msgstr "Точка доступа"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:489
+msgid "Ad-Hoc mode is incompatible with 802.1x security"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:71
-msgid "Ad-Hoc Network"
-msgstr "Динамическая сеть"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:498
+msgid "Ad-Hoc mode is incompatible with LEAP security"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:76
-msgctxt "Wi-Fi"
-msgid "Automatic"
-msgstr "Автоматически"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:508
+msgid "Ad-Hoc mode requires 'open' authentication"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:78
-msgid "A (5 GHz)"
-msgstr "A (5 ГГц)"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:518
+msgid ""
+"Access point mode is Infrastructure but setting requires Ad-Hoc security"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:80
-msgid "B/G (2.4 GHz)"
-msgstr "B/G (2.4 ГГц)"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:560
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:590
+#, c-format
+msgid "connection does not match access point"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:85
-msgctxt "Wi-Fi security"
-msgid "None"
-msgstr "Нет"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:614
+msgid "Access point is unencrypted but setting specifies security"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:86
-msgid "WPA & WPA2 Personal"
-msgstr "WPA и WPA2 Personal"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:703
+msgid ""
+"WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
+"WEP"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:87
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA и WPA2 Enterprise"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:713
+msgid "WPA authentication is incompatible with Shared Key authentication"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:88
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "40/128-битный ключ WEP (Hex или ASCII))"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:760
+#, fuzzy
+#| msgid "Failed to set symmetric key for decryption."
+msgid "Failed to determine AP security information"
+msgstr "Не удалось задать симметричный ключ расшифровки."
 
-#: ../tui/nmt-page-wifi.c:89
-msgid "WEP 128-bit Passphrase"
-msgstr "128-битный ключ WEP"
+#: ../src/devices/wwan/nm-modem-broadband.c:527
+#, fuzzy
+#| msgid "Mobile broadband connection %d"
+msgid "GSM mobile broadband connection requires a 'gsm' setting"
+msgstr "Мобильное соединение %d"
 
-#: ../tui/nmt-page-wifi.c:90
-msgid "Dynamic WEP (802.1x)"
-msgstr "Ð\94инамиÑ\87еÑ\81кий WEP (802.1x)"
+#: ../src/nm-config.c:393
+msgid "Config file location"
+msgstr "РаÑ\81положение Ñ\84айла конÑ\84игÑ\83Ñ\80аÑ\86ии"
 
-#: ../tui/nmt-page-wifi.c:91
-msgid "LEAP"
-msgstr "LEAP"
+#: ../src/nm-config.c:393
+msgid "/path/to/config.file"
+msgstr "/путь/к/config.file"
 
-#: ../tui/nmt-page-wifi.c:96
-msgctxt "WEP key index"
-msgid "1 (Default)"
-msgstr "1 (по умолчанию)"
+#: ../src/nm-config.c:394
+msgid "Config directory location"
+msgstr "Путь к каталогу конфигурации"
 
-#: ../tui/nmt-page-wifi.c:97
-msgctxt "WEP key index"
-msgid "2"
-msgstr "2"
+#: ../src/nm-config.c:394
+msgid "/path/to/config/dir"
+msgstr "/путь/к/каталогу"
 
-#: ../tui/nmt-page-wifi.c:98
-msgctxt "WEP key index"
-msgid "3"
-msgstr "3"
+#: ../src/nm-config.c:396
+msgid "List of plugins separated by ','"
+msgstr "Список модулей (через запятую)"
 
-#: ../tui/nmt-page-wifi.c:99
-msgctxt "WEP key index"
-msgid "4"
-msgstr "4"
+#: ../src/nm-config.c:396
+msgid "plugin1,plugin2"
+msgstr "модуль1,модуль2"
 
-#: ../tui/nmt-page-wifi.c:104
-msgid "Open System"
-msgstr "Открытая система"
+#: ../src/nm-config.c:397
+#, fuzzy
+#| msgid "Current nmcli configuration:\n"
+msgid "Quit after initial configuration"
+msgstr "Текущая конфигурация nmcli:\n"
 
-#: ../tui/nmt-page-wifi.c:105
-msgid "Shared Key"
-msgstr "Общий ключ"
+#. These three are hidden for now, and should eventually just go away.
+#: ../src/nm-config.c:400
+msgid "An http(s) address for checking internet connectivity"
+msgstr "http(s) адрес для проверки соединения с Интернетом"
 
-#: ../tui/nmt-page-wifi.c:253
-msgid "Channel"
-msgstr "Ð\9aанал"
+#: ../src/nm-config.c:401
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Ð\98нÑ\82еÑ\80вал междÑ\83 пÑ\80овеÑ\80ками Ñ\81оединениÑ\8f (в Ñ\81екÑ\83ндаÑ\85)"
 
-#: ../tui/nmt-page-wifi.c:258
-msgid "Security"
-msgstr "Ð\97аÑ\89ита"
+#: ../src/nm-config.c:402
+msgid "The expected start of the response"
+msgstr "Ð\9eжидаеÑ\82Ñ\81Ñ\8f наÑ\87ало оÑ\82вета"
 
-#: ../tui/nmt-page-wifi.c:274 ../tui/nmt-page-wifi.c:305
-#: ../tui/nmt-page-wifi.c:335 ../tui/nmt-secret-agent.c:214
-#: ../tui/nmt-secret-agent.c:251 ../tui/nmt-secret-agent.c:281
-#: ../tui/nmt-secret-agent.c:314 ../tui/nmt-secret-agent.c:380
-#: ../tui/nmt-secret-agent.c:393 ../tui/nmt-secret-agent.c:409
-msgid "Password"
-msgstr "Пароль"
+#: ../src/nm-config.c:402
+msgid "Bingo!"
+msgstr "Бинго!"
 
-#: ../tui/nmt-page-wifi.c:279
-msgid "(No support for wpa-enterprise yet...)"
-msgstr "(wpa-enterprise не поддерживается)"
+#. Interface/IP config
+#: ../src/nm-iface-helper.c:286
+#, fuzzy
+#| msgid "Parent interface [none]: "
+msgid "The interface to manage"
+msgstr "Родительский интерфейс [нет]:"
 
-#: ../tui/nmt-page-wifi.c:286 ../tui/nmt-secret-agent.c:265
-msgid "Key"
-msgstr "Ключ"
+#: ../src/nm-iface-helper.c:286
+msgid "eth0"
+msgstr "eth0"
 
-#: ../tui/nmt-page-wifi.c:289 ../tui/nmt-page-wifi.c:308
-msgid "WEP index"
-msgstr "Индекс WEP"
+#: ../src/nm-iface-helper.c:287
+#, fuzzy
+#| msgid "connection"
+msgid "Connection UUID"
+msgstr "соединение"
 
-#: ../tui/nmt-page-wifi.c:297 ../tui/nmt-page-wifi.c:316
-msgid "Authentication"
-msgstr "Аутентификация"
+#: ../src/nm-iface-helper.c:287
+msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:322
-msgid "(No support for dynamic-wep yet...)"
-msgstr "(dynamic-wep не поддерживается)"
+#: ../src/nm-iface-helper.c:288
+msgid "Whether to manage IPv6 SLAAC"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:329 ../tui/nmt-secret-agent.c:209
-#: ../tui/nmt-secret-agent.c:304
-msgid "Username"
-msgstr "Пользователь"
+#: ../src/nm-iface-helper.c:289
+msgid "Whether SLAAC must be successful"
+msgstr ""
 
-#: ../tui/nmt-password-fields.c:130
-msgid "Ask for this password every time"
-msgstr "Запрашивать пароль каждый раз"
+#: ../src/nm-iface-helper.c:290
+msgid "Use an IPv6 temporary privacy address"
+msgstr ""
 
-#: ../tui/nmt-password-fields.c:131
-msgid "Show password"
-msgstr "Показать пароль"
+#: ../src/nm-iface-helper.c:291
+#, fuzzy
+#| msgid "Cloned MAC address"
+msgid "Current DHCPv4 address"
+msgstr "Клонированный MAC-адрес"
 
-#: ../tui/nmt-route-table.c:219
-msgid "Destination"
-msgstr "Назначение"
+#: ../src/nm-iface-helper.c:292
+msgid "Whether DHCPv4 must be successful"
+msgstr ""
 
-#: ../tui/nmt-route-table.c:219
-msgid "Prefix"
-msgstr "Префикс"
+#: ../src/nm-iface-helper.c:293
+#, fuzzy
+#| msgid "unsupported DHCP client '%s'"
+msgid "Hex-encoded DHCPv4 client ID"
+msgstr "клиент DHCP «%s» не поддерживается"
 
-#: ../tui/nmt-route-table.c:228
-msgid "Next Hop"
-msgstr "Следующий переход"
+#: ../src/nm-iface-helper.c:294
+msgid "Hostname to send to DHCP server"
+msgstr ""
 
-#: ../tui/nmt-route-table.c:236
-msgid "Metric"
-msgstr "Метрика"
+#: ../src/nm-iface-helper.c:294
+msgid "barbar"
+msgstr ""
 
-#: ../tui/nmt-route-table.c:256
-msgid "No custom routes are defined."
-msgstr "Нет дополнительных маршрутов."
+#: ../src/nm-iface-helper.c:295
+#, fuzzy
+#| msgid "no priority to remove"
+msgid "Route priority for IPv4"
+msgstr "нет приоритета для удаления"
 
-#: ../tui/nmt-secret-agent.c:223
-msgid "Identity"
-msgstr "Идентификация"
+#: ../src/nm-iface-helper.c:295
+msgid "0"
+msgstr "0"
 
-#: ../tui/nmt-secret-agent.c:228
-msgid "Private key password"
-msgstr "Пароль секретного ключа"
+#: ../src/nm-iface-helper.c:296
+#, fuzzy
+#| msgid "no priority to remove"
+msgid "Route priority for IPv6"
+msgstr "нет приоритета для удаления"
 
-#: ../tui/nmt-secret-agent.c:309
-msgid "Service"
-msgstr "Служба"
+#: ../src/nm-iface-helper.c:296
+msgid "1024"
+msgstr "1024"
 
-#: ../tui/nmt-secret-agent.c:340
-msgid "Authentication required by wireless network"
-msgstr "Для доступа к беспроводной сети требуется аутентификация"
+#: ../src/nm-iface-helper.c:297
+msgid "Hex-encoded Interface Identifier"
+msgstr ""
 
-#: ../tui/nmt-secret-agent.c:341
-#, c-format
+#: ../src/nm-iface-helper.c:319
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"nm-iface-helper is a small, standalone process that manages a single network "
+"interface."
 msgstr ""
-"Для доступа к беспроводной сети «%s» требуются пароли или ключи шифрования."
 
-#: ../tui/nmt-secret-agent.c:349
-msgid "Wired 802.1X authentication"
-msgstr "Аутентификация проводного соединения 802.1X"
+#: ../src/nm-iface-helper.c:328
+#, c-format
+msgid "An interface name and UUID are required\n"
+msgstr ""
 
-#: ../tui/nmt-secret-agent.c:352
-msgid "Network name"
-msgstr "Имя сети"
+#: ../src/nm-iface-helper.c:393
+#, fuzzy, c-format
+#| msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgid "Failed to find interface index for %s\n"
+msgstr "Не удалось найти закрывающий тег PKCS#8 — «%s»."
 
-#: ../tui/nmt-secret-agent.c:359
-msgid "DSL authentication"
-msgstr "Аутентификация DSL"
+#: ../src/nm-iface-helper.c:409
+#, c-format
+msgid "(%s): Invalid IID %s\n"
+msgstr ""
 
-#: ../tui/nmt-secret-agent.c:367
-msgid "PIN code required"
-msgstr "Требуется PIN"
+#: ../src/nm-logging.c:140
+#, c-format
+msgid "Unknown log level '%s'"
+msgstr "Неизвестный уровень журналирования «%s»"
 
-#: ../tui/nmt-secret-agent.c:368
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Для использования мобильного устройства требуется PIN-код"
+#: ../src/nm-logging.c:222
+#, c-format
+msgid "Unknown log domain '%s'"
+msgstr "Неизвестный домен журналирования «%s»"
 
-#: ../tui/nmt-secret-agent.c:370
-msgid "PIN"
-msgstr "PIN"
+#: ../src/nm-manager.c:3437
+#| msgid "VPN connecting"
+msgid "VPN connection"
+msgstr "VPN-соединение"
 
-#: ../tui/nmt-secret-agent.c:376 ../tui/nmt-secret-agent.c:389
-#: ../tui/nmt-secret-agent.c:405
-msgid "Mobile broadband network password"
-msgstr "Пароль мобильной сети"
+#: ../src/nm-sleep-monitor-systemd.c:115
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager должен отключить сети"
 
-#: ../tui/nmt-secret-agent.c:377 ../tui/nmt-secret-agent.c:390
-#: ../tui/nmt-secret-agent.c:406
+#: ../src/settings/plugins/ibft/plugin.c:66
 #, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "Для подключения к «%s» требуется пароль."
+msgid "ibft: failed to read iscsiadm records: %s"
+msgstr ""
 
-#: ../tui/nmt-slave-list.c:138
-msgid "Select the type of slave connection you wish to add."
-msgstr "Выберите тип добавляемого подчиненного соединения."
+#: ../src/settings/plugins/ibft/plugin.c:74
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "ibft: read connection '%s'"
+msgstr "Проводное соединение %d"
 
-#: ../tui/nmt-widget-list.c:142
-msgid "Add..."
-msgstr "Добавить..."
+#: ../src/settings/plugins/ibft/plugin.c:80
+#, c-format
+msgid "ibft: failed to read iscsiadm record: %s"
+msgstr ""
 
-#: ../tui/nmt-widget-list.c:205
-msgid "Remove"
-msgstr "УдалиÑ\82Ñ\8c"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:112
+msgid "System"
+msgstr "СиÑ\81Ñ\82ема"
 
-#: ../tui/nmtui-connect.c:82
-msgid "Activation failed"
-msgstr "Ошибка подключения"
+#~ msgid "invalid prefix '%s'; <1-32> allowed"
+#~ msgstr "недопустимый префикс  «%s» (допускается <1-32>)"
+
+#~ msgid "invalid prefix '%s'; <1-128> allowed"
+#~ msgstr "недопустимый префикс  «%s» (допускается <1-128>)"
+
+#, fuzzy
+#~| msgid "invalid next hop address '%s'"
+#~ msgid "invalid route destination address '%s'"
+#~ msgstr "недопустимый адрес перехода: «%s»"
+
+#~ msgid "invalid next hop address '%s'"
+#~ msgstr "недопустимый адрес перехода: «%s»"
+
+#~ msgid ""
+#~ "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
+#~ "connected]."
+#~ msgstr ""
+#~ "Ошибка «mode». Недействительный режим передачи InfiniBand: "
+#~ "«%s» [датаграмма, подключено]."
+
+#, fuzzy
+#~| msgid "Error: Could not get system settings."
+#~ msgid "Error: could not get remote settings: %s."
+#~ msgstr "Ошибка. Не удалось получить системные параметры."
+
+#~ msgid "Error: Can't obtain connections: settings service is not running."
+#~ msgstr ""
+#~ "Ошибка: не удалось получить соединения: служба параметров не запущена."
+
+#, fuzzy
+#~| msgid "Error: Could not get system settings."
+#~ msgid "Error: Could not get system settings: %s."
+#~ msgstr "Ошибка. Не удалось получить системные параметры."
+
+#~ msgid "'%s' is not valid (use ip[/prefix] [gateway])"
+#~ msgstr ""
+#~ "Недействительное значение  «%s». Допустимый формат:  ip[/префикс] [шлюз]."
+
+#, fuzzy
+#~| msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+#~ msgid "connection type '%s' is not a valid base type"
+#~ msgstr "Ошибка. Недопустимый тип bluetooth: «%s»\n"
+
+#, fuzzy
+#~| msgid "Select the type of slave connection you wish to add."
+#~ msgid "Detect a slave connection with '"
+#~ msgstr "Выберите тип добавляемого подчиненного соединения."
+
+#~ msgid "Failed to set signal mask: %d"
+#~ msgstr "Ошибка установки маски сигнала: %d"
+
+#~ msgid "Failed to create signal handling thread: %d"
+#~ msgstr "Ошибка создания потока обработки сигнала: %d"
+
+#~ msgid "GModules are not supported on your platform!\n"
+#~ msgstr "GModules не поддерживаются на вашей платформе.\n"
+
+#, fuzzy
+#~| msgid "'dhclient' could be found."
+#~ msgid "'dhclient' could not be found or was disabled."
+#~ msgstr "«dhclient» не найден."
+
+#, fuzzy
+#~| msgid "DUN connection %d"
+#~ msgid "DUN connection"
+#~ msgstr "Подключение DUN %d"
+
+#~ msgid "invalid prefix '%s'; <0-32> allowed"
+#~ msgstr "недопустимый префикс  «%s» (допускается <0-32>)"
+
+#~ msgid "invalid IPv6 route '%s'"
+#~ msgstr "недопустимый маршрут IPv6: «%s»"
+
+#~ msgid "invalid prefix '%s'; <0-128> allowed"
+#~ msgstr "недопустимый префикс  «%s» (допускается <0-128>)"
+
+#~ msgid ""
+#~ "Usage: nmcli connection show { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
+#~ "\n"
+#~ "Show connections which are currently used by a device to connect to a "
+#~ "network.\n"
+#~ "Without a parameter, all active connections are listed. When <ID> is "
+#~ "provided,\n"
+#~ "the connection details are displayed instead.\n"
+#~ "\n"
+#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
+#~ "\n"
+#~ "Show in-memory and on-disk connections, some of which may also be active "
+#~ "if\n"
+#~ "a device is using that connection profile. Without a parameter, all "
+#~ "profiles\n"
+#~ "are listed. When <ID> is provided, the profile details are displayed "
+#~ "instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Формат: nmcli connection show { АРГУМЕНТЫ | help }\n"
+#~ "\n"
+#~ "АРГУМЕНТЫ := active [[id | uuid | path | apath] <ID>]\n"
+#~ "\n"
+#~ "Показывает список соединений.\n"
+#~ "Если параметры не указаны, команда вернет все активные соединения.\n"
+#~ "Если указан идентификатор, будет показана информация о его соединении.\n"
+#~ "\n"
+#~ "АРГУМЕНТЫ := configured [[id | uuid | path] <ID>]\n"
+#~ "\n"
+#~ "Показывает настроенные соединения, которые могут быть активны,\n"
+#~ "если устройство использует соответствующий профиль соединения.\n"
+#~ "Если параметры не указаны, команда вернет все профили.\n"
+#~ "Если указан идентификатор, будет показаны сведения о его профиле.\n"
+
+#~ msgid ""
+#~ "Usage: nmcli connection modify { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
+#~ "[<value>]\n"
+#~ "\n"
+#~ "Modify a single property in the connection profile.\n"
+#~ "The profile is identified by its name, UUID or D-Bus path.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Формат: nmcli connection modify { АРГУМЕНТЫ | help }\n"
+#~ "\n"
+#~ "АРГУМЕНТЫ := [id | uuid | путь] <ID> <параметр>.<свойство> [<защита>]\n"
+#~ "\n"
+#~ "Изменение свойства в профиле соединения. \n"
+#~ "Профиль определяется по имени, UUID или пути D-Bus.\n"
+#~ "\n"
+
+#~ msgid "Error: 'list configured': %s"
+#~ msgstr "Ошибка «list configured»: %s"
+
+#~ msgid "List of configured connections"
+#~ msgstr "Список настроенных соединений"
+
+#~ msgid "Error: 'show configured': %s"
+#~ msgstr "Ошибка «show configured»: %s"
+
+#~ msgid "Error: 'list active': %s"
+#~ msgstr "Ошибка «list active»: %s"
+
+#~ msgid "List of active connections"
+#~ msgstr "Список активных соединений"
+
+#~ msgid ""
+#~ "Error: Device '%s' is waiting for slaves before proceeding with "
+#~ "activation."
+#~ msgstr ""
+#~ "Ошибка. Для продолжения активации устройства «%s» необходимо дождаться "
+#~ "его подчиненных устройств."
+
+#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
+#~ msgstr "Для соединения  «%s» доступно три дополнительных аргумента.\n"
+
+#~ msgid "Transport mode (datagram or connected) [datagram]: "
+#~ msgstr "Режим передачи (датаграммы  или подключенный) [датаграмма]:"
+
+#~ msgid ""
+#~ "There are 2 optional arguments for 'mobile broadband' connection type.\n"
+#~ msgstr ""
+#~ "Для мобильных широкополосных соединений доступно два дополнительных "
+#~ "аргумента.\n"
+
+#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
+#~ msgstr "Тип bluetooth (panu, dun-gsm, dun-cdma) [panu]: "
+
+#~ msgid "There are optional arguments for 'bond' connection type.\n"
+#~ msgstr "Для соединений «bond» доступны дополнительные аргументы.\n"
+
+#~ msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
+#~ msgstr "Режим мониторинга агрегации (miimon или arp) [miimon]: "
+
+#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
+#~ msgstr "Для соединений «bridge» доступно шесть дополнительных аргументов.\n"
+
+#~ msgid "Error: 'stp': '%s'.\n"
+#~ msgstr "Ошибка «stp»: «%s»\n"
+
+#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
+#~ msgstr ""
+#~ "Для соединений  «bridge-slave» доступно три дополнительных аргумента.\n"
+
+#~ msgid "Hairpin (yes/no) [yes]: "
+#~ msgstr "Hairpin (да/нет) [да]: "
+
+#~ msgid "Error: 'hairpin': '%s'.\n"
+#~ msgstr "Ошибка «hairpin»:  «%s»\n"
+
+#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
+#~ msgstr "Для соединений VPN доступен один дополнительный аргумент.\n"
+
+#~ msgid ""
+#~ "save  :: save the connection\n"
+#~ "\n"
+#~ "Sends the connection to NetworkManager that will save it.\n"
+#~ msgstr ""
+#~ "save  :: сохранение соединения\n"
+#~ "\n"
+#~ "Сохраняет соединение в NetworkManager.\n"
+
+#~ msgid ""
+#~ "remove [<index>|<option>]  :: delete the value\n"
+#~ "\n"
+#~ "Removes the property value (sets it to default).\n"
+#~ msgstr ""
+#~ "remove [<индекс>|<значение>]  :: удаление значения\n"
+#~ "\n"
+#~ "Очищает свойство и присваивает ему исходное значение.\n"
+
+#~ msgid "Error: '%s' setting not present\n"
+#~ msgstr "Ошибка. Параметр «%s» не определен.\n"
+
+#~ msgid ""
+#~ ">>> Command-line editing is not available. Consider installing a line "
+#~ "editing library to enable the feature. <<<\n"
+#~ "Supported libraries are:\n"
+#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
+#~ "readline/rltop.html\n"
+#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
+#~ msgstr ""
+#~ ">>> Редактирование в командной строке недоступно. Для этого рекомендуется "
+#~ "установить библиотеку для редактирования текста. <<<\n"
+#~ "Поддерживаемые библиотеки:\n"
+#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
+#~ "readline/rltop.html\n"
+#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
 
-#: ../tui/nmtui-connect.c:134
-msgid "Connecting..."
-msgstr "Подключение..."
+#~ msgid ""
+#~ "Error: 'configured' or 'active' command is expected for 'connection show'."
+#~ msgstr ""
+#~ "Ошибка. После «connection show» ожидается «configured» или «active»."
 
-#: ../tui/nmtui-connect.c:159
-#, c-format
-msgid "Could not activate connection: %s"
-msgstr "Не удалось подключиться к %s"
+#~ msgid "not running"
+#~ msgstr "не выполняется"
 
-#: ../tui/nmtui-connect.c:218 ../tui/nmtui-connect.c:274
-msgid "Activate"
-msgstr "Включить"
+#~ msgid "Error: %s"
+#~ msgstr "Ошибка: %s"
 
-#: ../tui/nmtui-connect.c:220
-msgid "Deactivate"
-msgstr "Отключить"
+#~ msgid "0 (unknown)"
+#~ msgstr "0 (неизвестно)"
 
-#: ../tui/nmtui-connect.c:279 ../tui/nmtui-edit.c:102 ../tui/nmtui.c:114
-msgid "Quit"
-msgstr "Выход"
+#~ msgid "any, "
+#~ msgstr "любой, "
 
-#: ../tui/nmtui-connect.c:304
-#, c-format
-msgid "No such connection '%s'"
-msgstr "Нет соединения «%s»."
+#~ msgid "900 MHz, "
+#~ msgstr "900 МГц, "
 
-#: ../tui/nmtui-connect.c:306
-msgid "Connection is already active"
-msgstr "Соединение активно"
+#~ msgid "1800 MHz, "
+#~ msgstr "1800 МГц, "
 
-#: ../tui/nmtui-edit.c:209
-msgid "Create"
-msgstr "Создать"
+#~ msgid "1900 MHz, "
+#~ msgstr "1900 МГц, "
 
-#: ../tui/nmtui-edit.c:350
-msgid "Select the type of connection you wish to create."
-msgstr "Выберите тип нового соединения."
+#~ msgid "850 MHz, "
+#~ msgstr "850 МГц, "
 
-#: ../tui/nmtui-edit.c:357
-msgid ""
-"If you are creating a VPN, and the VPN connection you wish to create does "
-"not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"Отсутствие необходимого типа VPN в списке может говорить о том, что в "
-"системе не установлен соответствующий модуль VPN."
+#~ msgid "WCDMA 3GPP UMTS 2100 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 2100 МГц, "
 
-#: ../tui/nmtui-edit.c:390 ../tui/nmtui-edit.c:406
-msgid "New Connection"
-msgstr "Новое соединение"
+#~ msgid "WCDMA 3GPP UMTS 1800 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1800 МГц, "
 
-#: ../tui/nmtui-edit.c:443
-#, c-format
-msgid "Unable to delete connection: %s"
-msgstr "Не удалось удалить соединение: %s"
+#~ msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1700/2100 МГц, "
 
-#: ../tui/nmtui-edit.c:472
-#, c-format
-msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "Действительно удалить соединение  «%s»?"
+#~ msgid "WCDMA 3GPP UMTS 800 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 800 МГц, "
 
-#: ../tui/nmtui-edit.c:486
-#, c-format
-msgid "Could not delete connection: %s"
-msgstr "Не удалось удалить соединение: %s"
+#~ msgid "WCDMA 3GPP UMTS 850 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 850 МГц, "
 
-#: ../tui/nmtui-hostname.c:47
-msgid "Set Hostname"
-msgstr "Измените имя узла"
+#~ msgid "WCDMA 3GPP UMTS 900 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 900 МГц, "
 
-#: ../tui/nmtui-hostname.c:55
-msgid "Hostname"
-msgstr "Имя узла"
+#~ msgid "WCDMA 3GPP UMTS 1700 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1700 МГц, "
 
-#: ../tui/nmtui-hostname.c:114
-#, c-format
-msgid "Set hostname to '%s'"
-msgstr "Изменить имя узла на «%s»"
+#~ msgid "WCDMA 3GPP UMTS 1900 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1900 МГц, "
 
-#: ../tui/nmtui-hostname.c:116
-#, c-format
-msgid "Unable to set hostname: %s"
-msgstr "Не удалось установить имя узла: %s"
+#~ msgid "WCDMA 3GPP UMTS 2600 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 2600 МГц, "
 
-#: ../tui/nmtui.c:59 ../tui/nmtui.c:62
-msgid "connection"
-msgstr "соединение"
+#~ msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
+#~ msgstr ""
+#~ "Недействительное значение  «%s». Допустимый формат:  <целевой_ip>/префикс "
+#~ "<ip_перехода> [метрика]."
 
-#: ../tui/nmtui.c:60
-msgid "Edit a connection"
-msgstr "Изменить соединение"
+#~ msgid "'%s' doesn't match the virtual interface name '%s'"
+#~ msgstr "«%s» не соответствует виртуальному интерфейсу «%s»."
 
-#: ../tui/nmtui.c:63
-msgid "Activate a connection"
-msgstr "Подключиться"
+#~ msgid "IPv4 configuration is not allowed for slave"
+#~ msgstr "Для подчиненных интерфейсов нельзя использовать конфигурацию IPv4"
 
-#: ../tui/nmtui.c:65
-msgid "new hostname"
-msgstr "новое имя узла"
+#~ msgid "IPv6 configuration is not allowed for slave"
+#~ msgstr "Для подчиненных интерфейсов нельзя использовать конфигурацию IPv6"
 
-#: ../tui/nmtui.c:66
-msgid "Set system hostname"
-msgstr "Измените имя узла"
+#~ msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+#~ msgstr ""
+#~ "Неверный параметр. Используйте --help для вывода списка возможных "
+#~ "параметров.\n"
 
-#: ../tui/nmtui.c:89
-msgid "NetworkManager TUI"
-msgstr "TUI NetworkManager"
+#~ msgid "error occurred while waiting for data on socket"
+#~ msgstr "произошла ошибка при ожидании данных из сокета"
 
-#: ../tui/nmtui.c:97
-msgid "Please select an option"
-msgstr "Выберите вариант"
+#~ msgid "error processing netlink message: %s"
+#~ msgstr "ошибка обработки сообщения netlink: %s"
 
-#: ../tui/nmtui.c:154
-msgid "Usage"
-msgstr "Использование"
+#~ msgid "unable to connect to netlink for monitoring link status: %s"
+#~ msgstr ""
+#~ "не удалось подключиться к netlink для отслеживания состояния соединения: "
+#~ "%s"
 
-#: ../tui/nmtui.c:221
-msgid "Could not parse arguments"
-msgstr "Не удалось обработать аргументы"
+#~ msgid "unable to enable netlink handle credential passing: %s"
+#~ msgstr "не удалось включить передачу мандата идентификатора netlink: %s"
 
-#: ../tui/nmtui.c:229
-msgid "NetworkManager is not running."
-msgstr "NetworkManager не работает."
+#~ msgid "unable to allocate netlink handle for monitoring link status: %s"
+#~ msgstr ""
+#~ "не удалось создать идентификатор netlink для отслеживания состояния "
+#~ "соединения: %s"
+
+#~ msgid "unable to join netlink group: %s"
+#~ msgstr "не удалось войти в группу netlink: %s"