diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 14:55:55 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 14:55:55 +0200 |
| commit | c333f062ddcba9b35330647bf6cbd0a07f2d786e (patch) | |
| tree | 257c3a0c74c09f4ad2328eab5b932806405f0c1c /po/ru.po | |
| parent | a222e56e103f949b148a6942e385ccca2c26d9f3 (diff) | |
New upstream version 1.8.0 upstream/1.8.0
Diffstat (limited to 'po/ru.po')
| -rw-r--r-- | po/ru.po | 3475 |
1 files changed, 1813 insertions, 1662 deletions
diff --git a/po/ru.po b/po/ru.po index 43cd9aa2..fba0173e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,12 +12,13 @@ # Stas Solovey <whats_up@tut.by>, 2012, 2014, 2015. # Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata # Lubomir Rintel <lkundrak@v3.sk>, 2017. #zanata +# Thomas Haller <thaller@redhat.com>, 2017. #zanata msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-16 16:07+0100\n" -"PO-Revision-Date: 2017-01-16 09:45-0500\n" +"POT-Creation-Date: 2017-05-10 10:43+0200\n" +"PO-Revision-Date: 2017-03-22 10:18-0400\n" "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: Русский <gnome-cyr@gnome.org>\n" "Language: ru\n" @@ -92,29 +93,29 @@ msgstr "" "Запускает nmcli и как агент паролей NetworkManager, и как агент polkit.\n" "\n" -#: ../clients/cli/agent.c:156 +#: ../clients/cli/agent.c:157 #, c-format msgid "nmcli successfully registered as a NetworkManager's secret agent.\n" msgstr "nmcli был успешно зарегистрирован как агент паролей NetworkManager.\n" -#: ../clients/cli/agent.c:158 +#: ../clients/cli/agent.c:159 #, c-format msgid "Error: secret agent initialization failed" msgstr "Ошибка: сбой инициализации агента паролей" -#: ../clients/cli/agent.c:176 +#: ../clients/cli/agent.c:178 #, c-format msgid "Error: polkit agent initialization failed: %s" msgstr "Ошибка: не удалось инициализировать агент polkit: %s" -#: ../clients/cli/agent.c:184 +#: ../clients/cli/agent.c:186 #, c-format msgid "nmcli successfully registered as a polkit agent.\n" msgstr "nmcli был успешно зарегистрирован как агент polkit.\n" #: ../clients/cli/common.c:40 ../clients/cli/common.c:53 #: ../clients/cli/common.c:61 ../clients/cli/common.c:73 -#: ../clients/cli/connections.c:211 ../clients/cli/connections.c:233 +#: ../clients/cli/connections.c:224 ../clients/cli/connections.c:246 msgid "GROUP" msgstr "ГРУППА" @@ -126,7 +127,7 @@ msgstr "АДРЕС" #. 1 #. 2 #: ../clients/cli/common.c:42 ../clients/cli/common.c:63 -#: ../clients/cli/connections.c:236 +#: ../clients/cli/connections.c:249 msgid "GATEWAY" msgstr "ШЛЮЗ" @@ -155,7 +156,7 @@ msgstr "WINS" msgid "OPTION" msgstr "ПАРАМЕТР" -#: ../clients/cli/common.c:378 ../clients/cli/common.c:440 +#: ../clients/cli/common.c:378 ../clients/cli/common.c:449 #, c-format msgid "invalid prefix '%s'; <1-%d> allowed" msgstr "недопустимый префикс «%s» (значение должно лежать в диапазоне <1-%d>)" @@ -165,467 +166,473 @@ msgstr "недопустимый префикс «%s» (значение дол msgid "invalid IP address: %s" msgstr "неверный IP: %s" -#: ../clients/cli/common.c:452 -#, c-format +#: ../clients/cli/common.c:426 +#, fuzzy msgid "" -"the second component of route ('%s') is neither a next hop address nor a " -"metric" +"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [," +"ip[/prefix] ...]'" msgstr "" -"второй компонент маршрута («%s») не содержит адрес точки перехода или метрику" +"Недействительное значение «%s». Допустимый формат: ip[/префикс] " +"[следующий_переход] [метрика])" -#: ../clients/cli/common.c:462 +#: ../clients/cli/common.c:458 #, c-format -msgid "invalid metric '%s'" -msgstr "недопустимая метрика «%s»" +msgid "the next hop ('%s') must be first" +msgstr "" -#: ../clients/cli/common.c:471 +#: ../clients/cli/common.c:464 #, c-format -msgid "invalid route: %s" +msgid "the metric ('%s') must be before attributes" +msgstr "" + +#: ../clients/cli/common.c:504 +#, fuzzy, c-format +msgid "invalid route: %s. " msgstr "неверный маршру: %s" -#: ../clients/cli/common.c:483 +#: ../clients/cli/common.c:516 msgid "default route cannot be added (NetworkManager handles it by itself)" msgstr "" "невозможно добавить маршрут для выбора по умолчанию (NetworkManager " "определяет его самостоятельно)" -#: ../clients/cli/common.c:500 +#: ../clients/cli/common.c:542 msgid "unmanaged" msgstr "без управления" -#: ../clients/cli/common.c:502 +#: ../clients/cli/common.c:544 msgid "unavailable" msgstr "недоступен" -#: ../clients/cli/common.c:504 ../clients/cli/general.c:248 +#: ../clients/cli/common.c:546 ../clients/cli/general.c:248 msgid "disconnected" msgstr "отключено" -#: ../clients/cli/common.c:506 +#: ../clients/cli/common.c:548 msgid "connecting (prepare)" msgstr "подключение (подготовка)" -#: ../clients/cli/common.c:508 +#: ../clients/cli/common.c:550 msgid "connecting (configuring)" msgstr "подключение (настройка)" -#: ../clients/cli/common.c:510 +#: ../clients/cli/common.c:552 msgid "connecting (need authentication)" msgstr "подключение (требуется аутентификация)" -#: ../clients/cli/common.c:512 +#: ../clients/cli/common.c:554 msgid "connecting (getting IP configuration)" msgstr "подключение (получение конфигурации IP)" -#: ../clients/cli/common.c:514 +#: ../clients/cli/common.c:556 msgid "connecting (checking IP connectivity)" msgstr "подключение (проверка IP-подключения)" -#: ../clients/cli/common.c:516 +#: ../clients/cli/common.c:558 msgid "connecting (starting secondary connections)" msgstr "подключение (запуск второстепенных соединений)" -#: ../clients/cli/common.c:518 ../clients/cli/general.c:244 +#: ../clients/cli/common.c:560 ../clients/cli/general.c:244 msgid "connected" msgstr "подключено" -#: ../clients/cli/common.c:520 ../clients/cli/connections.c:628 +#: ../clients/cli/common.c:562 ../clients/cli/connections.c:647 msgid "deactivating" msgstr "деактивация" -#: ../clients/cli/common.c:522 +#: ../clients/cli/common.c:564 msgid "connection failed" msgstr "сбой соединения" -#: ../clients/cli/common.c:524 ../clients/cli/common.c:541 -#: ../clients/cli/connections.c:633 ../clients/cli/connections.c:656 -#: ../clients/cli/connections.c:2136 ../clients/cli/devices.c:1190 -#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1233 -#: ../clients/cli/general.c:251 ../clients/cli/general.c:289 -#: ../clients/cli/general.c:437 ../clients/cli/general.c:452 -#: ../clients/cli/settings.c:869 ../clients/cli/settings.c:955 -#: ../clients/cli/settings.c:1402 ../clients/cli/settings.c:2065 -#: ../clients/cli/settings.c:3533 +#: ../clients/cli/common.c:566 ../clients/cli/common.c:583 +#: ../clients/cli/connections.c:652 ../clients/cli/connections.c:675 +#: ../clients/cli/devices.c:1193 ../clients/cli/devices.c:1235 +#: ../clients/cli/devices.c:1237 ../clients/cli/general.c:251 +#: ../clients/cli/general.c:289 ../clients/cli/general.c:431 +#: ../clients/cli/general.c:446 ../clients/cli/settings.c:926 +#: ../clients/cli/settings.c:1012 ../clients/cli/settings.c:2806 +#: ../clients/cli/settings.c:2925 ../clients/cli/settings.c:5293 #, c-format msgid "unknown" msgstr "неизвестно" #. "CAPABILITIES" -#: ../clients/cli/common.c:533 ../clients/cli/connections.c:944 -#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948 -#: ../clients/cli/connections.c:983 ../clients/cli/connections.c:1053 -#: ../clients/cli/connections.c:1054 ../clients/cli/connections.c:1056 -#: ../clients/cli/connections.c:3471 ../clients/cli/connections.c:4673 -#: ../clients/cli/connections.c:6492 ../clients/cli/connections.c:6493 -#: ../clients/cli/devices.c:868 ../clients/cli/devices.c:1155 -#: ../clients/cli/devices.c:1156 ../clients/cli/devices.c:1157 -#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159 -#: ../clients/cli/devices.c:1194 ../clients/cli/devices.c:1196 -#: ../clients/cli/devices.c:1224 ../clients/cli/devices.c:1225 -#: ../clients/cli/devices.c:1226 ../clients/cli/devices.c:1227 -#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229 -#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1232 -#: ../clients/cli/devices.c:1234 ../clients/cli/general.c:446 -#: ../clients/cli/settings.c:3528 +#: ../clients/cli/common.c:575 ../clients/cli/connections.c:963 +#: ../clients/cli/connections.c:965 ../clients/cli/connections.c:967 +#: ../clients/cli/connections.c:1002 ../clients/cli/connections.c:1072 +#: ../clients/cli/connections.c:1073 ../clients/cli/connections.c:1075 +#: ../clients/cli/connections.c:3512 ../clients/cli/connections.c:4747 +#: ../clients/cli/connections.c:6578 ../clients/cli/connections.c:6579 +#: ../clients/cli/devices.c:869 ../clients/cli/devices.c:1158 +#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1160 +#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1162 +#: ../clients/cli/devices.c:1197 ../clients/cli/devices.c:1199 +#: ../clients/cli/devices.c:1200 ../clients/cli/devices.c:1228 +#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230 +#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1232 +#: ../clients/cli/devices.c:1233 ../clients/cli/devices.c:1234 +#: ../clients/cli/devices.c:1236 ../clients/cli/devices.c:1238 +#: ../clients/cli/general.c:440 ../clients/cli/settings.c:2801 msgid "yes" msgstr "да" -#: ../clients/cli/common.c:535 ../clients/cli/connections.c:944 -#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948 -#: ../clients/cli/connections.c:1053 ../clients/cli/connections.c:1054 -#: ../clients/cli/connections.c:1056 ../clients/cli/connections.c:3472 -#: ../clients/cli/connections.c:4672 ../clients/cli/connections.c:6492 -#: ../clients/cli/connections.c:6493 ../clients/cli/devices.c:868 -#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1156 -#: ../clients/cli/devices.c:1157 ../clients/cli/devices.c:1158 -#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1194 -#: ../clients/cli/devices.c:1196 ../clients/cli/devices.c:1224 -#: ../clients/cli/devices.c:1225 ../clients/cli/devices.c:1226 -#: ../clients/cli/devices.c:1227 ../clients/cli/devices.c:1228 -#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230 -#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1234 -#: ../clients/cli/general.c:448 ../clients/cli/settings.c:3530 +#: ../clients/cli/common.c:577 ../clients/cli/connections.c:963 +#: ../clients/cli/connections.c:965 ../clients/cli/connections.c:967 +#: ../clients/cli/connections.c:1072 ../clients/cli/connections.c:1073 +#: ../clients/cli/connections.c:1075 ../clients/cli/connections.c:3513 +#: ../clients/cli/connections.c:4746 ../clients/cli/connections.c:6578 +#: ../clients/cli/connections.c:6579 ../clients/cli/devices.c:869 +#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159 +#: ../clients/cli/devices.c:1160 ../clients/cli/devices.c:1161 +#: ../clients/cli/devices.c:1162 ../clients/cli/devices.c:1197 +#: ../clients/cli/devices.c:1199 ../clients/cli/devices.c:1200 +#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229 +#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1231 +#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1233 +#: ../clients/cli/devices.c:1234 ../clients/cli/devices.c:1236 +#: ../clients/cli/devices.c:1238 ../clients/cli/general.c:442 +#: ../clients/cli/settings.c:2803 msgid "no" msgstr "нет" -#: ../clients/cli/common.c:537 +#: ../clients/cli/common.c:579 msgid "yes (guessed)" msgstr "да (предположительно)" -#: ../clients/cli/common.c:539 +#: ../clients/cli/common.c:581 msgid "no (guessed)" msgstr "нет (предположительно)" -#: ../clients/cli/common.c:550 +#: ../clients/cli/common.c:592 msgid "No reason given" msgstr "Причина не указана" #. We should not really come here -#: ../clients/cli/common.c:553 ../clients/cli/connections.c:3320 +#: ../clients/cli/common.c:595 ../clients/cli/connections.c:3361 #, c-format msgid "Unknown error" msgstr "Неизвестная ошибка" -#: ../clients/cli/common.c:556 +#: ../clients/cli/common.c:598 msgid "Device is now managed" msgstr "Устройство обслуживается" -#: ../clients/cli/common.c:559 +#: ../clients/cli/common.c:601 msgid "Device is now unmanaged" msgstr "Устройство не обслуживается" -#: ../clients/cli/common.c:562 +#: ../clients/cli/common.c:604 msgid "The device could not be readied for configuration" msgstr "Устройство не позволяет чтение конфигурации" -#: ../clients/cli/common.c:565 +#: ../clients/cli/common.c:607 msgid "" "IP configuration could not be reserved (no available address, timeout, etc.)" msgstr "" "Конфигурация IP не может быть зарезервирована (отсутствует доступный адрес, " "истекло время ожидания и т.д.)" -#: ../clients/cli/common.c:568 +#: ../clients/cli/common.c:610 msgid "The IP configuration is no longer valid" msgstr "Конфигурация IP не актуальна" -#: ../clients/cli/common.c:571 +#: ../clients/cli/common.c:613 msgid "Secrets were required, but not provided" msgstr "Не предоставлена требуемая секретная информация" -#: ../clients/cli/common.c:574 +#: ../clients/cli/common.c:616 msgid "802.1X supplicant disconnected" msgstr "Заявитель 802.1X отключён" -#: ../clients/cli/common.c:577 +#: ../clients/cli/common.c:619 msgid "802.1X supplicant configuration failed" msgstr "Сбой конфигурации заявителя 802.1X" -#: ../clients/cli/common.c:580 +#: ../clients/cli/common.c:622 msgid "802.1X supplicant failed" msgstr "Сбой заявителя 802.1X" -#: ../clients/cli/common.c:583 +#: ../clients/cli/common.c:625 msgid "802.1X supplicant took too long to authenticate" msgstr "Превышено время ожидания при проверке подлинности заявителя 802.1X" -#: ../clients/cli/common.c:586 +#: ../clients/cli/common.c:628 msgid "PPP service failed to start" msgstr "Не удалось запустить службу PPP" -#: ../clients/cli/common.c:589 +#: ../clients/cli/common.c:631 msgid "PPP service disconnected" msgstr "Служба PPP отключена" -#: ../clients/cli/common.c:592 +#: ../clients/cli/common.c:634 msgid "PPP failed" msgstr "Сбой PPP" -#: ../clients/cli/common.c:595 +#: ../clients/cli/common.c:637 msgid "DHCP client failed to start" msgstr "Не удалось запустить клиент DHCP" -#: ../clients/cli/common.c:598 +#: ../clients/cli/common.c:640 msgid "DHCP client error" msgstr "Ошибка клиента DHCP" -#: ../clients/cli/common.c:601 +#: ../clients/cli/common.c:643 msgid "DHCP client failed" msgstr "Сбой клиента DHCP" -#: ../clients/cli/common.c:604 +#: ../clients/cli/common.c:646 msgid "Shared connection service failed to start" msgstr "Не удалось запустить службу общего подключения" -#: ../clients/cli/common.c:607 +#: ../clients/cli/common.c:649 msgid "Shared connection service failed" msgstr "Сбой службы общего подключения" -#: ../clients/cli/common.c:610 +#: ../clients/cli/common.c:652 msgid "AutoIP service failed to start" msgstr "Не удалось запустить службу AutoIP" -#: ../clients/cli/common.c:613 +#: ../clients/cli/common.c:655 msgid "AutoIP service error" msgstr "Сбой службы AutoIP" -#: ../clients/cli/common.c:616 +#: ../clients/cli/common.c:658 msgid "AutoIP service failed" msgstr "Ошибка службы AutoIP" -#: ../clients/cli/common.c:619 +#: ../clients/cli/common.c:661 msgid "The line is busy" msgstr "Линия занята" -#: ../clients/cli/common.c:622 +#: ../clients/cli/common.c:664 msgid "No dial tone" msgstr "Нет гудка" -#: ../clients/cli/common.c:625 +#: ../clients/cli/common.c:667 msgid "No carrier could be established" msgstr "Не удалось установить несущую частоту" -#: ../clients/cli/common.c:628 +#: ../clients/cli/common.c:670 msgid "The dialing request timed out" msgstr "Истекло время ожидания набора номера" -#: ../clients/cli/common.c:631 +#: ../clients/cli/common.c:673 msgid "The dialing attempt failed" msgstr "Во время набора номера произошла ошибка" -#: ../clients/cli/common.c:634 +#: ../clients/cli/common.c:676 msgid "Modem initialization failed" msgstr "Не удалось инициализировать модем" -#: ../clients/cli/common.c:637 +#: ../clients/cli/common.c:679 msgid "Failed to select the specified APN" msgstr "Не удалось выбрать указанный APN" -#: ../clients/cli/common.c:640 +#: ../clients/cli/common.c:682 msgid "Not searching for networks" msgstr "Не выполнять поиск сетей" -#: ../clients/cli/common.c:643 +#: ../clients/cli/common.c:685 msgid "Network registration denied" msgstr "Регистрация сети запрещена" -#: ../clients/cli/common.c:646 +#: ../clients/cli/common.c:688 msgid "Network registration timed out" msgstr "Истекло время ожидания регистрации сети" -#: ../clients/cli/common.c:649 +#: ../clients/cli/common.c:691 msgid "Failed to register with the requested network" msgstr "Не удалось зарегистрироваться в запрошенной сети" -#: ../clients/cli/common.c:652 +#: ../clients/cli/common.c:694 msgid "PIN check failed" msgstr "PIN-код не прошёл проверку" -#: ../clients/cli/common.c:655 +#: ../clients/cli/common.c:697 msgid "Necessary firmware for the device may be missing" msgstr "" "Возможно для устройства требуется дополнительное программное обеспечение" -#: ../clients/cli/common.c:658 +#: ../clients/cli/common.c:700 msgid "The device was removed" msgstr "Устройство извлечено" -#: ../clients/cli/common.c:661 +#: ../clients/cli/common.c:703 msgid "NetworkManager went to sleep" msgstr "NetworkManager перешёл в спящий режим" -#: ../clients/cli/common.c:664 +#: ../clients/cli/common.c:706 msgid "The device's active connection disappeared" msgstr "Устройство потеряло используемое соединение" -#: ../clients/cli/common.c:667 +#: ../clients/cli/common.c:709 msgid "Device disconnected by user or client" msgstr "Устройство отключено пользователем или клиентом" -#: ../clients/cli/common.c:670 +#: ../clients/cli/common.c:712 msgid "Carrier/link changed" msgstr "Произошли изменения линии или несущей частоты" -#: ../clients/cli/common.c:673 +#: ../clients/cli/common.c:715 msgid "The device's existing connection was assumed" msgstr "Существующее соединение устройства принято" -#: ../clients/cli/common.c:676 +#: ../clients/cli/common.c:718 msgid "The supplicant is now available" msgstr "Доступен заявитель" -#: ../clients/cli/common.c:679 +#: ../clients/cli/common.c:721 msgid "The modem could not be found" msgstr "Не удалось обнаружить модем" -#: ../clients/cli/common.c:682 +#: ../clients/cli/common.c:724 msgid "The Bluetooth connection failed or timed out" msgstr "Время ожидания соединения по Bluetooth истекло или произошла ошибка" -#: ../clients/cli/common.c:685 +#: ../clients/cli/common.c:727 msgid "GSM Modem's SIM card not inserted" msgstr "Не вставлена SIM-карта GSM-модема" -#: ../clients/cli/common.c:688 +#: ../clients/cli/common.c:730 msgid "GSM Modem's SIM PIN required" msgstr "Требуется PIN-код к SIM-карте GSM-модема" -#: ../clients/cli/common.c:691 +#: ../clients/cli/common.c:733 msgid "GSM Modem's SIM PUK required" msgstr "Требуется PUK-код к SIM-карте GSM-модема" -#: ../clients/cli/common.c:694 +#: ../clients/cli/common.c:736 msgid "GSM Modem's SIM wrong" msgstr "Неверная SIM-карта GSM модема" -#: ../clients/cli/common.c:697 +#: ../clients/cli/common.c:739 msgid "InfiniBand device does not support connected mode" msgstr "Устройство InfiniBand не поддерживает режим соединения" -#: ../clients/cli/common.c:700 +#: ../clients/cli/common.c:742 msgid "A dependency of the connection failed" msgstr "Сбой зависимости соединения" -#: ../clients/cli/common.c:703 +#: ../clients/cli/common.c:745 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" msgstr "Ошибка RFC 2684 Ethernet с использованием моста ADSL" -#: ../clients/cli/common.c:706 +#: ../clients/cli/common.c:748 msgid "ModemManager is unavailable" msgstr "ModemManager недоступен" -#: ../clients/cli/common.c:709 +#: ../clients/cli/common.c:751 msgid "The Wi-Fi network could not be found" msgstr "Не удалось обнаружить сеть Wi-Fi" -#: ../clients/cli/common.c:712 +#: ../clients/cli/common.c:754 msgid "A secondary connection of the base connection failed" msgstr "Сбой вторичного подключения основого соединения" -#: ../clients/cli/common.c:715 +#: ../clients/cli/common.c:757 msgid "DCB or FCoE setup failed" msgstr "Не удалось настроить DCB или FCoE" -#: ../clients/cli/common.c:718 +#: ../clients/cli/common.c:760 msgid "teamd control failed" msgstr "Не удалось настроить teamd" -#: ../clients/cli/common.c:721 +#: ../clients/cli/common.c:763 msgid "Modem failed or no longer available" msgstr "Произошел сбой модема, или он больше не доступен" -#: ../clients/cli/common.c:724 +#: ../clients/cli/common.c:766 msgid "Modem now ready and available" msgstr "Модем недоступен" -#: ../clients/cli/common.c:727 +#: ../clients/cli/common.c:769 msgid "SIM PIN was incorrect" msgstr "PIN-код SIM-карты указан неверно" -#: ../clients/cli/common.c:730 +#: ../clients/cli/common.c:772 msgid "New connection activation was enqueued" msgstr "Действие активации соединение поставлено в очередь" -#: ../clients/cli/common.c:733 +#: ../clients/cli/common.c:775 msgid "The device's parent changed" msgstr "Родительское устройство было изменено" -#: ../clients/cli/common.c:736 +#: ../clients/cli/common.c:778 msgid "The device parent's management changed" msgstr "Параметры управления родительским устройством изменились" #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) -#: ../clients/cli/common.c:740 ../libnm-glib/nm-device.c:1898 -#: ../libnm/nm-device.c:1700 +#: ../clients/cli/common.c:782 ../libnm-glib/nm-device.c:1860 +#: ../libnm/nm-device.c:1660 msgid "Unknown" msgstr "Неизвестно" -#: ../clients/cli/common.c:782 +#: ../clients/cli/common.c:824 #, c-format msgid "invalid priority map '%s'" msgstr "Неверная схема приоритетов «%s»" -#: ../clients/cli/common.c:789 ../clients/cli/common.c:795 +#: ../clients/cli/common.c:831 ../clients/cli/common.c:837 #, c-format msgid "priority '%s' is not valid (<0-%ld>)" msgstr "недопустимый приоритет «%s» (<0-%ld>)" -#: ../clients/cli/common.c:869 +#: ../clients/cli/common.c:911 #, c-format msgid "cannot read team config from file '%s'" msgstr "" -#: ../clients/cli/common.c:876 +#: ../clients/cli/common.c:918 #, c-format msgid "team config file '%s' contains non-valid utf-8" msgstr "" -#: ../clients/cli/common.c:888 +#: ../clients/cli/common.c:930 #, c-format msgid "'%s' does not contain a valid team configuration" msgstr "" -#: ../clients/cli/common.c:891 +#: ../clients/cli/common.c:933 #, c-format msgid "team configuration must be a JSON object" msgstr "" -#: ../clients/cli/common.c:944 +#: ../clients/cli/common.c:986 #, c-format msgid "cannot read pac-script from file '%s'" msgstr "" -#: ../clients/cli/common.c:951 +#: ../clients/cli/common.c:993 #, c-format msgid "file '%s' contains non-valid utf-8" msgstr "" -#: ../clients/cli/common.c:964 +#: ../clients/cli/common.c:1006 #, c-format msgid "'%s' does not contain a valid PAC Script" msgstr "" -#: ../clients/cli/common.c:967 +#: ../clients/cli/common.c:1009 #, c-format msgid "Not a valid PAC Script" msgstr "" -#: ../clients/cli/common.c:1090 +#: ../clients/cli/common.c:1132 #, c-format msgid "Error: openconnect failed: %s\n" msgstr "Ошибка openconnect: %s\n" -#: ../clients/cli/common.c:1097 +#: ../clients/cli/common.c:1139 #, c-format msgid "Error: openconnect failed with status %d\n" msgstr "Ошибка: выполнение openconnect завершилось неудачей. Код: %d\n" -#: ../clients/cli/common.c:1099 +#: ../clients/cli/common.c:1141 #, c-format msgid "Error: openconnect failed with signal %d\n" msgstr "Ошибка: выполнение openconnect завершилось неудачей. Сигнал: %d\n" -#: ../clients/cli/common.c:1180 +#: ../clients/cli/common.c:1222 #, c-format msgid "" "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " @@ -634,25 +641,25 @@ msgstr "" "Предупреждение. В файле «passwd-file» не определен пароль для «%s», поэтому " "для продолжения работы nmcli необходимо использовать ключ «--ask».\n" -#: ../clients/cli/common.c:1609 ../clients/nm-online.c:159 +#: ../clients/cli/common.c:1651 #, c-format msgid "Error: Could not create NMClient object: %s." msgstr "Ошибка: не удалось создать объект NMClient: %s." -#: ../clients/cli/common.c:1629 +#: ../clients/cli/common.c:1671 msgid "Error: NetworkManager is not running." msgstr "Ошибка: NetworkManager не запущен." -#: ../clients/cli/common.c:1713 +#: ../clients/cli/common.c:1768 #, c-format msgid "Error: argument '%s' not understood. Try passing --help instead." msgstr "" -#: ../clients/cli/common.c:1723 +#: ../clients/cli/common.c:1778 msgid "Error: missing argument. Try passing --help." msgstr "" -#: ../clients/cli/common.c:1776 +#: ../clients/cli/common.c:1831 msgid "access denied" msgstr "" @@ -704,7 +711,7 @@ msgstr "Тип Bluetooth: %s" msgid "Bonding mode" msgstr "Режим мониторинга агрегации (Bond): %s" -#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4257 +#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4320 #, fuzzy msgid "Bonding monitoring mode" msgstr "Режим мониторинга агрегации (Bond): %s" @@ -738,39 +745,48 @@ msgstr "VLAN" #: ../clients/cli/connections.c:111 #, fuzzy +msgid "MACsec mode" +msgstr "VLAN" + +#: ../clients/cli/connections.c:116 +msgid "Proxy method" +msgstr "" + +#: ../clients/cli/connections.c:121 +#, fuzzy msgid "Connection (name, UUID, or path)" msgstr "Соединение (имя, UUID, или путь):" -#: ../clients/cli/connections.c:112 +#: ../clients/cli/connections.c:122 #, fuzzy msgid "VPN connection (name, UUID, or path)" msgstr "Соединение (имя, UUID, или путь):" -#: ../clients/cli/connections.c:113 +#: ../clients/cli/connections.c:123 #, fuzzy msgid "Connection(s) (name, UUID, or path)" msgstr "Соединение (имя, UUID, или путь):" -#: ../clients/cli/connections.c:114 +#: ../clients/cli/connections.c:124 #, fuzzy msgid "Connection(s) (name, UUID, path or apath)" msgstr "Соединение (имя, UUID, или путь):" #. 0 -#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:212 +#: ../clients/cli/connections.c:130 ../clients/cli/connections.c:225 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:90 -#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111 -#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138 -#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177 -#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201 -#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:221 -#: ../clients/cli/devices.c:262 +#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:112 +#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:139 +#: ../clients/cli/devices.c:152 ../clients/cli/devices.c:178 +#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202 +#: ../clients/cli/devices.c:212 ../clients/cli/devices.c:222 +#: ../clients/cli/devices.c:263 msgid "NAME" msgstr "ИМЯ" #. 0 #. 1 -#: ../clients/cli/connections.c:121 ../clients/cli/connections.c:213 +#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:226 msgid "UUID" msgstr "UUID" @@ -778,35 +794,35 @@ msgstr "UUID" #. 0 #. 1 #. 2 -#: ../clients/cli/connections.c:122 ../clients/cli/connections.c:234 +#: ../clients/cli/connections.c:132 ../clients/cli/connections.c:247 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58 -#: ../clients/cli/devices.c:180 +#: ../clients/cli/devices.c:181 msgid "TYPE" msgstr "ТИП" #. 2 -#: ../clients/cli/connections.c:123 +#: ../clients/cli/connections.c:133 msgid "TIMESTAMP" msgstr "МЕТКА ВРЕМЕНИ" #. 3 -#: ../clients/cli/connections.c:124 +#: ../clients/cli/connections.c:134 msgid "TIMESTAMP-REAL" msgstr "ДЕЙСТВ. МЕТКА ВРЕМЕНИ" #. 4 #. 16 -#: ../clients/cli/connections.c:125 ../clients/cli/devices.c:73 +#: ../clients/cli/connections.c:135 ../clients/cli/devices.c:73 msgid "AUTOCONNECT" msgstr "АВТОПОДКЛЮЧЕНИЕ" #. 5 -#: ../clients/cli/connections.c:126 +#: ../clients/cli/connections.c:136 msgid "AUTOCONNECT-PRIORITY" msgstr "ПРИОРИТЕТ-АВТОПОДКЛЮЧЕНИЯ" #. 6 -#: ../clients/cli/connections.c:127 +#: ../clients/cli/connections.c:137 msgid "READONLY" msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ" @@ -815,17 +831,17 @@ msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ" #. 2 #. 15 #. 5 -#: ../clients/cli/connections.c:128 ../clients/cli/connections.c:220 -#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:167 -#: ../clients/cli/devices.c:183 +#: ../clients/cli/connections.c:138 ../clients/cli/connections.c:233 +#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:168 +#: ../clients/cli/devices.c:184 msgid "DBUS-PATH" msgstr "DBUS-PATH" #. 8 #. 13 #. 4 -#: ../clients/cli/connections.c:129 ../clients/cli/devices.c:165 -#: ../clients/cli/devices.c:182 +#: ../clients/cli/connections.c:139 ../clients/cli/devices.c:166 +#: ../clients/cli/devices.c:183 msgid "ACTIVE" msgstr "АКТИВЕН" @@ -834,9 +850,9 @@ msgstr "АКТИВЕН" #. 12 #. 3 #. 0 -#: ../clients/cli/connections.c:130 ../clients/cli/devices.c:41 -#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:164 -#: ../clients/cli/devices.c:181 ../clients/cli/devices.c:263 +#: ../clients/cli/connections.c:140 ../clients/cli/devices.c:41 +#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:165 +#: ../clients/cli/devices.c:182 ../clients/cli/devices.c:264 msgid "DEVICE" msgstr "УСТРОЙСТВО" @@ -845,46 +861,46 @@ msgstr "УСТРОЙСТВО" #. 1 #. 10 #. 1 -#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:215 +#: ../clients/cli/connections.c:141 ../clients/cli/connections.c:228 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67 #: ../clients/cli/general.c:39 msgid "STATE" msgstr "СОСТОЯНИЕ" #. 11 -#: ../clients/cli/connections.c:132 +#: ../clients/cli/connections.c:142 msgid "ACTIVE-PATH" msgstr "АКТИВНЫЙ-ПУТЬ" #. 12 -#: ../clients/cli/connections.c:133 +#: ../clients/cli/connections.c:143 msgid "SLAVE" msgstr "" #. 2 -#: ../clients/cli/connections.c:214 +#: ../clients/cli/connections.c:227 msgid "DEVICES" msgstr "УСТРОЙСТВА" #. 4 -#: ../clients/cli/connections.c:216 +#: ../clients/cli/connections.c:229 msgid "DEFAULT" msgstr "ПО УМОЛЧАНИЮ" #. 5 -#: ../clients/cli/connections.c:217 +#: ../clients/cli/connections.c:230 msgid "DEFAULT6" msgstr "ПО УМОЛЧАНИЮ 6" #. 6 -#: ../clients/cli/connections.c:218 +#: ../clients/cli/connections.c:231 msgid "SPEC-OBJECT" msgstr "SPEC-OBJECT" #. 7 #. 4 -#: ../clients/cli/connections.c:219 ../clients/cli/connections.c:257 -#: ../clients/cli/general.c:1131 ../clients/tui/nm-editor-utils.c:241 +#: ../clients/cli/connections.c:232 ../clients/cli/connections.c:270 +#: ../clients/cli/general.c:1169 ../clients/tui/nm-editor-utils.c:241 #: ../clients/tui/nmt-connect-connection-list.c:406 msgid "VPN" msgstr "VPN" @@ -892,70 +908,70 @@ msgstr "VPN" #. 9 #. 5 #. 22 -#: ../clients/cli/connections.c:221 ../clients/cli/devices.c:47 +#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:47 #: ../clients/cli/devices.c:79 msgid "CON-PATH" msgstr "ПУТЬ ПОДКЛЮЧЕНИЯ" #. 10 -#: ../clients/cli/connections.c:222 +#: ../clients/cli/connections.c:235 msgid "ZONE" msgstr "ЗОНА" #. 11 -#: ../clients/cli/connections.c:223 +#: ../clients/cli/connections.c:236 msgid "MASTER-PATH" msgstr "МАСТЕР-ПУТЬ" #. 1 -#: ../clients/cli/connections.c:235 +#: ../clients/cli/connections.c:248 msgid "USERNAME" msgstr "ИМЯ_ПОЛЬЗОВАТЕЛЯ" #. 3 -#: ../clients/cli/connections.c:237 +#: ../clients/cli/connections.c:250 msgid "BANNER" msgstr "БАННЕР" #. 4 -#: ../clients/cli/connections.c:238 +#: ../clients/cli/connections.c:251 msgid "VPN-STATE" msgstr "СТАТУС VPN" #. 5 -#: ../clients/cli/connections.c:239 +#: ../clients/cli/connections.c:252 msgid "CFG" msgstr "CFG" -#: ../clients/cli/connections.c:252 ../clients/cli/devices.c:236 +#: ../clients/cli/connections.c:265 ../clients/cli/devices.c:237 msgid "GENERAL" msgstr "ОБЩИЕ" #. 0 #. 6 -#: ../clients/cli/connections.c:253 ../clients/cli/devices.c:243 +#: ../clients/cli/connections.c:266 ../clients/cli/devices.c:244 msgid "IP4" msgstr "IP4" #. 1 #. 7 -#: ../clients/cli/connections.c:254 ../clients/cli/devices.c:244 +#: ../clients/cli/connections.c:267 ../clients/cli/devices.c:245 msgid "DHCP4" msgstr "DHCP4" #. 2 #. 8 -#: ../clients/cli/connections.c:255 ../clients/cli/devices.c:245 +#: ../clients/cli/connections.c:268 ../clients/cli/devices.c:246 msgid "IP6" msgstr "IP6" #. 3 #. 9 -#: ../clients/cli/connections.c:256 ../clients/cli/devices.c:246 +#: ../clients/cli/connections.c:269 ../clients/cli/devices.c:247 msgid "DHCP6" msgstr "DHCP6" -#: ../clients/cli/connections.c:288 +#: ../clients/cli/connections.c:301 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" @@ -996,7 +1012,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:310 +#: ../clients/cli/connections.c:323 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" @@ -1042,7 +1058,7 @@ msgstr "" "Аргумент --active предназначен для просмотра списка активных профилей;\n" "глобальный ключ --show-secrets добавляет в вывод соответствующие секреты.\n" -#: ../clients/cli/connections.c:331 +#: ../clients/cli/connections.c:344 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -1085,7 +1101,7 @@ msgstr "" "nsp — NSP (только для WiMAX)\n" "passwd-file — файл с паролями, необходимыми для установки соединения.\n" -#: ../clients/cli/connections.c:352 +#: ../clients/cli/connections.c:365 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -1106,7 +1122,7 @@ msgstr "" "автоматической установки соединения в будущем. \n" "Профиль определяется по имени, UUID или пути D-Bus.\n" -#: ../clients/cli/connections.c:364 +#: ../clients/cli/connections.c:377 #, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" @@ -1224,6 +1240,13 @@ msgid "" " [local <local endpoint IP>]\n" " [dev <parent device (ifname or connection UUID)>]\n" "\n" +" macsec: dev <parent device (connection UUID, ifname, or MAC)>\n" +" mode <psk|eap>\n" +" [cak <key> ckn <key>]\n" +" [encrypt yes|no]\n" +" [port 1-65534]\n" +"\n" +"\n" " macvlan: dev <parent device (connection UUID, ifname, or MAC)>\n" " mode vepa|bridge|private|passthru|source\n" " [tap yes|no]\n" @@ -1236,6 +1259,8 @@ msgid "" " [source-port-max <0-65535>]\n" " [destination-port <0-65535>]\n" "\n" +" dummy: \n" +"\n" " SLAVE_OPTIONS:\n" " bridge: [priority <0-63>]\n" " [path-cost <1-65535>]\n" @@ -1248,148 +1273,8 @@ msgid "" " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n" "\n" msgstr "" -"Формат: nmcli connection add { АРГУМЕНТЫ | help }\n" -"\n" -"АРГУМЕНТЫ := ОБЩИЕ ТИПОВЫЕ ПОДЧИНЕННЫЕ IP-ПАРАМЕТРЫ [-- ([+|-]<параметр>." -"<свойство> <значение>)+]\n" -"\n" -" ОБЩИЕ ПАРАМЕТРЫ:\n" -" type <тип>\n" -" ifname <интерфейс> | \"*\"\n" -" [con-name <соединение>]\n" -" [autoconnect yes|no]\n" -" [save yes|no]\n" -" [master <мастер (ifname или же UUID или имя соединения)>]\n" -" [slave-type <тип_соединения>]\n" -"\n" -" ТИПОВЫЕ ПАРАМЕТРЫ:\n" -" ethernet: [mac <MAC-адрес>]\n" -" [cloned-mac <клонированный MAC-адрес>]\n" -" [mtu <MTU>]\n" -"\n" -" wifi: ssid <SSID>\n" -" [mac <MAC-адрес>]\n" -" [cloned-mac <клонированный MAC-адрес>]\n" -" [mtu <MTU>]\n" -" [mode infrastructure|ap|adhoc]\n" -"\n" -" wimax: [mac <MAC-адрес>]\n" -" [nsp <NSP>]\n" -"\n" -" pppoe: username <пользователь PPPoE>\n" -" [password <пароль PPPoE>]\n" -" [service <служба PPPoE>]\n" -" [mtu <MTU>]\n" -" [mac <MAC-адрес>]\n" -"\n" -" gsm: apn <APN>\n" -" [user <пользователь>]\n" -" [password <пароль>]\n" -"\n" -" cdma: [user <пользователь>]\n" -" [password <пароль>]\n" -"\n" -" infiniband: [mac <MAC-адрес>]\n" -" [mtu <MTU>]\n" -" [transport-mode datagram | connected]\n" -" [parent <интерфейс>]\n" -" [p-key <ключ IPoIB>]\n" -"\n" -" bluetooth: [addr <адрес bluetooth>]\n" -" [bt-type panu|dun-gsm|dun-cdma]\n" -"\n" -" vlan: dev <род. устройство (UUID соединения, имя интерфейса или " -"MAC-адрес)>\n" -" id <VLAN ID>\n" -" [flags <флаги VLAN>]\n" -" [ingress <соответствие приоритета на входе>]\n" -" [egress <соответствие приоритета на выходе>]\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 <интерфейс>]\n" -" [miimon <число>]\n" -" [downdelay <число>]\n" -" [updelay <число>]\n" -" [arp-interval <число>]\n" -" [arp-ip-target <число>]\n" -" [lacp-rate slow (0) | fast (1)]\n" -"\n" -" bond-slave: master <мастер (имя интерфейса или UUID соединения)>\n" -"\n" -" team: [config <файл>|<данные JSON>]\n" -"\n" -" team-slave: master <мастер (имя интерфейса или UUID соединения)>\n" -" [config <файл>|<данные JSON>]\n" -"\n" -" bridge: [stp yes|no]\n" -" [priority <число>]\n" -" [forward-delay <2-30>]\n" -" [hello-time <1-10>]\n" -" [max-age <6-40>]\n" -" [ageing-time <0-1000000>]\n" -" [multicast-snooping yes|no]\n" -" [mac <MAC-адрес>]\n" -"\n" -" bridge-slave: master <мастер (имя интерфейса или UUID соединения)>\n" -" [priority <0-63>]\n" -" [path-cost <1-65535>]\n" -" [hairpin yes|no]\n" -"\n" -" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|" -"ssh|l2tp|iodine|..\n" -" [user <пользователь>]\n" -"\n" -" olpc-mesh: ssid <SSID>\n" -" [channel <1-13>]\n" -" [dhcp-anycast <MAC-адрес>]\n" -"\n" -" adsl: username <имя_пользователя>\n" -" protocol pppoa|pppoe|ipoatm\n" -" [password <пароль>]\n" -" [encapsulation vcmux|llc]\n" -"\n" -" tun: mode tun|tap\n" -" [owner <UID>]\n" -" [group <GID>]\n" -" [pi yes|no]\n" -" [vnet-hdr yes|no]\n" -" [multi-queue yes|no]\n" -"\n" -" ip-tunnel: mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n" -" remote <IP-адрес удаленной точки>\n" -" [local <IP-адрес локальной точки>]\n" -" [dev <родитель (ifname или UUID)>]\n" -"\n" -" macvlan: dev <родитель (UUID, ifname или MAC-адрес)>\n" -" mode vepa|bridge|private|passthru|source\n" -" [tap yes|no]\n" -"\n" -" vxlan: id <VXLAN ID>\n" -" remote <IP-адрес многоадресной группы или удаленный " -"адрес>\n" -" [local <IP-адрес источника>]\n" -" [dev <родитель (ifname или UUID)>]\n" -" [source-port-min <0-65535>]\n" -" [source-port-max <0-65535>]\n" -" [destination-port <0-65535>]\n" -"\n" -" ПОДЧИНЕННЫЕ ИНТЕРФЕЙСЫ:\n" -" bridge: [priority <0-63>]\n" -" [path-cost <1-65535>]\n" -" [hairpin yes|no]\n" -"\n" -" team: [config <файл>|<необработанные данные JSON>]\n" -"\n" -" IP-ПАРАМЕТРЫ:\n" -" [ip4 <адрес IPv4>] [gw4 <шлюз IPv4>]\n" -" [ip6 <адрес IPv6>] [gw6 <шлюз IPv6>]\n" -"\n" -#: ../clients/cli/connections.c:476 +#: ../clients/cli/connections.c:495 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -1435,7 +1320,7 @@ msgstr "" "nmcli con mod bond0 +bond.options mii=500\n" "nmcli con mod bond0 -bond.options downdelay\n" -#: ../clients/cli/connections.c:499 +#: ../clients/cli/connections.c:518 #, c-format msgid "" "Usage: nmcli connection clone { ARGUMENTS | help }\n" @@ -1457,7 +1342,7 @@ msgstr "" "идентификатора UUID (генерируется автоматически) \n" "и id (определяется на основании аргумента <новое имя>).\n" -#: ../clients/cli/connections.c:511 +#: ../clients/cli/connections.c:530 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -1484,7 +1369,7 @@ msgstr "" "Добавление нового профиля соединения в интерактивном редакторе.\n" "\n" -#: ../clients/cli/connections.c:526 +#: ../clients/cli/connections.c:545 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -1503,7 +1388,7 @@ msgstr "" "Профиль определяется по имени, UUID или пути D-Bus.\n" "\n" -#: ../clients/cli/connections.c:537 +#: ../clients/cli/connections.c:556 #, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" @@ -1523,7 +1408,7 @@ msgstr "" "Эта команда выводит новую строку в ответ на изменения профиля.\n" "Если профиль не указан явно, будут отслеживаться все профили.\n" -#: ../clients/cli/connections.c:549 +#: ../clients/cli/connections.c:568 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -1536,7 +1421,7 @@ msgstr "" "Перезагрузка файлов соединений с диска.\n" "\n" -#: ../clients/cli/connections.c:557 +#: ../clients/cli/connections.c:576 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -1558,7 +1443,7 @@ msgstr "" "\n" "\n" -#: ../clients/cli/connections.c:569 +#: ../clients/cli/connections.c:588 #, c-format msgid "" "Usage: nmcli connection import { ARGUMENTS | help }\n" @@ -1583,7 +1468,7 @@ msgstr "" "Импорт данных осуществляется дополнительными \n" "модулями VPN для NetworkManager.\n" -#: ../clients/cli/connections.c:582 +#: ../clients/cli/connections.c:601 #, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" @@ -1602,232 +1487,267 @@ msgstr "" "Экспортируемые данные будут направлены в стандартный поток вывода \n" "или, если указано имя файла, в файл.\n" -#: ../clients/cli/connections.c:624 +#: ../clients/cli/connections.c:643 msgid "activating" msgstr "активация" -#: ../clients/cli/connections.c:626 +#: ../clients/cli/connections.c:645 msgid "activated" msgstr "включено" -#: ../clients/cli/connections.c:630 +#: ../clients/cli/connections.c:649 msgid "deactivated" msgstr "отключено" -#: ../clients/cli/connections.c:642 +#: ../clients/cli/connections.c:661 msgid "VPN connecting (prepare)" msgstr "Подключение VPN (подготовка)" -#: ../clients/cli/connections.c:644 +#: ../clients/cli/connections.c:663 msgid "VPN connecting (need authentication)" msgstr "Подключение VPN (требуется аутентификация)" -#: ../clients/cli/connections.c:646 +#: ../clients/cli/connections.c:665 msgid "VPN connecting" msgstr "Подключение VPN" -#: ../clients/cli/connections.c:648 +#: ../clients/cli/connections.c:667 msgid "VPN connecting (getting IP configuration)" msgstr "Подключение VPN (получение конфигурации IP)" -#: ../clients/cli/connections.c:650 +#: ../clients/cli/connections.c:669 msgid "VPN connected" msgstr "VPN подключён" -#: ../clients/cli/connections.c:652 +#: ../clients/cli/connections.c:671 msgid "VPN connection failed" msgstr "Сбой подключения VPN" -#: ../clients/cli/connections.c:654 +#: ../clients/cli/connections.c:673 msgid "VPN disconnected" msgstr "VPN отключён" -#: ../clients/cli/connections.c:724 +#: ../clients/cli/connections.c:743 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "Ошибка при обновлении секретов для %s: %s\n" -#: ../clients/cli/connections.c:744 +#: ../clients/cli/connections.c:763 msgid "Connection profile details" msgstr "Свойства профиля соединения" -#: ../clients/cli/connections.c:756 ../clients/cli/connections.c:1183 +#: ../clients/cli/connections.c:775 ../clients/cli/connections.c:1202 #, c-format msgid "Error: 'connection show': %s" msgstr "Ошибка «connection show»: %s" -#: ../clients/cli/connections.c:943 ../clients/cli/settings.c:2061 +#: ../clients/cli/connections.c:962 ../clients/cli/settings.c:5289 msgid "never" msgstr "никогда" -#: ../clients/cli/connections.c:1171 +#: ../clients/cli/connections.c:1190 #, fuzzy msgid "Activate connection details" msgstr "Сведения об активном соединении" -#: ../clients/cli/connections.c:1407 +#: ../clients/cli/connections.c:1426 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "неверное поле «%s»; допустимые поля: %s и %s или %s,%s" -#: ../clients/cli/connections.c:1422 ../clients/cli/connections.c:1430 +#: ../clients/cli/connections.c:1441 ../clients/cli/connections.c:1449 #, c-format msgid "'%s' has to be alone" msgstr "«%s» не может использоваться с чем-либо другим" -#: ../clients/cli/connections.c:1630 +#: ../clients/cli/connections.c:1649 #, c-format msgid "incorrect string '%s' of '--order' option" msgstr "неверная строка «%s» в параметре «--order»" -#: ../clients/cli/connections.c:1656 +#: ../clients/cli/connections.c:1675 #, c-format msgid "incorrect item '%s' in '--order' option" msgstr "неверный элемент «%s» в параметре «--order»" -#: ../clients/cli/connections.c:1686 +#: ../clients/cli/connections.c:1705 msgid "No connection specified" msgstr "" -#: ../clients/cli/connections.c:1699 +#: ../clients/cli/connections.c:1720 #, c-format msgid "%s argument is missing" msgstr "" -#: ../clients/cli/connections.c:1709 +#: ../clients/cli/connections.c:1730 #, c-format msgid "unknown connection '%s'" msgstr "" -#: ../clients/cli/connections.c:1750 +#: ../clients/cli/connections.c:1763 msgid "'--order' argument is missing" msgstr "отсутствует аргумент «--order»" #. Add headers -#: ../clients/cli/connections.c:1792 +#: ../clients/cli/connections.c:1801 msgid "NetworkManager active profiles" msgstr "Активные профили NetworkManager" -#: ../clients/cli/connections.c:1793 +#: ../clients/cli/connections.c:1802 msgid "NetworkManager connection profiles" msgstr "Профили соединений NetworkManager" -#: ../clients/cli/connections.c:1844 ../clients/cli/connections.c:2625 -#: ../clients/cli/connections.c:2635 ../clients/cli/connections.c:2645 -#: ../clients/cli/connections.c:2812 ../clients/cli/connections.c:8517 -#: ../clients/cli/connections.c:8528 ../clients/cli/devices.c:2640 -#: ../clients/cli/devices.c:2648 ../clients/cli/devices.c:2883 -#: ../clients/cli/devices.c:2891 ../clients/cli/devices.c:2907 -#: ../clients/cli/devices.c:2914 ../clients/cli/devices.c:2933 -#: ../clients/cli/devices.c:2941 ../clients/cli/devices.c:2956 -#: ../clients/cli/devices.c:3332 ../clients/cli/devices.c:3340 -#: ../clients/cli/devices.c:3346 ../clients/cli/devices.c:3356 -#: ../clients/cli/devices.c:3369 ../clients/cli/devices.c:3375 -#: ../clients/cli/devices.c:3547 ../clients/cli/devices.c:3556 -#: ../clients/cli/devices.c:3731 +#: ../clients/cli/connections.c:1872 ../clients/cli/connections.c:2617 +#: ../clients/cli/connections.c:2629 ../clients/cli/connections.c:2641 +#: ../clients/cli/connections.c:2817 ../clients/cli/connections.c:8656 +#: ../clients/cli/connections.c:8673 ../clients/cli/devices.c:2652 +#: ../clients/cli/devices.c:2662 ../clients/cli/devices.c:2898 +#: ../clients/cli/devices.c:2908 ../clients/cli/devices.c:2926 +#: ../clients/cli/devices.c:2935 ../clients/cli/devices.c:2956 +#: ../clients/cli/devices.c:2967 ../clients/cli/devices.c:2985 +#: ../clients/cli/devices.c:3363 ../clients/cli/devices.c:3373 +#: ../clients/cli/devices.c:3381 ../clients/cli/devices.c:3393 +#: ../clients/cli/devices.c:3408 ../clients/cli/devices.c:3416 +#: ../clients/cli/devices.c:3590 ../clients/cli/devices.c:3601 +#: ../clients/cli/devices.c:3771 #, c-format msgid "Error: %s argument is missing." msgstr "Ошибка: отсутствует аргумент %s." -#: ../clients/cli/connections.c:1863 +#: ../clients/cli/connections.c:1891 #, c-format msgid "Error: %s - no such connection profile." msgstr "Ошибка: профиль %s не обнаружен." -#: ../clients/cli/connections.c:1927 ../clients/cli/connections.c:2614 -#: ../clients/cli/connections.c:2673 ../clients/cli/connections.c:8042 -#: ../clients/cli/connections.c:8151 ../clients/cli/connections.c:8639 -#: ../clients/cli/devices.c:1496 ../clients/cli/devices.c:1554 -#: ../clients/cli/devices.c:1840 ../clients/cli/devices.c:2008 -#: ../clients/cli/devices.c:2115 ../clients/cli/devices.c:2303 -#: ../clients/cli/devices.c:3513 ../clients/cli/devices.c:3623 -#: ../clients/cli/devices.c:3737 ../clients/cli/devices.c:3795 -#: ../clients/cli/general.c:391 ../clients/cli/general.c:572 -#: ../clients/cli/general.c:615 ../clients/cli/general.c:642 -#: ../clients/cli/general.c:832 ../clients/cli/general.c:886 +#: ../clients/cli/connections.c:1955 ../clients/cli/connections.c:2604 +#: ../clients/cli/connections.c:2668 ../clients/cli/connections.c:8148 +#: ../clients/cli/connections.c:8259 ../clients/cli/connections.c:8787 +#: ../clients/cli/devices.c:1554 ../clients/cli/devices.c:1841 +#: ../clients/cli/devices.c:2010 ../clients/cli/devices.c:2118 +#: ../clients/cli/devices.c:2307 ../clients/cli/devices.c:3553 +#: ../clients/cli/devices.c:3777 ../clients/cli/general.c:603 +#: ../clients/cli/general.c:868 #, c-format msgid "Error: %s." msgstr "Ошибка: %s." -#: ../clients/cli/connections.c:2025 +#: ../clients/cli/connections.c:2053 #, c-format msgid "no active connection on device '%s'" msgstr "на устройстве «%s» нет активных соединений" -#: ../clients/cli/connections.c:2033 +#: ../clients/cli/connections.c:2061 msgid "no active connection or device" msgstr "на устройстве нет активных соединений" -#: ../clients/cli/connections.c:2053 +#: ../clients/cli/connections.c:2081 #, c-format msgid "device '%s' not compatible with connection '%s':" msgstr "" -#: ../clients/cli/connections.c:2089 +#: ../clients/cli/connections.c:2117 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "устройство «%s» несовместимо с соединением «%s»" -#: ../clients/cli/connections.c:2092 +#: ../clients/cli/connections.c:2120 #, c-format msgid "no device found for connection '%s'" msgstr "не найдено устройство для соединения «%s»" -#: ../clients/cli/connections.c:2112 -msgid "unknown reason" +#: ../clients/cli/connections.c:2140 +#, fuzzy +msgid "Unknown reason" msgstr "неизвестная причина" -#: ../clients/cli/connections.c:2114 ../clients/cli/general.c:280 -msgid "none" -msgstr "нет" +#: ../clients/cli/connections.c:2142 +#, fuzzy +msgid "The connection was disconnected" +msgstr "Это не агрегированное соединение (bond)." -#: ../clients/cli/connections.c:2116 -msgid "the user was disconnected" -msgstr "пользователь был отключён" +#: ../clients/cli/connections.c:2144 +#, fuzzy +msgid "Disconnected by user" +msgstr "Отключено через D-Bus" -#: ../clients/cli/connections.c:2118 -msgid "the base network connection was interrupted" +#: ../clients/cli/connections.c:2146 +#, fuzzy +msgid "The base network connection was interrupted" msgstr "основное соединение с сетью было разорвано" -#: ../clients/cli/connections.c:2120 -msgid "the VPN service stopped unexpectedly" +#: ../clients/cli/connections.c:2148 +#, fuzzy +msgid "The VPN service stopped unexpectedly" msgstr "служба VPN внезапно прекратила работу" -#: ../clients/cli/connections.c:2122 -msgid "the VPN service returned invalid configuration" +#: ../clients/cli/connections.c:2150 +#, fuzzy +msgid "The VPN service returned invalid configuration" msgstr "служба VPN вернула недопустимую конфигурацию" -#: ../clients/cli/connections.c:2124 -msgid "the connection attempt timed out" +#: ../clients/cli/connections.c:2152 +#, fuzzy +msgid "The connection attempt timed out" msgstr "время ожидания соединения истекло" -#: ../clients/cli/connections.c:2126 -msgid "the VPN service did not start in time" +#: ../clients/cli/connections.c:2154 +#, fuzzy +msgid "The VPN service did not start in time" msgstr "служба VPN не была запущена вовремя" -#: ../clients/cli/connections.c:2128 -msgid "the VPN service failed to start" +#: ../clients/cli/connections.c:2156 +#, fuzzy +msgid "The VPN service failed to start" msgstr "не удалось запустить службу VPN" -#: ../clients/cli/connections.c:2130 -msgid "no valid VPN secrets" +#: ../clients/cli/connections.c:2158 +#, fuzzy +msgid "No valid secrets" msgstr "нет верных секретов VPN" -#: ../clients/cli/connections.c:2132 -msgid "invalid VPN secrets" +#: ../clients/cli/connections.c:2160 +#, fuzzy +msgid "Invalid secrets" msgstr "неверные секреты VPN" -#: ../clients/cli/connections.c:2134 -msgid "the connection was removed" +#: ../clients/cli/connections.c:2162 +#, fuzzy +msgid "The connection was removed" msgstr "соединение удалено" -#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:2193 -#: ../clients/cli/connections.c:2372 ../clients/cli/connections.c:6382 +#: ../clients/cli/connections.c:2164 +#, fuzzy +msgid "Master connection failed" +msgstr "сбой соединения" + +#: ../clients/cli/connections.c:2166 +#, fuzzy +msgid "Could not create a software link" +msgstr "Не удалось создать временный файл: %s" + +#: ../clients/cli/connections.c:2168 +#, fuzzy +msgid "The device disappeared" +msgstr "Устройство потеряло используемое соединение" + +#: ../clients/cli/connections.c:2171 +#, fuzzy +msgid "Invalid reason" +msgstr "неверный маршру: %s" + +#: ../clients/cli/connections.c:2196 ../clients/cli/connections.c:2366 +#: ../clients/cli/connections.c:6468 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n" -#: ../clients/cli/connections.c:2164 +#: ../clients/cli/connections.c:2202 ../clients/cli/connections.c:2211 +#: ../clients/cli/connections.c:2346 +#, c-format +msgid "Error: Connection activation failed: %s" +msgstr "Ошибка: сбой активации соединения: %s" + +#: ../clients/cli/connections.c:2236 #, c-format msgid "" "Connection successfully activated (master waiting for slaves) (D-Bus active " @@ -1836,371 +1756,356 @@ msgstr "" "Соединение успешно активировано: мастер ожидает активации подчиненных " "(активный адрес D-Bus: %s)\n" -#: ../clients/cli/connections.c:2176 ../clients/cli/connections.c:2197 -#, c-format -msgid "Error: Connection activation failed." -msgstr "Ошибка: сбой активации соединения." - -#: ../clients/cli/connections.c:2245 -#, c-format -msgid "VPN connection successfully activated (D-Bus active path: %s)\n" -msgstr "VPN-соединение успешно установлено (адрес действующего D-Bus: %s)\n" - -#: ../clients/cli/connections.c:2252 -#, c-format -msgid "Error: Connection activation failed: %s." -msgstr "Ошибка: сбой активации соединения: %s." - -#: ../clients/cli/connections.c:2266 +#: ../clients/cli/connections.c:2261 #, c-format msgid "Error: Timeout expired (%d seconds)" msgstr "" -#: ../clients/cli/connections.c:2352 -#, c-format -msgid "Error: Connection activation failed: %s" -msgstr "Ошибка: сбой активации соединения: %s" - -#: ../clients/cli/connections.c:2441 +#: ../clients/cli/connections.c:2427 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "Не удалось прочитать файл passwd «%s»: %s" -#: ../clients/cli/connections.c:2453 +#: ../clients/cli/connections.c:2439 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "отсутствует двоеточие в записи «password»: «%s»" -#: ../clients/cli/connections.c:2461 +#: ../clients/cli/connections.c:2447 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "отсутствует точка в записи «password»: «%s»" -#: ../clients/cli/connections.c:2474 +#: ../clients/cli/connections.c:2460 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "неверное имя параметра в в записи «password»: «%s»" -#: ../clients/cli/connections.c:2530 +#: ../clients/cli/connections.c:2516 #, c-format msgid "unknown device '%s'." msgstr "неизвестное устройство «%s»" -#: ../clients/cli/connections.c:2535 +#: ../clients/cli/connections.c:2521 msgid "neither a valid connection nor device given" msgstr "недействительное подключение или устройство не определено" -#: ../clients/cli/connections.c:2655 ../clients/cli/devices.c:1502 -#: ../clients/cli/devices.c:2655 ../clients/cli/devices.c:2969 -#: ../clients/cli/devices.c:3562 +#: ../clients/cli/connections.c:2651 ../clients/cli/devices.c:1502 +#: ../clients/cli/devices.c:2669 ../clients/cli/devices.c:2998 +#: ../clients/cli/devices.c:3607 #, c-format msgid "Unknown parameter: %s\n" msgstr "Неизвестный параметр: %s\n" -#: ../clients/cli/connections.c:2681 +#: ../clients/cli/connections.c:2676 msgid "preparing" msgstr "подготовка" -#: ../clients/cli/connections.c:2700 +#: ../clients/cli/connections.c:2696 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "Соединение «%s» (%s) удалено.\n" -#: ../clients/cli/connections.c:2716 +#: ../clients/cli/connections.c:2712 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "Соединение «%s» успешно отключено (активный адрес D-Bus: %s)\n" -#: ../clients/cli/connections.c:2790 ../clients/cli/connections.c:8260 -#: ../clients/cli/connections.c:8292 ../clients/cli/connections.c:8445 +#: ../clients/cli/connections.c:2793 ../clients/cli/connections.c:8374 +#: ../clients/cli/connections.c:8406 ../clients/cli/connections.c:8563 #, c-format msgid "Error: No connection specified." msgstr "Ошибка. Соединение не задано." -#: ../clients/cli/connections.c:2829 +#: ../clients/cli/connections.c:2834 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "Ошибка: «%s» не является активным соединением.\n" -#: ../clients/cli/connections.c:2830 +#: ../clients/cli/connections.c:2835 #, c-format msgid "Error: not all active connections found." msgstr "Ошибка. Обнаружены не все активные соединения." -#: ../clients/cli/connections.c:2839 +#: ../clients/cli/connections.c:2844 #, c-format msgid "Error: no active connection provided." msgstr "Ошибка. Необходимо предоставить активное соединение." -#: ../clients/cli/connections.c:3300 ../clients/cli/utils.c:646 +#: ../clients/cli/connections.c:2878 +#, fuzzy, c-format +msgid "Connection '%s' deactivation failed: %s\n" +msgstr "Ошибка: сбой активации соединения: %s" + +#: ../clients/cli/connections.c:3341 ../clients/cli/utils.c:710 #, c-format msgid "'%s' not among [%s]" msgstr "«%s» не входит в %s" -#: ../clients/cli/connections.c:3460 +#: ../clients/cli/connections.c:3501 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "" "Предупреждение: мастер «%s» не относится ни к одному существующему профилю.\n" -#: ../clients/cli/connections.c:3634 +#: ../clients/cli/connections.c:3675 #, c-format msgid "Error: don't know how to create '%s' setting." msgstr "Ошибка: неизвестно, как создать параметр «%s»" -#: ../clients/cli/connections.c:3645 +#: ../clients/cli/connections.c:3686 #, c-format msgid "Error: invalid property '%s': %s." msgstr "Ошибка. Недопустимое свойство «%s»: %s." -#: ../clients/cli/connections.c:3662 +#: ../clients/cli/connections.c:3703 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "Ошибка. Не удалось изменить %s.%s: %s." -#: ../clients/cli/connections.c:3681 +#: ../clients/cli/connections.c:3722 #, c-format msgid "Error: failed to remove a value from %s.%s: %s." msgstr "Ошибка. Не удалось удалить значение из %s.%s: %s." -#: ../clients/cli/connections.c:3707 +#: ../clients/cli/connections.c:3748 #, fuzzy, c-format msgid "Error: '%s' is mandatory." msgstr "Ошибка. Параметр «%s» не определен.\n" -#: ../clients/cli/connections.c:3739 +#: ../clients/cli/connections.c:3780 #, fuzzy, c-format msgid "Error: invalid slave type; %s." msgstr "Ошибка. Недопустимый тип соединения: %s." -#: ../clients/cli/connections.c:3752 +#: ../clients/cli/connections.c:3793 #, c-format msgid "Error: invalid connection type; %s." msgstr "Ошибка. Недопустимый тип соединения: %s." -#: ../clients/cli/connections.c:3939 +#: ../clients/cli/connections.c:4002 #, fuzzy, c-format msgid "Error: bad connection type: %s." msgstr "Ошибка. Недопустимый тип соединения: %s." -#: ../clients/cli/connections.c:4002 +#: ../clients/cli/connections.c:4065 #, c-format msgid "Error: '%s': %s" msgstr "" -#: ../clients/cli/connections.c:4023 +#: ../clients/cli/connections.c:4086 #, fuzzy msgid "Error: master is required" msgstr "Ошибка. Необходимо определить «master»." -#: ../clients/cli/connections.c:4082 +#: ../clients/cli/connections.c:4145 #, fuzzy, c-format msgid "Error: error adding bond option '%s=%s'." msgstr "Ошибка. Неизвестное соединение: «%s»." -#: ../clients/cli/connections.c:4113 +#: ../clients/cli/connections.c:4176 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "" "Ошибка. Недопустимый режим мониторинга: «%s». Используйте «%s» или «%s».\n" -#: ../clients/cli/connections.c:4144 +#: ../clients/cli/connections.c:4207 #, c-format msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]." msgstr "" "Ошибка «bt-type». Неверное значение «%s». Используйте [%s, %s (%s), %s]." -#: ../clients/cli/connections.c:4219 +#: ../clients/cli/connections.c:4282 #, fuzzy msgid "PPPoE username" msgstr "Пользователь PPPoE:" -#: ../clients/cli/connections.c:4220 ../clients/cli/connections.c:4241 -#: ../clients/cli/connections.c:4243 ../clients/cli/connections.c:4292 +#: ../clients/cli/connections.c:4283 ../clients/cli/connections.c:4304 +#: ../clients/cli/connections.c:4306 ../clients/cli/connections.c:4355 #, fuzzy msgid "Password [none]" msgstr "Пароль [нет]: " -#: ../clients/cli/connections.c:4221 +#: ../clients/cli/connections.c:4284 #, fuzzy msgid "Service [none]" msgstr "Служба [нет]: " -#: ../clients/cli/connections.c:4222 ../clients/cli/connections.c:4225 -#: ../clients/cli/connections.c:4234 +#: ../clients/cli/connections.c:4285 ../clients/cli/connections.c:4288 +#: ../clients/cli/connections.c:4297 #, fuzzy msgid "MTU [auto]" msgstr "MTU [авто]: " -#: ../clients/cli/connections.c:4223 ../clients/cli/connections.c:4226 -#: ../clients/cli/connections.c:4235 ../clients/cli/connections.c:4238 -#: ../clients/cli/connections.c:4279 +#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4289 +#: ../clients/cli/connections.c:4298 ../clients/cli/connections.c:4301 +#: ../clients/cli/connections.c:4342 #, fuzzy msgid "MAC [none]" msgstr "MAC [нет]: " -#: ../clients/cli/connections.c:4224 ../clients/cli/connections.c:4236 +#: ../clients/cli/connections.c:4287 ../clients/cli/connections.c:4299 #, fuzzy msgid "Cloned MAC [none]" msgstr "Клонированный MAC [нет]:" -#: ../clients/cli/connections.c:4229 +#: ../clients/cli/connections.c:4292 #, fuzzy msgid "Parent interface [none]" msgstr "Родительский интерфейс [нет]:" -#: ../clients/cli/connections.c:4230 +#: ../clients/cli/connections.c:4293 #, fuzzy msgid "P_KEY [none]" msgstr "P_KEY [нет]: " #. 0 -#: ../clients/cli/connections.c:4231 ../clients/cli/connections.c:4286 -#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:224 +#: ../clients/cli/connections.c:4294 ../clients/cli/connections.c:4349 +#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:224 msgid "SSID" msgstr "SSID" -#: ../clients/cli/connections.c:4237 +#: ../clients/cli/connections.c:4300 #, fuzzy msgid "WiMAX NSP name" msgstr "Имя WiMAX NSP" -#: ../clients/cli/connections.c:4239 +#: ../clients/cli/connections.c:4302 #, fuzzy msgid "APN" msgstr "ТОЧКА ДОСТУПА" -#: ../clients/cli/connections.c:4240 ../clients/cli/connections.c:4242 -#: ../clients/cli/connections.c:4285 +#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4305 +#: ../clients/cli/connections.c:4348 #, fuzzy msgid "Username [none]" msgstr "Пользователь [нет]: " -#: ../clients/cli/connections.c:4244 +#: ../clients/cli/connections.c:4307 #, fuzzy msgid "Bluetooth device address" msgstr "Адрес устройства Bluetooth:" -#: ../clients/cli/connections.c:4247 +#: ../clients/cli/connections.c:4310 #, fuzzy msgid "VLAN parent device or connection UUID" msgstr "Родительское устройство VLAN или подключение UUID:" -#: ../clients/cli/connections.c:4249 +#: ../clients/cli/connections.c:4312 #, fuzzy msgid "VLAN ID (<0-4094>)" msgstr "VLAN ID <0-4095>: " -#: ../clients/cli/connections.c:4250 +#: ../clients/cli/connections.c:4313 #, fuzzy msgid "VLAN flags (<0-7>) [none]" msgstr "Флаги VLAN (<0-7>) [нет]: " -#: ../clients/cli/connections.c:4251 +#: ../clients/cli/connections.c:4314 #, fuzzy msgid "Ingress priority maps [none]" msgstr "Соответствие приоритета на входе [нет]:" -#: ../clients/cli/connections.c:4252 +#: ../clients/cli/connections.c:4315 #, fuzzy msgid "Egress priority maps [none]" msgstr "Соответствие приоритета на выходе [нет]:" -#: ../clients/cli/connections.c:4255 +#: ../clients/cli/connections.c:4318 #, fuzzy msgid "Bonding primary interface [none]" msgstr "Основной интерфейс агрегации (Bond) [нет]:" -#: ../clients/cli/connections.c:4259 +#: ../clients/cli/connections.c:4322 #, fuzzy msgid "Bonding miimon [100]" msgstr "Bonding miimon [100]: " -#: ../clients/cli/connections.c:4260 +#: ../clients/cli/connections.c:4323 #, fuzzy msgid "Bonding downdelay [0]" msgstr "Bonding downdelay [0]: " -#: ../clients/cli/connections.c:4261 +#: ../clients/cli/connections.c:4324 #, fuzzy msgid "Bonding updelay [0]" msgstr "Bonding updelay [0]: " -#: ../clients/cli/connections.c:4262 +#: ../clients/cli/connections.c:4325 #, fuzzy msgid "Bonding arp-interval [0]" msgstr "Bonding arp-interval [0]: " -#: ../clients/cli/connections.c:4264 +#: ../clients/cli/connections.c:4327 #, fuzzy msgid "Bonding arp-ip-target [none]" msgstr "Bonding arp-ip-target [нет]: " -#: ../clients/cli/connections.c:4266 +#: ../clients/cli/connections.c:4329 #, fuzzy msgid "LACP rate ('slow' or 'fast') [slow]" msgstr "Скорость LACP (slow/fast) [slow]:" -#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4269 +#: ../clients/cli/connections.c:4331 ../clients/cli/connections.c:4332 #, fuzzy msgid "Team JSON configuration [none]" msgstr "Конфигурация JSON агрегированного соединения (team) [нет]:" -#: ../clients/cli/connections.c:4270 +#: ../clients/cli/connections.c:4333 #, fuzzy msgid "Enable STP [no]" msgstr "Включить STP %s" -#: ../clients/cli/connections.c:4272 +#: ../clients/cli/connections.c:4335 #, fuzzy msgid "STP priority [32768]" msgstr "Приоритет STP [32768]: " -#: ../clients/cli/connections.c:4273 +#: ../clients/cli/connections.c:4336 #, fuzzy msgid "Forward delay [15]" msgstr "Forward delay [15]:" -#: ../clients/cli/connections.c:4274 +#: ../clients/cli/connections.c:4337 #, fuzzy msgid "Hello time [2]" msgstr "Hello time [2]: " -#: ../clients/cli/connections.c:4275 +#: ../clients/cli/connections.c:4338 #, fuzzy msgid "Max age [20]" msgstr "Max age [20]: " -#: ../clients/cli/connections.c:4276 +#: ../clients/cli/connections.c:4339 #, fuzzy msgid "MAC address ageing time [300]" msgstr "Время действия MAC-адреса [300]: " -#: ../clients/cli/connections.c:4277 +#: ../clients/cli/connections.c:4340 msgid "Enable IGMP snooping [no]" msgstr "" -#: ../clients/cli/connections.c:4280 +#: ../clients/cli/connections.c:4343 #, fuzzy msgid "Bridge port priority [32]" msgstr "Приоритет порта моста [32]: " -#: ../clients/cli/connections.c:4281 +#: ../clients/cli/connections.c:4344 #, fuzzy msgid "Bridge port STP path cost [100]" msgstr "Стоимость STP порта моста [100]: " -#: ../clients/cli/connections.c:4282 +#: ../clients/cli/connections.c:4345 #, fuzzy msgid "Hairpin [no]" msgstr "Режим разворота пакетов" -#: ../clients/cli/connections.c:4287 +#: ../clients/cli/connections.c:4350 #, fuzzy msgid "OLPC Mesh channel [1]" msgstr "Канал OLPC mesh [1]:" -#: ../clients/cli/connections.c:4288 +#: ../clients/cli/connections.c:4351 #, fuzzy msgid "DHCP anycast MAC address [none]" msgstr "MAC-адрес рассылки DHCP [нет]:" @@ -2209,162 +2114,179 @@ msgstr "MAC-адрес рассылки DHCP [нет]:" #. * is not visible here since we only care about phase2 authentication #. * (and don't even care of which one) #. -#: ../clients/cli/connections.c:4289 +#: ../clients/cli/connections.c:4352 #: ../clients/common/nm-secret-agent-simple.c:223 #: ../clients/common/nm-secret-agent-simple.c:328 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332 msgid "Username" msgstr "Пользователь" -#: ../clients/cli/connections.c:4295 +#: ../clients/cli/connections.c:4358 +msgid "MACsec parent device or connection UUID" +msgstr "" + +#: ../clients/cli/connections.c:4360 +msgid "Enable encryption [yes]" +msgstr "" + +#: ../clients/cli/connections.c:4361 +#: ../clients/common/nm-secret-agent-simple.c:520 +msgid "MKA CAK" +msgstr "" + +#: ../clients/cli/connections.c:4362 +msgid "MKA_CKN" +msgstr "" + +#: ../clients/cli/connections.c:4363 +msgid "SCI port [1]" +msgstr "" + +#: ../clients/cli/connections.c:4365 #, fuzzy msgid "MACVLAN parent device or connection UUID" msgstr "Родительское устройство VLAN или подключение UUID:" -#: ../clients/cli/connections.c:4299 +#: ../clients/cli/connections.c:4369 msgid "Tap [no]" msgstr "" -#: ../clients/cli/connections.c:4301 +#: ../clients/cli/connections.c:4371 #, fuzzy msgid "VXLAN ID" msgstr "VLAN ID <0-4095>: " -#: ../clients/cli/connections.c:4302 ../clients/cli/connections.c:4321 +#: ../clients/cli/connections.c:4372 ../clients/cli/connections.c:4391 #, fuzzy msgid "Remote" msgstr "Удалить" -#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4322 +#: ../clients/cli/connections.c:4373 ../clients/cli/connections.c:4392 #, fuzzy msgid "Parent device [none]" msgstr "Родительский интерфейс [нет]:" -#: ../clients/cli/connections.c:4305 +#: ../clients/cli/connections.c:4375 #, fuzzy msgid "Local address [none]" msgstr "MAC-адрес рассылки DHCP [нет]:" -#: ../clients/cli/connections.c:4306 +#: ../clients/cli/connections.c:4376 msgid "Minimum source port [0]" msgstr "" -#: ../clients/cli/connections.c:4307 +#: ../clients/cli/connections.c:4377 msgid "Maximum source port [0]" msgstr "" -#: ../clients/cli/connections.c:4308 +#: ../clients/cli/connections.c:4378 #, fuzzy msgid "Destination port [8472]" msgstr "Назначение" -#: ../clients/cli/connections.c:4311 +#: ../clients/cli/connections.c:4381 #, fuzzy msgid "User ID [none]" msgstr "Пользователь [нет]: " -#: ../clients/cli/connections.c:4312 +#: ../clients/cli/connections.c:4382 #, fuzzy msgid "Group ID [none]" msgstr "MAC [нет]: " -#: ../clients/cli/connections.c:4313 +#: ../clients/cli/connections.c:4383 #, fuzzy msgid "Enable PI [no]" msgstr "Включить STP %s" -#: ../clients/cli/connections.c:4315 +#: ../clients/cli/connections.c:4385 #, fuzzy msgid "Enable VNET header [no]" msgstr "Включить STP %s" -#: ../clients/cli/connections.c:4317 +#: ../clients/cli/connections.c:4387 msgid "Enable multi queue [no]" msgstr "" -#: ../clients/cli/connections.c:4320 +#: ../clients/cli/connections.c:4390 #, fuzzy msgid "Local endpoint [none]" msgstr "Родительский интерфейс [нет]:" -#: ../clients/cli/connections.c:4324 +#: ../clients/cli/connections.c:4394 #, fuzzy msgid "IPv4 address (IP[/plen]) [none]" msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4326 +#: ../clients/cli/connections.c:4396 #, fuzzy msgid "IPv4 gateway [none]" msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4327 +#: ../clients/cli/connections.c:4397 #, fuzzy msgid "IPv6 address (IP[/plen]) [none]" msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4329 +#: ../clients/cli/connections.c:4399 #, fuzzy msgid "IPv6 gateway [none]" msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4330 -msgid "Proxy method" -msgstr "" - -#: ../clients/cli/connections.c:4331 -msgid "Browser Only" +#: ../clients/cli/connections.c:4401 +msgid "Browser only [no]" msgstr "" -#: ../clients/cli/connections.c:4332 -msgid "PAC Url" +#: ../clients/cli/connections.c:4403 +msgid "PAC URL" msgstr "" -#: ../clients/cli/connections.c:4333 -msgid "PAC Script" +#: ../clients/cli/connections.c:4404 +msgid "PAC script" msgstr "" -#: ../clients/cli/connections.c:4468 +#: ../clients/cli/connections.c:4539 #, c-format msgid "Error: value for '%s' is missing." msgstr "Ошибка: отсутствует значение «%s»." -#: ../clients/cli/connections.c:4513 +#: ../clients/cli/connections.c:4585 msgid "Error: <setting>.<property> argument is missing." msgstr "Ошибка: отсутствует аргумент <параметр>.<свойство>" -#: ../clients/cli/connections.c:4536 +#: ../clients/cli/connections.c:4608 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "Ошибка. Недопустимый параметр «%s»: %s." -#: ../clients/cli/connections.c:4560 +#: ../clients/cli/connections.c:4633 #, fuzzy, c-format msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)." msgstr "Неоднозначное значение «%s» (%s x %s)" -#: ../clients/cli/connections.c:4574 +#: ../clients/cli/connections.c:4647 #, c-format msgid "Error: invalid <setting>.<property> '%s'." msgstr "Ошибка <параметр>.<свойство>: «%s»." -#: ../clients/cli/connections.c:4615 ../clients/cli/connections.c:8093 +#: ../clients/cli/connections.c:4689 ../clients/cli/connections.c:8199 #, c-format msgid "Error: Failed to add '%s' connection: %s" msgstr "Ошибка. Не удалось добавить соединение «%s»: %s" -#: ../clients/cli/connections.c:4620 +#: ../clients/cli/connections.c:4694 #, c-format msgid "Connection '%s' (%s) successfully added.\n" msgstr "Соединение «%s» (%s) добавлено.\n" -#: ../clients/cli/connections.c:4738 +#: ../clients/cli/connections.c:4816 #, c-format msgid "" "You can specify this option more than once. Press <Enter> when you're done.\n" msgstr "" #. Ask for optional arguments. -#: ../clients/cli/connections.c:4776 +#: ../clients/cli/connections.c:4854 #, fuzzy, c-format msgid "There is %d optional setting for %s.\n" msgid_plural "There are %d optional settings for %s.\n" @@ -2378,7 +2300,7 @@ msgstr[2] "" "При настройке соединений %s допускается использование одного дополнительного " "аргумента.\n" -#: ../clients/cli/connections.c:4779 +#: ../clients/cli/connections.c:4857 #, c-format msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" @@ -2386,128 +2308,132 @@ msgstr[0] "Хотите его предоставить? %s" msgstr[1] "Хотите их предоставить? %s" msgstr[2] "Хотите их предоставить? %s" -#: ../clients/cli/connections.c:4793 +#: ../clients/cli/connections.c:4871 #, fuzzy msgid "Wired Ethernet" msgstr "Ethernet" -#: ../clients/cli/connections.c:4795 ../src/devices/nm-device-infiniband.c:186 +#: ../clients/cli/connections.c:4873 ../src/devices/nm-device-infiniband.c:192 msgid "InfiniBand connection" msgstr "Соединение InfiniBand" -#: ../clients/cli/connections.c:4797 +#: ../clients/cli/connections.c:4875 #, fuzzy msgid "Wi-Fi connection" msgstr "Соединение Wi-Fi %d" -#: ../clients/cli/connections.c:4799 +#: ../clients/cli/connections.c:4877 #, fuzzy msgid "WiMAX connection" msgstr "Соединение CDMA" -#: ../clients/cli/connections.c:4801 +#: ../clients/cli/connections.c:4879 msgid "PPPoE" msgstr "PPPoE" -#: ../clients/cli/connections.c:4803 +#: ../clients/cli/connections.c:4881 #, fuzzy msgid "CDMA mobile broadband connection" msgstr "Мобильное соединение %d" -#: ../clients/cli/connections.c:4805 +#: ../clients/cli/connections.c:4883 #, fuzzy msgid "GSM mobile broadband connection" msgstr "Мобильное соединение %d" -#: ../clients/cli/connections.c:4807 +#: ../clients/cli/connections.c:4885 #, fuzzy msgid "bluetooth connection" msgstr "Агрегированное (Bond) соединение" -#: ../clients/cli/connections.c:4809 ../src/devices/nm-device-vlan.c:432 +#: ../clients/cli/connections.c:4887 ../src/devices/nm-device-vlan.c:433 msgid "VLAN connection" msgstr "Соединение VLAN" -#: ../clients/cli/connections.c:4811 +#: ../clients/cli/connections.c:4889 #, fuzzy msgid "Bond device" msgstr "Ethernet" -#: ../clients/cli/connections.c:4813 +#: ../clients/cli/connections.c:4891 #, fuzzy msgid "Team device" msgstr "Устройство извлечено" -#: ../clients/cli/connections.c:4815 +#: ../clients/cli/connections.c:4893 #, fuzzy msgid "Team port" msgstr "Агрегированное (Team)" -#: ../clients/cli/connections.c:4817 +#: ../clients/cli/connections.c:4895 #, fuzzy msgid "Bridge device" msgstr "Ethernet" -#: ../clients/cli/connections.c:4819 +#: ../clients/cli/connections.c:4897 #, fuzzy msgid "Bridge port" msgstr "Мост" -#: ../clients/cli/connections.c:4821 ../src/nm-manager.c:3824 +#: ../clients/cli/connections.c:4899 ../src/nm-manager.c:4080 msgid "VPN connection" msgstr "VPN-соединение" -#: ../clients/cli/connections.c:4823 +#: ../clients/cli/connections.c:4901 #, fuzzy msgid "OLPC Mesh connection" msgstr "Соединение CDMA" -#: ../clients/cli/connections.c:4825 ../src/devices/adsl/nm-device-adsl.c:137 +#: ../clients/cli/connections.c:4903 ../src/devices/adsl/nm-device-adsl.c:137 msgid "ADSL connection" msgstr "Соединение ADSL" -#: ../clients/cli/connections.c:4827 +#: ../clients/cli/connections.c:4905 +msgid "MACsec connection" +msgstr "" + +#: ../clients/cli/connections.c:4907 #, fuzzy msgid "macvlan connection" msgstr "Агрегированное (Bond) соединение" -#: ../clients/cli/connections.c:4829 ../src/devices/nm-device-vxlan.c:369 +#: ../clients/cli/connections.c:4909 ../src/devices/nm-device-vxlan.c:369 msgid "VXLAN connection" msgstr "Соединение VXLAN" -#: ../clients/cli/connections.c:4831 +#: ../clients/cli/connections.c:4911 #, fuzzy msgid "Tun device" msgstr "Устройство извлечено" -#: ../clients/cli/connections.c:4833 +#: ../clients/cli/connections.c:4913 msgid "IPv4 protocol" msgstr "" -#: ../clients/cli/connections.c:4835 +#: ../clients/cli/connections.c:4915 msgid "IPv6 protocol" msgstr "" -#: ../clients/cli/connections.c:4837 +#: ../clients/cli/connections.c:4917 msgid "Proxy" msgstr "" -#: ../clients/cli/connections.c:4920 ../clients/cli/utils.c:122 +#: ../clients/cli/connections.c:5004 ../clients/cli/utils.c:186 #, c-format msgid "Error: value for '%s' argument is required." msgstr "Ошибка: необходимо указать значение аргумента «%s»." -#: ../clients/cli/connections.c:4926 +#: ../clients/cli/connections.c:5010 #, c-format msgid "Error: 'save': %s." msgstr "Ошибка «save»: %s" -#: ../clients/cli/connections.c:4998 +#: ../clients/cli/connections.c:5082 #, fuzzy, c-format msgid "Error: '%s' argument is required." msgstr "Ошибка. Аргумент «type» является обязательным." -#: ../clients/cli/connections.c:5968 +#: ../clients/cli/connections.c:6054 #, c-format msgid "['%s' setting values]\n" msgstr "[«%s» устанавливает значения]\n" @@ -2515,7 +2441,7 @@ msgstr "[«%s» устанавливает значения]\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6050 +#: ../clients/cli/connections.c:6136 #, c-format msgid "" "---[ Main menu ]---\n" @@ -2554,7 +2480,7 @@ msgstr "" "nmcli <параметр> <значение> :: конфигурация nmcli\n" "quit :: выход\n" -#: ../clients/cli/connections.c:6077 +#: ../clients/cli/connections.c:6163 #, c-format msgid "" "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n" @@ -2574,7 +2500,7 @@ msgstr "" " nmcli connection> goto secondaries\n" " nmcli> goto ipv4.addresses\n" -#: ../clients/cli/connections.c:6084 +#: ../clients/cli/connections.c:6170 #, c-format msgid "" "remove <setting>[.<prop>] :: remove setting or reset property value\n" @@ -2594,7 +2520,7 @@ msgstr "" "Примеры: nmcli> remove wifi-sec\n" " nmcli> remove eth.mtu\n" -#: ../clients/cli/connections.c:6091 +#: ../clients/cli/connections.c:6177 #, c-format msgid "" "set [<setting>.<prop> <value>] :: set property value\n" @@ -2609,7 +2535,7 @@ msgstr "" "\n" "Пример: nmcli> set con.id My connection\n" -#: ../clients/cli/connections.c:6096 +#: ../clients/cli/connections.c:6182 #, c-format msgid "" "describe [<setting>.<prop>] :: describe property\n" @@ -2622,7 +2548,7 @@ msgstr "" "Возвращает описание свойства. Полный список параметров и их значений можно " "найти на справочной странице nm-settings(5).\n" -#: ../clients/cli/connections.c:6101 +#: ../clients/cli/connections.c:6187 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -2637,7 +2563,7 @@ msgstr "" "\n" "Пример: nmcli ipv4> print all\n" -#: ../clients/cli/connections.c:6106 +#: ../clients/cli/connections.c:6192 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -2662,7 +2588,7 @@ msgstr "" " nmcli> verify fix\n" " nmcli bond> verify\n" -#: ../clients/cli/connections.c:6115 +#: ../clients/cli/connections.c:6201 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -2690,7 +2616,7 @@ msgstr "" "Если вы хотите полностью удалить сохраненное соединение, необходимо\n" "удалить его профиль. \n" -#: ../clients/cli/connections.c:6126 +#: ../clients/cli/connections.c:6212 #, c-format msgid "" "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n" @@ -2711,7 +2637,7 @@ msgstr "" "/<ap>|<nsp> - AP (Wi-Fi) или NSP (WiMAX) (если интерфейс не задан, в начале " "строки надо добавить /)\n" -#: ../clients/cli/connections.c:6133 ../clients/cli/connections.c:6292 +#: ../clients/cli/connections.c:6219 ../clients/cli/connections.c:6378 #, c-format msgid "" "back :: go to upper menu level\n" @@ -2720,7 +2646,7 @@ msgstr "" "back :: возврат к предыдущему меню\n" "\n" -#: ../clients/cli/connections.c:6136 +#: ../clients/cli/connections.c:6222 #, c-format msgid "" "help/? [<command>] :: help for the nmcli commands\n" @@ -2729,7 +2655,7 @@ msgstr "" "help/? [<команда>] :: справка по командам nmcli\n" "\n" -#: ../clients/cli/connections.c:6139 +#: ../clients/cli/connections.c:6225 #, c-format msgid "" "nmcli [<conf-option> <value>] :: nmcli configuration\n" @@ -2756,7 +2682,7 @@ msgstr "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" -#: ../clients/cli/connections.c:6161 ../clients/cli/connections.c:6298 +#: ../clients/cli/connections.c:6247 ../clients/cli/connections.c:6384 #, c-format msgid "" "quit :: exit nmcli\n" @@ -2768,8 +2694,8 @@ msgstr "" "\n" "Если изменения соединения не сохранены, появится окно подтверждения.\n" -#: ../clients/cli/connections.c:6166 ../clients/cli/connections.c:6303 -#: ../clients/cli/connections.c:6723 ../clients/cli/connections.c:7675 +#: ../clients/cli/connections.c:6252 ../clients/cli/connections.c:6389 +#: ../clients/cli/connections.c:6809 ../clients/cli/connections.c:7761 #, c-format msgid "Unknown command: '%s'\n" msgstr "Неизвестная команда: «%s»\n" @@ -2777,7 +2703,7 @@ msgstr "Неизвестная команда: «%s»\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6232 +#: ../clients/cli/connections.c:6318 #, c-format msgid "" "---[ Property menu ]---\n" @@ -2803,7 +2729,7 @@ msgstr "" "help/? [<команда>] :: показать справку или описание команды\n" "quit :: выход из nmcli\n" -#: ../clients/cli/connections.c:6257 +#: ../clients/cli/connections.c:6343 #, c-format msgid "" "set [<value>] :: set new value\n" @@ -2814,7 +2740,7 @@ msgstr "" "\n" "Эта команда определяет новое значение свойства.\n" -#: ../clients/cli/connections.c:6261 +#: ../clients/cli/connections.c:6347 #, c-format msgid "" "add [<value>] :: append new value to the property\n" @@ -2829,7 +2755,7 @@ msgstr "" "значений. Если же свойство имеет единственное значение, оно будет " "переопределено (что равносильно команде «set»).\n" -#: ../clients/cli/connections.c:6267 +#: ../clients/cli/connections.c:6353 #, c-format msgid "" "change :: change current value\n" @@ -2840,7 +2766,7 @@ msgstr "" "\n" "Показывает значение и позволяет его отредактировать.\n" -#: ../clients/cli/connections.c:6271 +#: ../clients/cli/connections.c:6357 #, c-format msgid "" "remove [<value>|<index>|<option name>] :: delete the value\n" @@ -2874,7 +2800,7 @@ msgstr "" " nmcli ipv4.dns> remove 2\n" " nmcli bond.options> remove downdelay\n" -#: ../clients/cli/connections.c:6282 +#: ../clients/cli/connections.c:6368 #, c-format msgid "" "describe :: describe property\n" @@ -2887,7 +2813,7 @@ msgstr "" "Возвращает описание свойства. Полный список параметров и их значений можно " "найти на справочной странице nm-settings(5).\n" -#: ../clients/cli/connections.c:6287 +#: ../clients/cli/connections.c:6373 #, c-format msgid "" "print [property|setting|connection] :: print property (setting, connection) " @@ -2902,7 +2828,7 @@ msgstr "" "Если аргумент не указан, возвращает значение свойства. Укажите параметр или " "соединение, чтобы получить соответствующую информацию.\n" -#: ../clients/cli/connections.c:6295 +#: ../clients/cli/connections.c:6381 #, c-format msgid "" "help/? [<command>] :: help for nmcli commands\n" @@ -2911,28 +2837,28 @@ msgstr "" "help/? [<команда>] :: справка по командам nmcli\n" "\n" -#: ../clients/cli/connections.c:6388 +#: ../clients/cli/connections.c:6474 #, c-format msgid "Error: Connection activation failed.\n" msgstr "Ошибка. Не удалось активировать соединение.\n" -#: ../clients/cli/connections.c:6472 +#: ../clients/cli/connections.c:6558 #, c-format msgid "Error: setting '%s' is mandatory and cannot be removed.\n" msgstr "Ошибка. Обязательное значение «%s» не может быть удалено.\n" #. TRANSLATORS: status line in nmcli connection editor -#: ../clients/cli/connections.c:6490 +#: ../clients/cli/connections.c:6576 #, c-format msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n" msgstr "[Тип: %s | Имя: %s | UUID: %s | Не сохранено: %s | Временно.: %s ]\n" -#: ../clients/cli/connections.c:6526 +#: ../clients/cli/connections.c:6612 #, c-format msgid "The connection is not saved. Do you really want to quit? %s" msgstr "Соединение не сохранено. Вы действительно хотите выйти? %s" -#: ../clients/cli/connections.c:6575 +#: ../clients/cli/connections.c:6661 #, c-format msgid "" "The connection profile has been removed from another client. You may type " @@ -2941,66 +2867,66 @@ msgstr "" "Профиль соединения был удален из другого клиента. Чтобы его восстановить, " "введите «save».\n" -#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7021 -#: ../clients/cli/connections.c:7079 +#: ../clients/cli/connections.c:6686 ../clients/cli/connections.c:7107 +#: ../clients/cli/connections.c:7165 #, c-format msgid "Allowed values for '%s' property: %s\n" msgstr "Допустимые значения «%s»: %s\n" -#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:7025 -#: ../clients/cli/connections.c:7083 +#: ../clients/cli/connections.c:6690 ../clients/cli/connections.c:7111 +#: ../clients/cli/connections.c:7169 #, c-format msgid "Enter '%s' value: " msgstr "Введите значение «%s»:" -#: ../clients/cli/connections.c:6619 ../clients/cli/connections.c:6641 -#: ../clients/cli/connections.c:7029 ../clients/cli/connections.c:7088 +#: ../clients/cli/connections.c:6705 ../clients/cli/connections.c:6727 +#: ../clients/cli/connections.c:7115 ../clients/cli/connections.c:7174 #, c-format msgid "Error: failed to set '%s' property: %s\n" msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n" -#: ../clients/cli/connections.c:6635 +#: ../clients/cli/connections.c:6721 #, c-format msgid "Edit '%s' value: " msgstr "Измените значение «%s»:" -#: ../clients/cli/connections.c:6664 +#: ../clients/cli/connections.c:6750 #, c-format msgid "Error: %s\n" msgstr "Ошибка: %s\n" -#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:7180 -#: ../clients/cli/connections.c:7228 +#: ../clients/cli/connections.c:6756 ../clients/cli/connections.c:7266 +#: ../clients/cli/connections.c:7314 #, c-format msgid "Error: failed to remove value of '%s': %s\n" msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n" -#: ../clients/cli/connections.c:6691 +#: ../clients/cli/connections.c:6777 #, c-format msgid "Unknown command argument: '%s'\n" msgstr "Неизвестный аргумент команды: «%s»\n" -#: ../clients/cli/connections.c:6796 +#: ../clients/cli/connections.c:6882 #, c-format msgid "Available settings: %s\n" msgstr "Доступные параметры: %s\n" -#: ../clients/cli/connections.c:6808 +#: ../clients/cli/connections.c:6894 #, c-format msgid "Error: invalid setting name; %s\n" msgstr "Ошибка. Недопустимое значение параметра: %s\n" -#: ../clients/cli/connections.c:6825 +#: ../clients/cli/connections.c:6911 #, c-format msgid "Available properties: %s\n" msgstr "Доступные свойства: %s\n" -#: ../clients/cli/connections.c:6833 +#: ../clients/cli/connections.c:6919 #, c-format msgid "Error: property %s\n" msgstr "Ошибка свойства %s\n" -#: ../clients/cli/connections.c:6874 +#: ../clients/cli/connections.c:6960 #, c-format msgid "" "Saving the connection with 'autoconnect=yes'. That might result in an " @@ -3011,12 +2937,12 @@ msgstr "" "«autoconnect=yes», что может привести к его немедленной активации.\n" "Сохранить? %s" -#: ../clients/cli/connections.c:6963 +#: ../clients/cli/connections.c:7049 #, c-format msgid "You may edit the following settings: %s\n" msgstr "Разрешается изменить следующие параметры: %s\n" -#: ../clients/cli/connections.c:6991 +#: ../clients/cli/connections.c:7077 #, c-format msgid "" "The connection profile has been removed from another client. You may type " @@ -3025,213 +2951,213 @@ msgstr "" "Профиль соединения был удален из другого клиента. Чтобы его восстановить, " "введите «save».\n" -#: ../clients/cli/connections.c:7033 ../clients/cli/connections.c:7273 +#: ../clients/cli/connections.c:7119 ../clients/cli/connections.c:7359 #, c-format msgid "Error: no setting selected; valid are [%s]\n" msgstr "Ошибка. Параметр не выбран. Допускается: [%s]\n" -#: ../clients/cli/connections.c:7034 +#: ../clients/cli/connections.c:7120 #, c-format msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n" msgstr "используйте «goto <параметр>» или «set <параметр>.<свойство>»\n" -#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7207 -#: ../clients/cli/connections.c:7295 +#: ../clients/cli/connections.c:7134 ../clients/cli/connections.c:7293 +#: ../clients/cli/connections.c:7381 #, c-format msgid "Error: invalid setting argument '%s'; valid are [%s]\n" msgstr "Ошибка. Недопустимый аргумент «%s». Допускается: [%s]\n" -#: ../clients/cli/connections.c:7058 +#: ../clients/cli/connections.c:7144 #, c-format msgid "Error: missing setting for '%s' property\n" msgstr "Ошибка. Нет определения свойства «%s»\n" -#: ../clients/cli/connections.c:7065 +#: ../clients/cli/connections.c:7151 #, c-format msgid "Error: invalid property: %s\n" msgstr "Ошибка. Недействительное свойство: %s\n" -#: ../clients/cli/connections.c:7118 +#: ../clients/cli/connections.c:7204 #, c-format msgid "Error: unknown setting '%s'\n" msgstr "Ошибка: неизвестный параметр: %s\n" -#: ../clients/cli/connections.c:7141 +#: ../clients/cli/connections.c:7227 #, c-format msgid "You may edit the following properties: %s\n" msgstr "Вы можете изменить следующие свойства: %s\n" -#: ../clients/cli/connections.c:7185 +#: ../clients/cli/connections.c:7271 #, c-format msgid "Error: no argument given; valid are [%s]\n" msgstr "Ошибка. Аргумент не задан. Допускается: [%s]\n" -#: ../clients/cli/connections.c:7204 +#: ../clients/cli/connections.c:7290 #, c-format msgid "Setting '%s' is not present in the connection.\n" msgstr "Параметр «%s» не определен в соединении.\n" -#: ../clients/cli/connections.c:7249 +#: ../clients/cli/connections.c:7335 #, c-format msgid "Error: %s properties, nor it is a setting name.\n" msgstr "Ошибка. %s не является именем параметра или свойства.\n" -#: ../clients/cli/connections.c:7274 +#: ../clients/cli/connections.c:7360 #, c-format msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n" msgstr "используйте «goto <параметр>» или «describe <параметр>.<свойство>»\n" -#: ../clients/cli/connections.c:7323 +#: ../clients/cli/connections.c:7409 #, c-format msgid "Error: invalid property: %s, neither a valid setting name.\n" msgstr "Недопустимое свойство %s или неверное имя параметра.\n" -#: ../clients/cli/connections.c:7355 +#: ../clients/cli/connections.c:7441 #, c-format msgid "Error: unknown setting: '%s'\n" msgstr "Ошибка. Неизвестный параметр: %s\n" -#: ../clients/cli/connections.c:7360 +#: ../clients/cli/connections.c:7446 #, c-format msgid "Error: '%s' setting not present in the connection\n" msgstr "Ошибка: в соединении не определен параметр «%s»\n" -#: ../clients/cli/connections.c:7388 +#: ../clients/cli/connections.c:7474 #, c-format msgid "Error: invalid property: %s%s\n" msgstr "Ошибка: недействительное свойство %s%s\n" -#: ../clients/cli/connections.c:7390 +#: ../clients/cli/connections.c:7476 msgid ", neither a valid setting name" msgstr "и не является действительным именем параметра" -#: ../clients/cli/connections.c:7407 +#: ../clients/cli/connections.c:7493 #, c-format msgid "Invalid verify option: %s\n" msgstr "Недопустимый параметр verify: «%s»\n" -#: ../clients/cli/connections.c:7415 +#: ../clients/cli/connections.c:7501 #, c-format msgid "Verify setting '%s': %s\n" msgstr "Проверьте параметр «%s»: %s\n" -#: ../clients/cli/connections.c:7430 +#: ../clients/cli/connections.c:7516 #, c-format msgid "Verify connection: %s\n" msgstr "Проверьте соединение: %s\n" -#: ../clients/cli/connections.c:7433 +#: ../clients/cli/connections.c:7519 #, c-format msgid "The error cannot be fixed automatically.\n" msgstr "Эта ошибка не может быть исправлена автоматически.\n" -#: ../clients/cli/connections.c:7450 +#: ../clients/cli/connections.c:7536 #, c-format msgid "Error: invalid argument '%s'\n" msgstr "Ошибка: недопустимый аргумент «%s»\n" -#: ../clients/cli/connections.c:7482 +#: ../clients/cli/connections.c:7568 #, c-format msgid "Error: Failed to save '%s' (%s) connection: %s\n" msgstr "Ошибка: не удалось сохранить соединение «%s» (%s): %s\n" -#: ../clients/cli/connections.c:7489 +#: ../clients/cli/connections.c:7575 #, c-format msgid "Connection '%s' (%s) successfully saved.\n" msgstr "Соединение «%s» (%s) сохранено.\n" -#: ../clients/cli/connections.c:7490 +#: ../clients/cli/connections.c:7576 #, c-format msgid "Connection '%s' (%s) successfully updated.\n" msgstr "Соединение «%s» (%s) успешно обновлено.\n" -#: ../clients/cli/connections.c:7522 +#: ../clients/cli/connections.c:7608 #, c-format msgid "Error: connection verification failed: %s\n" msgstr "Ошибка. Проверка соединения завершилась неудачей: %s\n" -#: ../clients/cli/connections.c:7523 +#: ../clients/cli/connections.c:7609 msgid "(unknown error)" msgstr "(неизвестная ошибка)" -#: ../clients/cli/connections.c:7524 +#: ../clients/cli/connections.c:7610 #, c-format msgid "You may try running 'verify fix' to fix errors.\n" msgstr "Для исправления ошибок вы можете попробовать выполнить «verify fix».\n" -#: ../clients/cli/connections.c:7546 +#: ../clients/cli/connections.c:7632 #, c-format msgid "Error: connection is not saved. Type 'save' first.\n" msgstr "Ошибка. Соединение не сохранено. Сначала введите «type».\n" -#: ../clients/cli/connections.c:7550 +#: ../clients/cli/connections.c:7636 #, c-format msgid "Error: connection is not valid: %s\n" msgstr "Ошибка. Недействительное соединение: %s\n" -#: ../clients/cli/connections.c:7560 +#: ../clients/cli/connections.c:7646 #, c-format msgid "Error: Cannot activate connection: %s.\n" msgstr "Ошибка. Не удалось активировать соединение: %s\n" -#: ../clients/cli/connections.c:7569 +#: ../clients/cli/connections.c:7655 #, c-format msgid "Error: Failed to activate '%s' (%s) connection: %s\n" msgstr "Ошибка: не удалось активировать соединение «%s» (%s): %s\n" -#: ../clients/cli/connections.c:7575 +#: ../clients/cli/connections.c:7661 msgid "Monitoring connection activation (press any key to continue)\n" msgstr "" "Контроль активации соединения (нажмите любую клавишу для продолжения)\n" -#: ../clients/cli/connections.c:7611 +#: ../clients/cli/connections.c:7697 #, c-format msgid "Error: status-line: %s\n" msgstr "Ошибка status-line: %s\n" -#: ../clients/cli/connections.c:7619 +#: ../clients/cli/connections.c:7705 #, c-format msgid "Error: save-confirmation: %s\n" msgstr "Ошибка save-confirmation: %s\n" -#: ../clients/cli/connections.c:7627 +#: ../clients/cli/connections.c:7713 #, c-format msgid "Error: show-secrets: %s\n" msgstr "Ошибка show secrets: %s\n" -#: ../clients/cli/connections.c:7636 +#: ../clients/cli/connections.c:7722 #, c-format msgid "Error: bad color: %s\n" msgstr "Ошибка: недопустимый цвет: %s\n" -#: ../clients/cli/connections.c:7650 +#: ../clients/cli/connections.c:7736 #, c-format msgid "Current nmcli configuration:\n" msgstr "Текущая конфигурация nmcli:\n" -#: ../clients/cli/connections.c:7660 +#: ../clients/cli/connections.c:7746 #, c-format msgid "Invalid configuration option '%s'; allowed [%s]\n" msgstr "Недопустимый параметр конфигурации «%s». Допускается: [%s]\n" -#: ../clients/cli/connections.c:7877 +#: ../clients/cli/connections.c:7975 #, c-format msgid "Error: only one of 'id', uuid, or 'path' can be provided." msgstr "Ошибка. Допускается только одно значение: «id», «uuid» или «path»." -#: ../clients/cli/connections.c:7889 ../clients/cli/connections.c:8050 +#: ../clients/cli/connections.c:7990 ../clients/cli/connections.c:8156 #, c-format msgid "Error: Unknown connection '%s'." msgstr "Ошибка. Неизвестное соединение: «%s»." -#: ../clients/cli/connections.c:7907 +#: ../clients/cli/connections.c:8008 #, c-format msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n" msgstr "" "Предупреждение. При редактировании соединения «%s» аргумент «type» будет " "пропущен.\n" -#: ../clients/cli/connections.c:7910 +#: ../clients/cli/connections.c:8011 #, c-format msgid "" "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n" @@ -3239,198 +3165,198 @@ msgstr "" "Предупреждение. При редактировании соединения «%s» аргумент «con-name» будет " "пропущен.\n" -#: ../clients/cli/connections.c:7924 +#: ../clients/cli/connections.c:8031 #, c-format msgid "Valid connection types: %s\n" msgstr "Доступные типы подключений: %s\n" -#: ../clients/cli/connections.c:7926 +#: ../clients/cli/connections.c:8033 #, c-format msgid "Error: invalid connection type; %s\n" msgstr "Ошибка. Недопустимый тип соединения: %s.\n" -#: ../clients/cli/connections.c:7965 +#: ../clients/cli/connections.c:8072 #, c-format msgid "===| nmcli interactive connection editor |===" msgstr "===| интерактивный редактор соединений nmcli |===" -#: ../clients/cli/connections.c:7968 +#: ../clients/cli/connections.c:8075 #, c-format msgid "Editing existing '%s' connection: '%s'" msgstr "Редактируется соединение «%s»: «%s»" -#: ../clients/cli/connections.c:7970 +#: ../clients/cli/connections.c:8077 #, c-format msgid "Adding a new '%s' connection" msgstr "Добавление нового соединения «%s»" -#: ../clients/cli/connections.c:7972 +#: ../clients/cli/connections.c:8079 #, c-format msgid "Type 'help' or '?' for available commands." msgstr "Для просмотра доступных команд введите «help» или «?»" -#: ../clients/cli/connections.c:7974 +#: ../clients/cli/connections.c:8081 #, c-format msgid "Type 'describe [<setting>.<prop>]' for detailed property description." msgstr "" "Для просмотра описания свойства введите «describe [<параметр>.<свойство>]»." -#: ../clients/cli/connections.c:8009 +#: ../clients/cli/connections.c:8116 #, c-format msgid "Error: Failed to modify connection '%s': %s" msgstr "Ошибка: не удалось изменить соединение «%s»: %s" -#: ../clients/cli/connections.c:8016 +#: ../clients/cli/connections.c:8123 #, c-format msgid "Connection '%s' (%s) successfully modified.\n" msgstr "Соединение «%s» (%s) успешно изменено.\n" -#: ../clients/cli/connections.c:8098 +#: ../clients/cli/connections.c:8204 #, c-format msgid "%s (%s) cloned as %s (%s).\n" msgstr "%s (%s) было клонировано в %s (%s).\n" -#: ../clients/cli/connections.c:8162 +#: ../clients/cli/connections.c:8270 msgid "New connection name: " msgstr "Название нового соединения:" -#: ../clients/cli/connections.c:8164 +#: ../clients/cli/connections.c:8272 #, c-format msgid "Error: <new name> argument is missing." msgstr "Ошибка: отсутствует <новое имя>." -#: ../clients/cli/connections.c:8170 ../clients/cli/connections.c:8653 +#: ../clients/cli/connections.c:8278 ../clients/cli/connections.c:8798 #, c-format msgid "Error: unknown extra argument: '%s'." msgstr "Ошибка. Неизвестный дополнительный аргумент: «%s»." -#: ../clients/cli/connections.c:8219 +#: ../clients/cli/connections.c:8329 #, c-format msgid "Error: not all connections deleted." msgstr "Ошибка: не все соединения были удалены." -#: ../clients/cli/connections.c:8220 +#: ../clients/cli/connections.c:8330 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "Ошибка: сбой удаления соединения %s" -#: ../clients/cli/connections.c:8277 ../clients/cli/connections.c:8400 +#: ../clients/cli/connections.c:8391 ../clients/cli/connections.c:8516 #, c-format msgid "Error: %s.\n" msgstr "" -#: ../clients/cli/connections.c:8278 ../clients/cli/connections.c:8401 +#: ../clients/cli/connections.c:8392 ../clients/cli/connections.c:8517 #, c-format msgid "Error: not all connections found." msgstr "Ошибка: обнаружены не все соединения." #. truncate trailing ", " -#: ../clients/cli/connections.c:8320 +#: ../clients/cli/connections.c:8435 #, c-format msgid "Error: cannot delete unknown connection(s): %s." msgstr "Ошибка: невозможно удалить неизвестные соединения: %s" -#: ../clients/cli/connections.c:8332 +#: ../clients/cli/connections.c:8447 #, c-format msgid "%s: connection profile changed\n" msgstr "%s: профиль соединения изменился\n" -#: ../clients/cli/connections.c:8358 +#: ../clients/cli/connections.c:8473 #, c-format msgid "%s: connection profile created\n" msgstr "%s: профиль соединения создан\n" -#: ../clients/cli/connections.c:8367 +#: ../clients/cli/connections.c:8482 #, c-format msgid "%s: connection profile removed\n" msgstr "%s: профиль соединения удален\n" -#: ../clients/cli/connections.c:8428 +#: ../clients/cli/connections.c:8545 #, c-format msgid "Error: failed to reload connections: %s." msgstr "Ошибка. Не удалось перезагрузить соединения: %s" -#: ../clients/cli/connections.c:8460 +#: ../clients/cli/connections.c:8578 #, c-format msgid "Error: failed to load connection: %s." msgstr "Ошибка. Не удалось загрузить соединение: %s" -#: ../clients/cli/connections.c:8468 +#: ../clients/cli/connections.c:8586 #, c-format msgid "Could not load file '%s'\n" msgstr "Не удалось загрузить «%s»\n" -#: ../clients/cli/connections.c:8477 +#: ../clients/cli/connections.c:8595 msgid "File to import: " msgstr "Импортируемый файл:" -#: ../clients/cli/connections.c:8501 +#: ../clients/cli/connections.c:8642 #, c-format msgid "Error: No arguments provided." msgstr "Ошибка. Аргументы не определены." -#: ../clients/cli/connections.c:8524 +#: ../clients/cli/connections.c:8667 #, c-format msgid "Warning: 'type' already specified, ignoring extra one.\n" msgstr "" "Предупреждение: «type» уже указан, второе вхождение будет игнорироваться.\n" -#: ../clients/cli/connections.c:8537 +#: ../clients/cli/connections.c:8682 #, c-format msgid "Warning: 'file' already specified, ignoring extra one.\n" msgstr "" "Предупреждение: «file» уже указан, второе вхождение будет игнорироваться.\n" -#: ../clients/cli/connections.c:8539 +#: ../clients/cli/connections.c:8684 #, c-format msgid "Unknown parameter: %s" msgstr "Неизвестный параметр: %s" -#: ../clients/cli/connections.c:8552 +#: ../clients/cli/connections.c:8696 #, c-format msgid "Error: 'type' argument is required." msgstr "Ошибка: необходимо указать «type»." -#: ../clients/cli/connections.c:8557 +#: ../clients/cli/connections.c:8701 #, c-format msgid "Error: 'file' argument is required." msgstr "Ошибка: необходимо указать «file»." -#: ../clients/cli/connections.c:8564 +#: ../clients/cli/connections.c:8708 #, fuzzy, c-format msgid "Error: failed to find VPN plugin for %s." msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s" -#: ../clients/cli/connections.c:8572 ../clients/cli/connections.c:8669 +#: ../clients/cli/connections.c:8716 ../clients/cli/connections.c:8817 #, c-format msgid "Error: failed to load VPN plugin: %s." msgstr "Ошибка: не удалось загрузить модуль VPN: %s" -#: ../clients/cli/connections.c:8580 +#: ../clients/cli/connections.c:8724 #, c-format msgid "Error: failed to import '%s': %s." msgstr "Ошибка импорта «%s»: %s." -#: ../clients/cli/connections.c:8650 +#: ../clients/cli/connections.c:8804 msgid "Output file name: " msgstr "Имя выходного файла:" -#: ../clients/cli/connections.c:8660 +#: ../clients/cli/connections.c:8808 #, c-format msgid "Error: the connection is not VPN." msgstr "Ошибка: соединение не является соединением VPN." -#: ../clients/cli/connections.c:8681 +#: ../clients/cli/connections.c:8829 #, c-format msgid "Error: failed to create temporary file %s." msgstr "Ошибка: не удалось создать временный файл: %s" -#: ../clients/cli/connections.c:8690 +#: ../clients/cli/connections.c:8838 #, c-format msgid "Error: failed to export '%s': %s." msgstr "Ошибка экспорта «%s»: %s" -#: ../clients/cli/connections.c:8701 +#: ../clients/cli/connections.c:8849 #, c-format msgid "Error: failed to read temporary file '%s': %s." msgstr "Ошибка: не удалось прочитать временный файл «%s»: %s" @@ -3565,298 +3491,303 @@ msgstr "ОПРЕД.НЕСУЩЕЙ" msgid "SPEED" msgstr "СКОРОСТЬ" +#. 3 +#: ../clients/cli/devices.c:104 +msgid "SRIOV" +msgstr "" + #. 0 -#: ../clients/cli/devices.c:112 +#: ../clients/cli/devices.c:113 msgid "CARRIER" msgstr "НЕСУЩАЯ" #. 1 -#: ../clients/cli/devices.c:113 +#: ../clients/cli/devices.c:114 msgid "S390-SUBCHANNELS" msgstr "ПОДКАНАЛЫ-S390" #. 0 -#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:827 +#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:828 msgid "WEP" msgstr "WEP" #. 1 -#: ../clients/cli/devices.c:123 +#: ../clients/cli/devices.c:124 msgid "WPA" msgstr "WPA" #. 2 -#: ../clients/cli/devices.c:124 ../clients/cli/devices.c:835 +#: ../clients/cli/devices.c:125 ../clients/cli/devices.c:836 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../clients/cli/devices.c:125 +#: ../clients/cli/devices.c:126 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../clients/cli/devices.c:126 +#: ../clients/cli/devices.c:127 msgid "CCMP" msgstr "CCMP" #. 5 #. 2 -#: ../clients/cli/devices.c:127 ../clients/cli/devices.c:239 +#: ../clients/cli/devices.c:128 ../clients/cli/devices.c:240 msgid "AP" msgstr "ТОЧКА ДОСТУПА" #. 6 -#: ../clients/cli/devices.c:128 +#: ../clients/cli/devices.c:129 msgid "ADHOC" msgstr "ADHOC" #. 7 -#: ../clients/cli/devices.c:129 +#: ../clients/cli/devices.c:130 msgid "2GHZ" msgstr "2 ГГц" #. 8 -#: ../clients/cli/devices.c:130 +#: ../clients/cli/devices.c:131 msgid "5GHZ" msgstr "5 ГГц" #. 0 -#: ../clients/cli/devices.c:139 +#: ../clients/cli/devices.c:140 msgid "CTR-FREQ" msgstr "CTR-FREQ" #. 1 -#: ../clients/cli/devices.c:140 +#: ../clients/cli/devices.c:141 msgid "RSSI" msgstr "RSSI" #. 2 -#: ../clients/cli/devices.c:141 +#: ../clients/cli/devices.c:142 msgid "CINR" msgstr "CINR" #. 3 -#: ../clients/cli/devices.c:142 +#: ../clients/cli/devices.c:143 msgid "TX-POW" msgstr "TX-POW" #. 4 -#: ../clients/cli/devices.c:143 +#: ../clients/cli/devices.c:144 msgid "BSID" msgstr "BSID" #. 1 -#: ../clients/cli/devices.c:153 +#: ../clients/cli/devices.c:154 msgid "SSID-HEX" msgstr "SSID-HEX" #. 2 -#: ../clients/cli/devices.c:154 ../clients/tui/nmt-page-wifi.c:358 +#: ../clients/cli/devices.c:155 ../clients/tui/nmt-page-wifi.c:358 msgid "BSSID" msgstr "BSSID" #. 3 -#: ../clients/cli/devices.c:155 +#: ../clients/cli/devices.c:156 msgid "MODE" msgstr "РЕЖИМ" #. 4 -#: ../clients/cli/devices.c:156 +#: ../clients/cli/devices.c:157 msgid "CHAN" msgstr "КАНАЛ" #. 5 -#: ../clients/cli/devices.c:157 +#: ../clients/cli/devices.c:158 msgid "FREQ" msgstr "ЧАСТОТА" #. 6 -#: ../clients/cli/devices.c:158 +#: ../clients/cli/devices.c:159 msgid "RATE" msgstr "СКОРОСТЬ" #. 7 #. 1 -#: ../clients/cli/devices.c:159 ../clients/cli/devices.c:179 +#: ../clients/cli/devices.c:160 ../clients/cli/devices.c:180 msgid "SIGNAL" msgstr "СИГНАЛ" #. 8 -#: ../clients/cli/devices.c:160 +#: ../clients/cli/devices.c:161 msgid "BARS" msgstr "СТОЛБЦЫ" #. 9 -#: ../clients/cli/devices.c:161 +#: ../clients/cli/devices.c:162 msgid "SECURITY" msgstr "ЗАЩИТА" #. 10 -#: ../clients/cli/devices.c:162 +#: ../clients/cli/devices.c:163 msgid "WPA-FLAGS" msgstr "ФЛАГИ WPA" #. 11 -#: ../clients/cli/devices.c:163 +#: ../clients/cli/devices.c:164 msgid "RSN-FLAGS" msgstr "ФЛАГИ RSN" #. 14 -#: ../clients/cli/devices.c:166 +#: ../clients/cli/devices.c:167 msgid "*" msgstr "*" #. 0 #. 5 -#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:242 +#: ../clients/cli/devices.c:179 ../clients/cli/devices.c:243 msgid "NSP" msgstr "NSP" #. 0 -#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202 +#: ../clients/cli/devices.c:194 ../clients/cli/devices.c:203 msgid "SLAVES" msgstr "СЛЕЙВЫ" #. 1 -#: ../clients/cli/devices.c:203 +#: ../clients/cli/devices.c:204 msgid "CONFIG" msgstr "" #. 0 -#: ../clients/cli/devices.c:212 +#: ../clients/cli/devices.c:213 msgid "PARENT" msgstr "РОДИТЕЛЬ" #. 1 -#: ../clients/cli/devices.c:213 +#: ../clients/cli/devices.c:214 msgid "ID" msgstr "ID" #. 0 -#: ../clients/cli/devices.c:222 ../clients/cli/devices.c:237 +#: ../clients/cli/devices.c:223 ../clients/cli/devices.c:238 msgid "CAPABILITIES" msgstr "ВОЗМОЖНОСТИ" #. 1 -#: ../clients/cli/devices.c:238 +#: ../clients/cli/devices.c:239 msgid "WIFI-PROPERTIES" msgstr "СВОЙСТВА WIFI" #. 3 -#: ../clients/cli/devices.c:240 +#: ../clients/cli/devices.c:241 msgid "WIRED-PROPERTIES" msgstr "СВОЙСТВА ПРОВОДНОГО СОЕДИНЕНИЯ" #. 4 -#: ../clients/cli/devices.c:241 +#: ../clients/cli/devices.c:242 msgid "WIMAX-PROPERTIES" msgstr "СВОЙСТВА WIMAX" #. 10 -#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-bond.c:351 +#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bond.c:351 msgid "BOND" msgstr "АГРЕГАЦИЯ (BOND)" #. 11 -#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-team.c:145 +#: ../clients/cli/devices.c:249 ../clients/tui/nmt-page-team.c:145 msgid "TEAM" msgstr "АГРЕГАЦИЯ (TEAM)" #. 12 -#: ../clients/cli/devices.c:249 ../clients/tui/nmt-page-bridge.c:74 +#: ../clients/cli/devices.c:250 ../clients/tui/nmt-page-bridge.c:81 msgid "BRIDGE" msgstr "МОСТ" #. 13 -#: ../clients/cli/devices.c:250 ../clients/tui/nm-editor-utils.c:217 -#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1897 -#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632 -#: ../libnm/nm-device.c:1681 +#: ../clients/cli/devices.c:251 ../clients/tui/nm-editor-utils.c:217 +#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1937 +#: ../libnm-glib/nm-device.c:1841 ../libnm-util/nm-connection.c:1632 +#: ../libnm/nm-device.c:1637 msgid "VLAN" msgstr "VLAN" #. 14 -#: ../clients/cli/devices.c:251 +#: ../clients/cli/devices.c:252 msgid "BLUETOOTH" msgstr "BLUETOOTH" #. 15 -#: ../clients/cli/devices.c:252 +#: ../clients/cli/devices.c:253 msgid "CONNECTIONS" msgstr "СОЕДИНЕНИЯ" #. 1 -#: ../clients/cli/devices.c:264 +#: ../clients/cli/devices.c:265 msgid "CHASSIS-ID" msgstr "ID-ШАССИ" #. 2 -#: ../clients/cli/devices.c:265 +#: ../clients/cli/devices.c:266 msgid "PORT-ID" msgstr "ID-ПОРТА" #. 3 -#: ../clients/cli/devices.c:266 +#: ../clients/cli/devices.c:267 msgid "PORT-DESCRIPTION" msgstr "ОПИСАНИЕ-ПОРТА" #. 4 -#: ../clients/cli/devices.c:267 +#: ../clients/cli/devices.c:268 msgid "SYSTEM-NAME" msgstr "ИМЯ-СИСТЕМЫ" #. 5 -#: ../clients/cli/devices.c:268 +#: ../clients/cli/devices.c:269 msgid "SYSTEM-DESCRIPTION" msgstr "ОПИСАНИЕ-СИСТЕМЫ" #. 6 -#: ../clients/cli/devices.c:269 +#: ../clients/cli/devices.c:270 msgid "SYSTEM-CAPABILITIES" msgstr "ВОЗМОЖНОСТИ-СИСТЕМЫ" #. 7 -#: ../clients/cli/devices.c:270 +#: ../clients/cli/devices.c:271 msgid "IEEE-802-1-PVID" msgstr "PVID-IEEE-802-1" #. 8 -#: ../clients/cli/devices.c:271 +#: ../clients/cli/devices.c:272 msgid "IEEE-802-1-PPVID" msgstr "PPVID-IEEE-802-1" #. 9 -#: ../clients/cli/devices.c:272 +#: ../clients/cli/devices.c:273 msgid "IEEE-802-1-PPVID-FLAGS" msgstr "ФЛАГИ-PPVID-IEEE-802-1" #. 10 -#: ../clients/cli/devices.c:273 +#: ../clients/cli/devices.c:274 msgid "IEEE-802-1-VID" msgstr "VID-IEEE-802-1" #. 11 -#: ../clients/cli/devices.c:274 +#: ../clients/cli/devices.c:275 msgid "IEEE-802-1-VLAN-NAME" msgstr "ИМЯ-VLAN-IEEE-802-1" #. 12 -#: ../clients/cli/devices.c:275 +#: ../clients/cli/devices.c:276 msgid "DESTINATION" msgstr "НАЗНАЧЕНИЕ" #. 13 -#: ../clients/cli/devices.c:276 +#: ../clients/cli/devices.c:277 msgid "CHASSIS-ID-TYPE" msgstr "ТИП-ID-ШАССИ" #. 14 -#: ../clients/cli/devices.c:277 +#: ../clients/cli/devices.c:278 msgid "PORT-ID-TYPE" msgstr "ТИП-ID-ПОРТА" -#: ../clients/cli/devices.c:294 +#: ../clients/cli/devices.c:295 #, c-format msgid "" "Usage: nmcli device { COMMAND | help }\n" @@ -3898,7 +3829,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/devices.c:317 +#: ../clients/cli/devices.c:318 #, c-format msgid "" "Usage: nmcli device status { help }\n" @@ -3928,7 +3859,7 @@ msgstr "" "gen status».\n" "\n" -#: ../clients/cli/devices.c:332 +#: ../clients/cli/devices.c:333 #, c-format msgid "" "Usage: nmcli device show { ARGUMENTS | help }\n" @@ -3947,7 +3878,7 @@ msgstr "" "отдельно выбранном устройстве.\n" "\n" -#: ../clients/cli/devices.c:343 +#: ../clients/cli/devices.c:344 #, c-format msgid "" "Usage: nmcli device connect { ARGUMENTS | help }\n" @@ -3969,7 +3900,7 @@ msgstr "" "принимая во внимание соединения без включенных функций\n" "автоматического запуска.\n" -#: ../clients/cli/devices.c:355 +#: ../clients/cli/devices.c:356 #, fuzzy, c-format msgid "" "Usage: nmcli device reapply { ARGUMENTS | help }\n" @@ -3989,7 +3920,7 @@ msgstr "" "\n" "\n" -#: ../clients/cli/devices.c:366 +#: ../clients/cli/devices.c:367 #, c-format msgid "" "Usage: nmcli device modify { ARGUMENTS | --help }\n" @@ -4011,7 +3942,7 @@ msgid "" "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n" msgstr "" -#: ../clients/cli/devices.c:386 +#: ../clients/cli/devices.c:387 #, c-format msgid "" "Usage: nmcli device disconnect { ARGUMENTS | help }\n" @@ -4030,7 +3961,7 @@ msgstr "" "Отключает устройство и предотвращает повторную\n" "активацию соединений без вмешательства пользователя.\n" -#: ../clients/cli/devices.c:398 +#: ../clients/cli/devices.c:399 #, c-format msgid "" "Usage: nmcli device delete { ARGUMENTS | help }\n" @@ -4052,7 +3983,7 @@ msgstr "" "устройств (агрегированных устройств, мостов и т.п.). \n" "Аппаратные устройства эта команда удалить не может.\n" -#: ../clients/cli/devices.c:411 +#: ../clients/cli/devices.c:412 #, c-format msgid "" "Usage: nmcli device set { ARGUMENTS | help }\n" @@ -4074,7 +4005,7 @@ msgstr "" "\n" "Изменить свойства устройства.\n" -#: ../clients/cli/devices.c:424 +#: ../clients/cli/devices.c:425 #, c-format msgid "" "Usage: nmcli device monitor { ARGUMENTS | help }\n" @@ -4096,7 +4027,7 @@ msgstr "" "Если интерфейс не указан, будут отслеживаться \n" "все устройства.\n" -#: ../clients/cli/devices.c:436 +#: ../clients/cli/devices.c:437 #, c-format msgid "" "Usage: nmcli device wifi { ARGUMENTS | help }\n" @@ -4149,7 +4080,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/devices.c:483 +#: ../clients/cli/devices.c:484 #, c-format msgid "" "Usage: nmcli device lldp { ARGUMENTS | help }\n" @@ -4169,112 +4100,112 @@ msgstr "" "Параметр «ifname» позволяет получить список соседей\n" "для определенного интерфейса.\n" -#: ../clients/cli/devices.c:584 +#: ../clients/cli/devices.c:585 #, c-format msgid "Error: No interface specified." msgstr "Ошибка. Интерфейс не определен." -#: ../clients/cli/devices.c:607 +#: ../clients/cli/devices.c:608 #, c-format msgid "Warning: argument '%s' is duplicated.\n" msgstr "Предупреждение: аргумент «%s» дублируется.\n" -#: ../clients/cli/devices.c:610 +#: ../clients/cli/devices.c:611 #, c-format msgid "Error: Device '%s' not found.\n" msgstr "Ошибка: «%s» не обнаружено.\n" -#: ../clients/cli/devices.c:611 +#: ../clients/cli/devices.c:612 #, c-format msgid "Error: not all devices found." msgstr "Ошибка: обнаружены не все устройства." -#: ../clients/cli/devices.c:640 +#: ../clients/cli/devices.c:641 msgid "No interface specified" msgstr "" -#: ../clients/cli/devices.c:659 +#: ../clients/cli/devices.c:660 #, c-format msgid "Device '%s' not found" msgstr "" -#: ../clients/cli/devices.c:745 ../clients/cli/devices.c:897 +#: ../clients/cli/devices.c:746 ../clients/cli/devices.c:898 msgid "(none)" msgstr "(нет)" -#: ../clients/cli/devices.c:815 +#: ../clients/cli/devices.c:816 #, c-format msgid "%u MHz" msgstr "%u МГц" -#: ../clients/cli/devices.c:816 +#: ../clients/cli/devices.c:817 #, c-format msgid "%u Mbit/s" msgstr "%u МБ/с" -#: ../clients/cli/devices.c:831 +#: ../clients/cli/devices.c:832 msgid "WPA1" msgstr "WPA1" -#: ../clients/cli/devices.c:840 +#: ../clients/cli/devices.c:841 msgid "802.1X" msgstr "802.1X" -#: ../clients/cli/devices.c:856 +#: ../clients/cli/devices.c:857 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../clients/cli/devices.c:857 +#: ../clients/cli/devices.c:858 msgid "Infra" msgstr "Инфраструктура" -#: ../clients/cli/devices.c:858 +#: ../clients/cli/devices.c:859 msgid "N/A" msgstr "Н/Д" -#: ../clients/cli/devices.c:1082 +#: ../clients/cli/devices.c:1083 msgid "Device details" msgstr "Сведения об устройстве" -#: ../clients/cli/devices.c:1094 +#: ../clients/cli/devices.c:1095 #, c-format msgid "Error: 'device show': %s" msgstr "Ошибка «device show»: %s" -#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1149 +#: ../clients/cli/devices.c:1149 ../clients/cli/devices.c:1152 msgid "(unknown)" msgstr "(неизвестно)" -#: ../clients/cli/devices.c:1190 +#: ../clients/cli/devices.c:1193 #, c-format msgid "%u Mb/s" msgstr "%u Мб/c" -#: ../clients/cli/devices.c:1281 +#: ../clients/cli/devices.c:1285 msgid "on" msgstr "вкл." -#: ../clients/cli/devices.c:1281 +#: ../clients/cli/devices.c:1285 msgid "off" msgstr "выкл." -#: ../clients/cli/devices.c:1519 +#: ../clients/cli/devices.c:1518 #, c-format msgid "Error: 'device status': %s" msgstr "Ошибка: «device status»: %s" #. Add headers -#: ../clients/cli/devices.c:1525 +#: ../clients/cli/devices.c:1524 msgid "Status of devices" msgstr "Состояние устройств" -#: ../clients/cli/devices.c:1559 ../clients/cli/devices.c:2013 -#: ../clients/cli/devices.c:3741 +#: ../clients/cli/devices.c:1559 ../clients/cli/devices.c:2015 +#: ../clients/cli/devices.c:3781 #, c-format msgid "Error: invalid extra argument '%s'." msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»." -#: ../clients/cli/devices.c:1596 ../clients/cli/general.c:461 +#: ../clients/cli/devices.c:1596 ../clients/cli/general.c:455 #, c-format msgid "Error: Timeout %d sec expired." msgstr "Ошибка: превышено время ожидания (%d с)." @@ -4338,118 +4269,119 @@ msgstr "Ошибка. Не удалось активировать устрой msgid "Device '%s' has been connected.\n" msgstr "Устройство «%s» подключено.\n" -#: ../clients/cli/devices.c:1845 +#: ../clients/cli/devices.c:1846 #, c-format msgid "Error: extra argument not allowed: '%s'." msgstr "Ошибка. Дополнительный аргумент не разрешен: «%s»." -#: ../clients/cli/devices.c:1917 ../clients/cli/devices.c:1932 -#: ../clients/cli/devices.c:2160 +#: ../clients/cli/devices.c:1918 ../clients/cli/devices.c:1933 +#: ../clients/cli/devices.c:2163 #, c-format msgid "Device '%s' successfully disconnected.\n" msgstr "Выполнено: устройство «%s» отключено.\n" -#: ../clients/cli/devices.c:1920 +#: ../clients/cli/devices.c:1921 #, c-format msgid "Device '%s' successfully removed.\n" msgstr "Устройство «%s» отключено.\n" -#: ../clients/cli/devices.c:1979 ../clients/cli/devices.c:2048 +#: ../clients/cli/devices.c:1980 ../clients/cli/devices.c:2050 #, fuzzy, c-format msgid "Error: Reapplying connection to device '%s' (%s) failed: %s" msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s" -#: ../clients/cli/devices.c:1989 ../clients/cli/devices.c:2057 +#: ../clients/cli/devices.c:1990 ../clients/cli/devices.c:2059 #, c-format msgid "Connection successfully reapplied to device '%s'.\n" msgstr "Соединение снова применено к устройству «%s».\n" -#: ../clients/cli/devices.c:2082 +#: ../clients/cli/devices.c:2084 #, c-format msgid "Error: Reading applied connection from device '%s' (%s) failed: %s" msgstr "" -#: ../clients/cli/devices.c:2145 +#: ../clients/cli/devices.c:2148 #, c-format msgid "Error: not all devices disconnected." msgstr "Ошибка: отключены не все устройства." -#: ../clients/cli/devices.c:2146 +#: ../clients/cli/devices.c:2149 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s\n" msgstr "" "Ошибка: попытка отключения устройства «%s» (%s) завершилось неудачей: %s\n" -#: ../clients/cli/devices.c:2223 +#: ../clients/cli/devices.c:2227 #, c-format msgid "Error: not all devices deleted." msgstr "Ошибка: удалены не все устройства." -#: ../clients/cli/devices.c:2224 +#: ../clients/cli/devices.c:2228 #, c-format msgid "Error: Device '%s' (%s) deletion failed: %s\n" msgstr "Ошибка: не удается удалить устройство «%s» (%s): %s\n" -#: ../clients/cli/devices.c:2308 +#: ../clients/cli/devices.c:2312 #, c-format msgid "Error: No property specified." msgstr "Ошибка: свойство не определено." -#: ../clients/cli/devices.c:2321 ../clients/cli/devices.c:2336 +#: ../clients/cli/devices.c:2327 ../clients/cli/devices.c:2344 +#: ../clients/cli/general.c:664 ../clients/cli/general.c:676 #, c-format msgid "Error: '%s' argument is missing." msgstr "Ошибка: отсутствует аргумент «%s»" -#: ../clients/cli/devices.c:2327 +#: ../clients/cli/devices.c:2333 #, c-format msgid "Error: 'managed': %s." msgstr "Ошибка «managed»: %s" -#: ../clients/cli/devices.c:2342 +#: ../clients/cli/devices.c:2350 #, c-format msgid "Error: 'autoconnect': %s." msgstr "Ошибка «autoconnect»: %s." -#: ../clients/cli/devices.c:2350 +#: ../clients/cli/devices.c:2358 ../clients/cli/general.c:690 #, c-format msgid "Error: property '%s' is not known." msgstr "Ошибка: неизвестное свойство «%s»." -#: ../clients/cli/devices.c:2400 +#: ../clients/cli/devices.c:2408 #, c-format msgid "%s: using connection '%s'\n" msgstr "%s: использует соединение «%s».\n" -#: ../clients/cli/devices.c:2426 +#: ../clients/cli/devices.c:2434 #, c-format msgid "%s: device created\n" msgstr "%s: устройство создано\n" -#: ../clients/cli/devices.c:2433 +#: ../clients/cli/devices.c:2441 #, c-format msgid "%s: device removed\n" msgstr "%s: устройство удалено\n" -#: ../clients/cli/devices.c:2630 +#: ../clients/cli/devices.c:2639 msgid "Wi-Fi scan list" msgstr "Список сканирования Wi-Fi" -#: ../clients/cli/devices.c:2674 +#: ../clients/cli/devices.c:2687 #, c-format msgid "Error: 'device wifi': %s" msgstr "Ошибка «device wifi»: «%s»" -#: ../clients/cli/devices.c:2685 +#: ../clients/cli/devices.c:2698 #, c-format msgid "Error: Device '%s' not found." msgstr "Ошибка: не найдено устройство «%s»." -#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2788 +#: ../clients/cli/devices.c:2719 ../clients/cli/devices.c:2801 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "Ошибка: точка доступа с bssid «%s» не найдена." -#: ../clients/cli/devices.c:2732 +#: ../clients/cli/devices.c:2745 #, c-format msgid "" "Error: Device '%s' was not recognized as a Wi-Fi device, check " @@ -4458,27 +4390,27 @@ msgstr "" "Ошибка: «%s» не распознается как устройство Wi-Fi. Проверьте модуль Wi-Fi " "для NetworkManager." -#: ../clients/cli/devices.c:2736 ../clients/cli/devices.c:2998 -#: ../clients/cli/devices.c:3421 ../clients/cli/devices.c:3576 +#: ../clients/cli/devices.c:2749 ../clients/cli/devices.c:3026 +#: ../clients/cli/devices.c:3461 ../clients/cli/devices.c:3620 #, c-format msgid "Error: Device '%s' is not a Wi-Fi device." msgstr "Ошибка: «%s» не является устройством WiFi." -#: ../clients/cli/devices.c:2863 +#: ../clients/cli/devices.c:2876 msgid "SSID or BSSID: " msgstr "SSID или BSSID: " -#: ../clients/cli/devices.c:2868 +#: ../clients/cli/devices.c:2881 #, c-format msgid "Error: SSID or BSSID are missing." msgstr "Ошибка: не указан SSID или BSSID." -#: ../clients/cli/devices.c:2900 +#: ../clients/cli/devices.c:2917 #, c-format msgid "Error: bssid argument value '%s' is not a valid BSSID." msgstr "Ошибка: недопустимое значение аргумента bssid «%s»." -#: ../clients/cli/devices.c:2926 +#: ../clients/cli/devices.c:2947 #, c-format msgid "" "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." @@ -4486,44 +4418,44 @@ msgstr "" "Ошибка: недопустимое значение аргумента wep-key-type «%s»; используйте «key» " "или «phrase»." -#: ../clients/cli/devices.c:2948 ../clients/cli/devices.c:2963 +#: ../clients/cli/devices.c:2974 ../clients/cli/devices.c:2992 #, c-format msgid "Error: %s: %s." msgstr "Ошибка: %s: %s." -#: ../clients/cli/devices.c:2981 +#: ../clients/cli/devices.c:3009 #, c-format msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." msgstr "" "Ошибка: BSSID для подключения к (%s) отличается от bssid аргумента (%s)." -#: ../clients/cli/devices.c:2987 +#: ../clients/cli/devices.c:3015 #, c-format msgid "Error: Parameter '%s' is neither SSID nor BSSID." msgstr "Ошибка: параметр «%s» не является SSID или BSSID." -#: ../clients/cli/devices.c:3000 ../clients/cli/devices.c:3423 -#: ../clients/cli/devices.c:3578 +#: ../clients/cli/devices.c:3028 ../clients/cli/devices.c:3463 +#: ../clients/cli/devices.c:3622 #, c-format msgid "Error: No Wi-Fi device found." msgstr "Ошибка: устройства Wi-Fi не найдены." -#: ../clients/cli/devices.c:3020 +#: ../clients/cli/devices.c:3048 #, c-format msgid "Error: Failed to scan hidden SSID: %s." msgstr "Ошибка: скрытый SSID не может сканироваться: %s" -#: ../clients/cli/devices.c:3047 +#: ../clients/cli/devices.c:3075 #, c-format msgid "Error: No network with SSID '%s' found." msgstr "Ошибка: не найдена сеть с SSID «%s»." -#: ../clients/cli/devices.c:3049 +#: ../clients/cli/devices.c:3077 #, c-format msgid "Error: No access point with BSSID '%s' found." msgstr "Ошибка: точка доступа с BSSID «%s» не найдена." -#: ../clients/cli/devices.c:3091 +#: ../clients/cli/devices.c:3119 #, c-format msgid "" "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n" @@ -4531,75 +4463,75 @@ msgstr "" "Предупреждение: «%s» должен содержать SSID для скрытой точки доступа, но " "обнаружен BSSID.\n" -#: ../clients/cli/devices.c:3105 +#: ../clients/cli/devices.c:3133 msgid "Password: " msgstr "Пароль:" -#: ../clients/cli/devices.c:3254 +#: ../clients/cli/devices.c:3282 #, c-format msgid "'%s' is not valid WPA PSK" msgstr "«%s» не является действительным WPA PSK" -#: ../clients/cli/devices.c:3271 +#: ../clients/cli/devices.c:3299 #, c-format msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)" msgstr "" "«%s» не является действительным ключом WEP (должен содержать 5 или 13 " "символов ASCII)" -#: ../clients/cli/devices.c:3287 +#: ../clients/cli/devices.c:3315 #, c-format msgid "Hotspot password: %s\n" msgstr "Пароль точки доступа: %s\n" -#: ../clients/cli/devices.c:3351 +#: ../clients/cli/devices.c:3386 #, c-format msgid "Error: ssid is too long." msgstr "Ошибка: слишком длинный SSID." -#: ../clients/cli/devices.c:3363 +#: ../clients/cli/devices.c:3400 #, c-format msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'." msgstr "" "Ошибка: недопустимое значение аргумента «band»: «%s». Используйте «a» или " "«bg»." -#: ../clients/cli/devices.c:3384 +#: ../clients/cli/devices.c:3425 #, c-format msgid "Error: Unknown parameter %s." msgstr "Ошибка: неизвестный параметр: %s" -#: ../clients/cli/devices.c:3405 +#: ../clients/cli/devices.c:3445 #, c-format msgid "Error: channel requires band too." msgstr "Ошибка: для канала тоже необходимо определить полосу." -#: ../clients/cli/devices.c:3410 +#: ../clients/cli/devices.c:3450 #, c-format msgid "Error: channel '%s' not valid for band '%s'." msgstr "Ошибка: недопустимый канал «%s» для полосы «%s»." -#: ../clients/cli/devices.c:3434 +#: ../clients/cli/devices.c:3474 #, c-format msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode." msgstr "Ошибка: «%s» не поддерживает режим точки доступа или Ad-Hoc." -#: ../clients/cli/devices.c:3468 +#: ../clients/cli/devices.c:3508 #, c-format msgid "Error: Invalid 'password': %s." msgstr "Ошибка: неверный «password»: %s." -#: ../clients/cli/devices.c:3542 +#: ../clients/cli/devices.c:3583 #, c-format msgid "Error: '%s' cannot repeat." msgstr "Ошибка: «%s» не может повторяться." #. Main header name -#: ../clients/cli/devices.c:3651 +#: ../clients/cli/devices.c:3688 msgid "Device LLDP neighbors" msgstr "Соседи LLDP" -#: ../clients/cli/devices.c:3759 +#: ../clients/cli/devices.c:3798 #, c-format msgid "Error: 'device lldp list': %s" msgstr "Ошибка: «device lldp list»: %s" @@ -4953,6 +4885,10 @@ msgstr "подключен (на узле)" msgid "disconnecting" msgstr "отключение" +#: ../clients/cli/general.c:280 +msgid "none" +msgstr "нет" + #: ../clients/cli/general.c:282 msgid "portal" msgstr "портал" @@ -4998,167 +4934,168 @@ msgstr "включен" msgid "disabled" msgstr "отключен" -#: ../clients/cli/general.c:450 +#: ../clients/cli/general.c:444 msgid "auth" msgstr "подлинный" -#: ../clients/cli/general.c:491 +#: ../clients/cli/general.c:485 #, c-format msgid "Error: 'general permissions': %s" msgstr "Ошибка общих разрешений: %s" -#: ../clients/cli/general.c:497 +#: ../clients/cli/general.c:491 msgid "NetworkManager permissions" msgstr "Разрешения NetworkManager" -#: ../clients/cli/general.c:607 +#: ../clients/cli/general.c:595 #, c-format msgid "Error: 'general logging': %s" msgstr "Ошибка «general logging»: %s" -#: ../clients/cli/general.c:621 +#: ../clients/cli/general.c:609 msgid "NetworkManager logging" msgstr "Ведение журналов NetworkManager" -#: ../clients/cli/general.c:670 +#: ../clients/cli/general.c:700 #, c-format msgid "Error: failed to set logging: %s" msgstr "Ошибка: не удалось настроить параметры ведения журнала: %s" -#: ../clients/cli/general.c:687 +#: ../clients/cli/general.c:717 #, c-format msgid "Error: failed to set hostname: %s" msgstr "Ошибка: не удалось установить имя узла: %s" -#: ../clients/cli/general.c:753 +#: ../clients/cli/general.c:786 #, c-format msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)" msgstr "Недопустимое поле «--fields»: «%s». Допускается: %s" -#: ../clients/cli/general.c:778 +#: ../clients/cli/general.c:811 #, c-format msgid "Error: invalid '%s' argument: '%s' (use on/off)." msgstr "Недопустимый аргумент «%s»: «%s». Может принимать значения on или off." #. no arguments -> get current state -#: ../clients/cli/general.c:823 ../clients/cli/general.c:835 +#: ../clients/cli/general.c:859 ../clients/cli/general.c:871 msgid "Connectivity" msgstr "Соединение" -#: ../clients/cli/general.c:838 +#: ../clients/cli/general.c:874 #, c-format msgid "Error: 'networking' command '%s' is not valid." msgstr "Ошибка. Недопустимая команда «networking»: «%s»." -#: ../clients/cli/general.c:851 +#: ../clients/cli/general.c:888 msgid "Networking" msgstr "Сеть" -#: ../clients/cli/general.c:889 +#. no argument, show all radio switches +#: ../clients/cli/general.c:923 msgid "Radio switches" msgstr "Переключатели" #. no argument, show current WiFi state -#: ../clients/cli/general.c:918 +#: ../clients/cli/general.c:953 msgid "Wi-Fi radio switch" msgstr "Переключатель Wi-Fi" #. no argument, show current WWAN (mobile broadband) state -#: ../clients/cli/general.c:944 +#: ../clients/cli/general.c:980 msgid "WWAN radio switch" msgstr "Переключатель WWAN" -#: ../clients/cli/general.c:991 +#: ../clients/cli/general.c:1029 msgid "NetworkManager has started" msgstr "NetworkManager запущен" -#: ../clients/cli/general.c:991 +#: ../clients/cli/general.c:1029 msgid "NetworkManager has stopped" msgstr "NetworkManager остановлен" -#: ../clients/cli/general.c:1002 +#: ../clients/cli/general.c:1040 #, c-format msgid "Hostname set to '%s'\n" msgstr "Установлено имя узла «%s»\n" -#: ../clients/cli/general.c:1017 +#: ../clients/cli/general.c:1055 #, c-format msgid "'%s' is now the primary connection\n" msgstr "«%s» не является основным подключением.\n" -#: ../clients/cli/general.c:1019 +#: ../clients/cli/general.c:1057 #, c-format msgid "There's no primary connection\n" msgstr "Нет основного соединения\n" -#: ../clients/cli/general.c:1031 +#: ../clients/cli/general.c:1069 #, c-format msgid "Connectivity is now '%s'\n" msgstr "Уровень соединения: «%s»\n" -#: ../clients/cli/general.c:1044 +#: ../clients/cli/general.c:1082 #, c-format msgid "Networkmanager is now in the '%s' state\n" msgstr "NetworkManager находится в состоянии «%s»\n" -#: ../clients/cli/general.c:1065 +#: ../clients/cli/general.c:1103 msgid "connection available" msgstr "" -#: ../clients/cli/general.c:1067 +#: ../clients/cli/general.c:1105 msgid "connections available" msgstr "" -#: ../clients/cli/general.c:1085 +#: ../clients/cli/general.c:1123 msgid "autoconnect" msgstr "" -#: ../clients/cli/general.c:1087 +#: ../clients/cli/general.c:1125 msgid "fw missing" msgstr "" -#: ../clients/cli/general.c:1092 +#: ../clients/cli/general.c:1130 msgid "plugin missing" msgstr "" -#: ../clients/cli/general.c:1097 +#: ../clients/cli/general.c:1135 msgid "sw" msgstr "" -#: ../clients/cli/general.c:1099 +#: ../clients/cli/general.c:1137 msgid "hw" msgstr "" -#: ../clients/cli/general.c:1104 +#: ../clients/cli/general.c:1142 msgid "iface" msgstr "" -#: ../clients/cli/general.c:1107 +#: ../clients/cli/general.c:1145 msgid "port" msgstr "" -#: ../clients/cli/general.c:1110 +#: ../clients/cli/general.c:1148 msgid "mtu" msgstr "" -#: ../clients/cli/general.c:1127 +#: ../clients/cli/general.c:1165 msgid "master" msgstr "" -#: ../clients/cli/general.c:1133 +#: ../clients/cli/general.c:1171 msgid "ip4 default" msgstr "" -#: ../clients/cli/general.c:1135 +#: ../clients/cli/general.c:1173 msgid "ip6 default" msgstr "" -#: ../clients/cli/general.c:1213 +#: ../clients/cli/general.c:1253 #, c-format msgid "%s VPN connection" msgstr "" -#: ../clients/cli/general.c:1283 +#: ../clients/cli/general.c:1323 #, c-format msgid "" "Use \"nmcli device show\" to get complete information about known devices " @@ -5169,35 +5106,37 @@ msgid "" "details.\n" msgstr "" -#: ../clients/cli/general.c:1302 +#: ../clients/cli/general.c:1344 #, c-format msgid "Error: 'monitor' command '%s' is not valid." msgstr "Ошибка: неверная команда «monitor»: «%s»." -#: ../clients/cli/general.c:1314 +#: ../clients/cli/general.c:1356 msgid "Networkmanager is not running (waiting for it)\n" msgstr "NetworkManager не работает (ожидание запуска)\n" -#: ../clients/cli/nmcli.c:181 +#: ../clients/cli/nmcli.c:171 #, c-format msgid "" "Usage: nmcli [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" -" -c[olors] auto|yes|no whether to use colors in " +" -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" -" -a[sk] ask for missing parameters\n" -" -s[how-secrets] allow displaying passwords\n" -" -w[ait] <seconds> set timeout waiting for " +" -f[ields] <field1,field2,...>|all|common specify fields to output\n" +" -g[et-values] <field1,field2,...>|all|common shortcut for -m tabular -t -" +"f\n" +" -e[scape] yes|no escape columns separators " +"in values\n" +" -a[sk] ask for missing parameters\n" +" -s[how-secrets] allow displaying passwords\n" +" -w[ait] <seconds> set timeout waiting for " "finishing operations\n" -" -v[ersion] show program version\n" -" -h[elp] print this help\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" @@ -5210,64 +5149,64 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/nmcli.c:258 +#: ../clients/cli/nmcli.c:249 #, c-format msgid "Error: Option '--terse' is specified the second time." msgstr "Ошибка. Параметр «--terse» указан дважды." -#: ../clients/cli/nmcli.c:263 +#: ../clients/cli/nmcli.c:254 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." msgstr "Ошибка: параметры «--terse» и «--pretty» взаимоисключаемы." -#: ../clients/cli/nmcli.c:271 +#: ../clients/cli/nmcli.c:262 #, c-format msgid "Error: Option '--pretty' is specified the second time." msgstr "Ошибка: параметр «--pretty» указан дважды." -#: ../clients/cli/nmcli.c:276 +#: ../clients/cli/nmcli.c:267 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." msgstr "Ошибка: параметры «--pretty» и «--terse» взаимоисключаемы." -#: ../clients/cli/nmcli.c:285 ../clients/cli/nmcli.c:302 -#: ../clients/cli/nmcli.c:321 ../clients/cli/nmcli.c:354 +#: ../clients/cli/nmcli.c:278 ../clients/cli/nmcli.c:297 +#: ../clients/cli/nmcli.c:318 ../clients/cli/nmcli.c:369 #, c-format msgid "Error: missing argument for '%s' option." msgstr "Ошибка: отсутствует аргумент параметра «%s»." -#: ../clients/cli/nmcli.c:296 ../clients/cli/nmcli.c:315 -#: ../clients/cli/nmcli.c:332 +#: ../clients/cli/nmcli.c:289 ../clients/cli/nmcli.c:310 +#: ../clients/cli/nmcli.c:329 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." msgstr "Ошибка: недопустимый аргумент «%s» для параметра «%s»." -#: ../clients/cli/nmcli.c:338 +#: ../clients/cli/nmcli.c:337 ../clients/cli/nmcli.c:348 #, c-format msgid "Error: fields for '%s' options are missing." msgstr "Ошибка: отсутствуют поля для параметров «%s»." -#: ../clients/cli/nmcli.c:359 +#: ../clients/cli/nmcli.c:374 #, c-format msgid "Error: '%s' is not a valid timeout for '%s' option." msgstr "Ошибка. Недопустимое время ожидания («%s») для параметра «%s»." -#: ../clients/cli/nmcli.c:367 +#: ../clients/cli/nmcli.c:382 #, c-format msgid "nmcli tool, version %s\n" msgstr "утилита nmcli, версия %s\n" -#: ../clients/cli/nmcli.c:374 +#: ../clients/cli/nmcli.c:389 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." msgstr "Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»." -#: ../clients/cli/nmcli.c:419 ../clients/cli/nmcli.c:426 +#: ../clients/cli/nmcli.c:433 ../clients/cli/nmcli.c:440 #, c-format msgid "Error: nmcli terminated by signal %s (%d)\n" msgstr "" -#: ../clients/cli/nmcli.c:524 +#: ../clients/cli/nmcli.c:538 msgid "Success" msgstr "Успешно" @@ -5286,407 +5225,197 @@ msgstr "Ошибка аутентификации: %s\n" msgid "Warning: polkit agent initialization failed: %s\n" msgstr "Предупреждение: не удалось инициализировать агент polkit: %s\n" -#: ../clients/cli/settings.c:820 +#: ../clients/cli/settings.c:874 #, c-format msgid "%d (key)" msgstr "%d (ключ)" -#: ../clients/cli/settings.c:822 +#: ../clients/cli/settings.c:876 #, c-format msgid "%d (passphrase)" msgstr "%d (парольная фраза)" -#: ../clients/cli/settings.c:825 ../clients/cli/settings.c:911 +#: ../clients/cli/settings.c:879 ../clients/cli/settings.c:968 #, c-format msgid "%d (unknown)" msgstr "%d (неизвестно)" -#: ../clients/cli/settings.c:854 +#: ../clients/cli/settings.c:911 msgid "0 (NONE)" msgstr "0 (НЕТ)" -#: ../clients/cli/settings.c:860 +#: ../clients/cli/settings.c:917 msgid "REORDER_HEADERS, " msgstr "УПОРЯДОЧИТЬ_ЗАГОЛОВКИ," -#: ../clients/cli/settings.c:862 +#: ../clients/cli/settings.c:919 msgid "GVRP, " msgstr "GVRP, " -#: ../clients/cli/settings.c:864 +#: ../clients/cli/settings.c:921 msgid "LOOSE_BINDING, " msgstr "LOOSE_BINDING, " -#: ../clients/cli/settings.c:866 +#: ../clients/cli/settings.c:923 msgid "MVRP, " msgstr "MVRP, " -#: ../clients/cli/settings.c:905 +#: ../clients/cli/settings.c:962 #, c-format msgid "%d (disabled)" msgstr "%d (отключено)" -#: ../clients/cli/settings.c:907 +#: ../clients/cli/settings.c:964 #, c-format msgid "%d (enabled, prefer public IP)" msgstr "%d (включено, предпочитая открытый IP)" -#: ../clients/cli/settings.c:909 +#: ../clients/cli/settings.c:966 #, c-format msgid "%d (enabled, prefer temporary IP)" msgstr "%d (включено, предпочитая временный IP)" -#: ../clients/cli/settings.c:924 +#: ../clients/cli/settings.c:981 #, c-format msgid "%d (no)" msgstr "%d (нет)" -#: ../clients/cli/settings.c:926 +#: ../clients/cli/settings.c:983 #, c-format msgid "%d (yes)" msgstr "%d (да)" -#: ../clients/cli/settings.c:929 ../clients/cli/settings.c:1340 -#: ../clients/cli/settings.c:1692 +#: ../clients/cli/settings.c:986 ../clients/cli/settings.c:2484 +#: ../clients/cli/settings.c:3609 #, c-format msgid "%d (default)" msgstr "%d (по умолчанию)" -#: ../clients/cli/settings.c:942 +#: ../clients/cli/settings.c:999 msgid "0 (none)" msgstr "0 (нет)" -#: ../clients/cli/settings.c:948 +#: ../clients/cli/settings.c:1005 msgid "agent-owned, " msgstr "под управлением агента," -#: ../clients/cli/settings.c:950 +#: ../clients/cli/settings.c:1007 msgid "not saved, " msgstr "не сохранено," -#: ../clients/cli/settings.c:952 +#: ../clients/cli/settings.c:1009 msgid "not required, " msgstr "не требуется," -#: ../clients/cli/settings.c:1001 ../clients/tui/nmt-mtu-entry.c:84 +#: ../clients/cli/settings.c:1058 ../clients/tui/nmt-mtu-entry.c:84 msgid "(default)" msgstr "(по умолчанию)" -#. ---------------------------------------------------------------------------- -#: ../clients/cli/settings.c:1093 ../clients/cli/settings.c:1150 -#: ../clients/cli/settings.c:1191 ../clients/cli/settings.c:1225 -#: ../clients/cli/settings.c:8301 -msgid "<hidden>" -msgstr "<hidden>" - -#: ../clients/cli/settings.c:1342 -#, c-format -msgid "%d (forever)" -msgstr "" - -#: ../clients/cli/settings.c:1389 -msgid "0 (disabled)" -msgstr "0 (отключено)" - -#: ../clients/cli/settings.c:1395 -msgid "enabled, " -msgstr "включено," - -#: ../clients/cli/settings.c:1397 -msgid "advertise, " -msgstr "объявление," - -#: ../clients/cli/settings.c:1399 -msgid "willing, " -msgstr "разрешение," - -#: ../clients/cli/settings.c:1427 -msgid "-1 (unset)" -msgstr "-1 (не задано)" - -#: ../clients/cli/settings.c:1559 ../clients/cli/settings.c:1887 -#: ../clients/cli/settings.c:2028 -msgid "auto" -msgstr "автоматически" - -#: ../clients/cli/settings.c:1572 ../clients/cli/settings.c:2059 -msgid "default" -msgstr "по умолчанию" - -#: ../clients/cli/settings.c:1694 -#, c-format -msgid "%d (off)" -msgstr "%d (выключено)" - -#: ../clients/cli/settings.c:1933 -#, c-format -msgid "" -"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or " -"'none'" -msgstr "" -"неверный параметр «%s»; используйте комбинацию [%s] или «ignore», «default» " -"или «none»" - -#: ../clients/cli/settings.c:1944 -msgid "'default' and 'ignore' are incompatible with other flags" -msgstr "«default» и «ignore» несовместимы с другими флагами" - -#: ../clients/cli/settings.c:1980 +#: ../clients/cli/settings.c:1124 #, c-format -msgid "invalid mode '%s', use one of %s" -msgstr "неверный режим «%s»; допустимые значения: %s" - -#: ../clients/cli/settings.c:2063 -#, c-format -msgid "always" -msgstr "всегда" +msgid "'%s' is not valid; use <option>=<value>" +msgstr "Недопустимое значение «%s». Используйте формат: <параметр>=<значение>" -#: ../clients/cli/settings.c:2163 ../clients/cli/settings.c:3618 -#: ../clients/cli/settings.c:4803 ../clients/cli/settings.c:5307 -#: ../libnm-core/nm-keyfile-reader.c:579 +#: ../clients/cli/settings.c:1158 #, c-format -msgid "invalid option '%s', use one of [%s]" -msgstr "недопустимый параметр «%s»; допустимые значения: [%s]" +msgid "index '%s' is not valid" +msgstr "Недопустимый индекс «%s»." -#: ../clients/cli/settings.c:2236 -#, c-format -msgid "invalid method '%s', use one of %s" -msgstr "" +#: ../clients/cli/settings.c:1163 ../clients/cli/settings.c:1188 +msgid "no item to remove" +msgstr "нечего удалять" -#: ../clients/cli/settings.c:2332 +#: ../clients/cli/settings.c:1167 ../clients/cli/settings.c:1192 #, c-format -msgid "Do you also want to set '%s' to '%s'? [yes]: " -msgstr "Присвоить «%s» значение «%s»? [да]:" +msgid "index '%d' is not in range <0-%d>" +msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>" -#: ../clients/cli/settings.c:2334 +#: ../clients/cli/settings.c:1207 #, c-format -msgid "Do you also want to clear '%s'? [yes]: " -msgstr "Очистить «%s»? [да]:" +msgid "invalid option '%s'" +msgstr "Недопустимый параметр «%s»" -#: ../clients/cli/settings.c:2510 -#, c-format -msgid "" -"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n" -msgstr "" -"Предупреждение: %s.%s имеет значение «%s», но будет игнорироваться в режиме " -"инфраструктуры\n" +#: ../clients/cli/settings.c:1209 +msgid "missing option" +msgstr "пропущен параметр" -#: ../clients/cli/settings.c:2529 +#: ../clients/cli/settings.c:1243 #, c-format -msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n" -msgstr "Предупреждение: %s.%s требует удаления параметров ipv4 и ipv6\n" - -#: ../clients/cli/settings.c:2531 -msgid "Do you want to remove them? [yes] " -msgstr "Хотите их удалить? [да]" +msgid "'%s' is not a valid MAC" +msgstr "Недействительный MAC-адрес: «%s»" -#: ../clients/cli/settings.c:2677 ../clients/cli/settings.c:3072 -#: ../clients/cli/settings.c:5508 +#: ../clients/cli/settings.c:1273 ../clients/cli/settings.c:1533 +#: ../clients/cli/settings.c:5650 #, c-format msgid "'%s' is not valid" msgstr "Недопустимое значение «%s»" -#: ../clients/cli/settings.c:2700 +#: ../clients/cli/settings.c:1296 #, c-format msgid "'%d' is not valid; use <%d-%d>" msgstr "«%d» выходит за пределы диапазона <%d-%d>" -#: ../clients/cli/settings.c:2722 +#: ../clients/cli/settings.c:1318 #, c-format msgid "'%lld' is not valid; use <%lld-%lld>" msgstr "Недопустимое значение «%lld». Используйте <%lld-%lld>" -#: ../clients/cli/settings.c:2744 +#: ../clients/cli/settings.c:1340 #, c-format msgid "'%u' is not valid; use <%u-%u>" msgstr "«%u» выходит за пределы <%u-%u>" -#: ../clients/cli/settings.c:2783 +#: ../clients/cli/settings.c:1379 #, c-format msgid "'%u' flags are not valid; use combination of %s" msgstr "Неверные флаги «%u». Используйте комбинацию %s" -#: ../clients/cli/settings.c:2850 -#, c-format -msgid "'%s' is not valid; use <option>=<value>" -msgstr "Недопустимое значение «%s». Используйте формат: <параметр>=<значение>" - -#: ../clients/cli/settings.c:2884 -#, c-format -msgid "index '%s' is not valid" -msgstr "Недопустимый индекс «%s»." - -#: ../clients/cli/settings.c:2889 ../clients/cli/settings.c:2914 -msgid "no item to remove" -msgstr "нечего удалять" - -#: ../clients/cli/settings.c:2893 ../clients/cli/settings.c:2918 -#, c-format -msgid "index '%d' is not in range <0-%d>" -msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>" - -#: ../clients/cli/settings.c:2933 -#, c-format -msgid "invalid option '%s'" -msgstr "Недопустимый параметр «%s»" - -#: ../clients/cli/settings.c:2935 -msgid "missing option" -msgstr "пропущен параметр" - -#: ../clients/cli/settings.c:2962 ../clients/cli/settings.c:2982 -#: ../clients/cli/settings.c:3002 ../clients/cli/settings.c:3022 +#: ../clients/cli/settings.c:1423 ../clients/cli/settings.c:1443 +#: ../clients/cli/settings.c:1463 ../clients/cli/settings.c:1483 #, c-format msgid "'%s' is not a valid number (or out of range)" msgstr "Число выходит за пределы диапазона или определено неверно: «%s»" -#: ../clients/cli/settings.c:3056 +#: ../clients/cli/settings.c:1517 #, c-format msgid "'%s' is not a valid value; use -1, 0 or 1" msgstr "Недопустимое значение «%s». Используйте -1, 0 или 1." -#: ../clients/cli/settings.c:3089 +#: ../clients/cli/settings.c:1550 #, c-format msgid "'%s' is not a valid Ethernet MAC" msgstr "Недействительный MAC Ethernet: «%s»" -#: ../clients/cli/settings.c:3148 +#: ../clients/cli/settings.c:1609 #, c-format msgid "'%s' is not a valid flag number; use <0-%d>" msgstr "Неверный номер флага «%s». Используйте <0-%d>" -#: ../clients/cli/settings.c:3160 +#: ../clients/cli/settings.c:1621 #, c-format msgid "Warning: '%s' sum is higher than all flags => all flags set\n" msgstr "" "Предупреждение: сумма «%s» превышает значения всех флагов => установлены " "все флаги\n" -#: ../clients/cli/settings.c:3211 +#: ../clients/cli/settings.c:1672 #, c-format msgid "'%s' is not a valid hex character" msgstr "Неверное шестнадцатеричное значение: «%s»" -#: ../clients/cli/settings.c:3241 -#, c-format -msgid "'%s' is not a valid MAC" -msgstr "Недействительный MAC-адрес: «%s»" - -#. Don't allow setting type unless the connection is brand new. -#. * Just because it's a bad idea and the user wouldn't probably want that. -#. * No technical reason, really. -#. * Also, using uuid to see if the connection is brand new is a bit -#. * hacky: we can not see if the type is already set, because -#. * nmc_setting_set_property() is called only after the property -#. * we're setting (type) has been removed. -#: ../clients/cli/settings.c:3269 -#, fuzzy, c-format -msgid "Can not change the connection type" -msgstr "Выберите тип соединения:" - -#: ../clients/cli/settings.c:3293 ../libnm-core/nm-setting-connection.c:887 -#: ../libnm-util/nm-setting-connection.c:791 -#, c-format -msgid "'%s' is not a valid UUID" -msgstr "Недействительный UUID: «%s»" - -#: ../clients/cli/settings.c:3360 -#, c-format -msgid "the property doesn't contain permission '%s'" -msgstr "свойство не содержит разрешение «%s»" - -#: ../clients/cli/settings.c:3372 -msgid "" -"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" -"Записи могут разделяться пробелом или запятой.\n" -"\n" -"Пример: alice bob charlie\n" - -#: ../clients/cli/settings.c:3391 -#, c-format -msgid "'%s' is not valid master; use ifname or connection UUID" -msgstr "" -"Недействительный мастер: «%s». Используйте имя интерфейса или UUID " -"соединения." - -#: ../clients/cli/settings.c:3436 -#, c-format -msgid "Warning: %s is not an UUID of any existing connection profile\n" -msgstr "Предупреждение: %s не содержит UUID существующего профиля соединения\n" - -#: ../clients/cli/settings.c:3440 ../clients/cli/settings.c:3455 -#, c-format -msgid "'%s' is not a VPN connection profile" -msgstr "«%s» не является профилем соединения VPN" - -#: ../clients/cli/settings.c:3448 -#, c-format -msgid "'%s' is not a name of any exiting profile" -msgstr "«%s» не содержит имя существующего профиля" - -#: ../clients/cli/settings.c:3482 -#, c-format -msgid "the value '%s' is not a valid UUID" -msgstr "«%s» не содержит действительный UUID" - -#: ../clients/cli/settings.c:3489 -#, c-format -msgid "the property doesn't contain UUID '%s'" -msgstr "свойство не содержит UUID «%s»" - -#: ../clients/cli/settings.c:3501 -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 "" -"Укажите вторичные соединения, которые должны быть активированы при активации " -"этого соединения.\n" -"Соединение можно указать с помощью UUID или идентификатора (названия).\n" -"nmcli осуществляет прозрачное преобразование названий в UUID. \n" -"В настоящее время NetworkManager может использовать только соединения VPN\n" -"в качестве вторичных соединений. Для перечисления записей используйте " -"запятые или пробелы.\n" -"\n" -"Пример: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n" - -#: ../clients/cli/settings.c:3568 -msgid "" -"Enter a value which indicates whether the connection is subject to a data\n" -"quota, usage costs or other limitations. Accepted options are:\n" -"'true','yes','on' to set the connection as metered\n" -"'false','no','off' to set the connection as not metered\n" -"'unknown' to let NetworkManager choose a value using some heuristics\n" -msgstr "" -"Введите значение, которое будет диктовать, должно ли соединение " -"подвергаться\n" -"квотированию данных, лимитированию стоимости или другим ограничениям.\n" -"Доступные параметры:\n" -"«true», «yes», «on» — включить лимитное подключение\n" -"«false», «no», «off» — подключить как безлимитное\n" -"«unknown» — позволить NetworkManager выбирать значение с помощью " -"эвристических методов\n" +#. ---------------------------------------------------------------------------- +#: ../clients/cli/settings.c:1766 ../clients/cli/settings.c:1823 +#: ../clients/cli/settings.c:1864 ../clients/cli/settings.c:1898 +#: ../clients/cli/settings.c:8654 +msgid "<hidden>" +msgstr "<hidden>" -#: ../clients/cli/settings.c:3717 +#: ../clients/cli/settings.c:2004 #, c-format msgid "the property doesn't contain EAP method '%s'" msgstr "свойство не содержит метод EAP «%s»" -#: ../clients/cli/settings.c:3734 +#: ../clients/cli/settings.c:2021 msgid "" "Enter file path to CA certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -5700,12 +5429,12 @@ msgstr "" "помощью простого массива данных.\n" "Пример: /home/cimrman/cacert.crt\n" -#: ../clients/cli/settings.c:3753 +#: ../clients/cli/settings.c:2040 #, c-format msgid "the property doesn't contain alternative subject match '%s'" msgstr "свойство не содержит альтернативное соответствие темы «%s»" -#: ../clients/cli/settings.c:3769 +#: ../clients/cli/settings.c:2056 msgid "" "Enter file path to client certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -5718,7 +5447,7 @@ msgstr "" "помощью простого массива данных.\n" "Пример: /home/cimrman/jara.crt\n" -#: ../clients/cli/settings.c:3781 +#: ../clients/cli/settings.c:2068 msgid "" "Enter file path to CA certificate for inner authentication (optionally " "prefixed\n" @@ -5735,12 +5464,12 @@ msgstr "" "помощью простого массива данных.\n" "Пример: /home/cimrman/ca-zweite-phase.crt\n" -#: ../clients/cli/settings.c:3801 +#: ../clients/cli/settings.c:2088 #, c-format msgid "the property doesn't contain \"phase2\" alternative subject match '%s'" msgstr "свойство не содержит альтернативное соответствие темы «%s» для фазы 2" -#: ../clients/cli/settings.c:3817 +#: ../clients/cli/settings.c:2104 msgid "" "Enter file path to client certificate for inner authentication (optionally " "prefixed\n" @@ -5756,7 +5485,7 @@ msgstr "" "помощью простого массива данных.\n" "Пример: /home/cimrman/jara-zweite-phase.crt\n" -#: ../clients/cli/settings.c:3837 +#: ../clients/cli/settings.c:2124 msgid "" "Enter path to a private key and the key password (if not set yet):\n" " [file://]<file path> [<password>]\n" @@ -5769,7 +5498,7 @@ msgstr "" "помощью простого массива данных.\n" "Пример: /home/cimrman/jara-priv-key Dardanely\n" -#: ../clients/cli/settings.c:3908 +#: ../clients/cli/settings.c:2195 msgid "" "Enter bytes as a list of hexadecimal values.\n" "Two formats are accepted:\n" @@ -5790,7 +5519,12 @@ msgstr "" "Примеры: ab0455a6ea3a74C2\n" " ab 4 55 0xa6 ea 3a 74 C2\n" -#: ../clients/cli/settings.c:4029 +#: ../clients/cli/settings.c:2243 +#, fuzzy, c-format +msgid "invalid option '%s', use a combination of [%s]" +msgstr "недопустимый параметр «%s»; допустимые значения: [%s]" + +#: ../clients/cli/settings.c:2411 #, c-format msgid "" "Enter a list of bonding options formatted as:\n" @@ -5821,34 +5555,231 @@ msgstr "" "\n" "Пример: mode=2,miimon=120\n" -#: ../clients/cli/settings.c:4060 +#: ../clients/cli/settings.c:2486 +#, c-format +msgid "%d (forever)" +msgstr "" + +#. Don't allow setting type unless the connection is brand new. +#. * Just because it's a bad idea and the user wouldn't probably want that. +#. * No technical reason, really. +#. * Also, using uuid to see if the connection is brand new is a bit +#. * hacky: we can not see if the type is already set, because +#. * nmc_setting_set_property() is called only after the property +#. * we're setting (type) has been removed. +#: ../clients/cli/settings.c:2542 +#, fuzzy, c-format +msgid "Can not change the connection type" +msgstr "Выберите тип соединения:" + +#: ../clients/cli/settings.c:2566 ../libnm-core/nm-setting-connection.c:887 +#: ../libnm-util/nm-setting-connection.c:791 +#, c-format +msgid "'%s' is not a valid UUID" +msgstr "Недействительный UUID: «%s»" + +#: ../clients/cli/settings.c:2633 +#, c-format +msgid "the property doesn't contain permission '%s'" +msgstr "свойство не содержит разрешение «%s»" + +#: ../clients/cli/settings.c:2645 +msgid "" +"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" +"Записи могут разделяться пробелом или запятой.\n" +"\n" +"Пример: alice bob charlie\n" + +#: ../clients/cli/settings.c:2664 +#, c-format +msgid "'%s' is not valid master; use ifname or connection UUID" +msgstr "" +"Недействительный мастер: «%s». Используйте имя интерфейса или UUID " +"соединения." + +#: ../clients/cli/settings.c:2709 +#, c-format +msgid "Warning: %s is not an UUID of any existing connection profile\n" +msgstr "Предупреждение: %s не содержит UUID существующего профиля соединения\n" + +#: ../clients/cli/settings.c:2713 ../clients/cli/settings.c:2728 +#, c-format +msgid "'%s' is not a VPN connection profile" +msgstr "«%s» не является профилем соединения VPN" + +#: ../clients/cli/settings.c:2721 +#, c-format +msgid "'%s' is not a name of any exiting profile" +msgstr "«%s» не содержит имя существующего профиля" + +#: ../clients/cli/settings.c:2755 +#, c-format +msgid "the value '%s' is not a valid UUID" +msgstr "«%s» не содержит действительный UUID" + +#: ../clients/cli/settings.c:2762 +#, c-format +msgid "the property doesn't contain UUID '%s'" +msgstr "свойство не содержит UUID «%s»" + +#: ../clients/cli/settings.c:2774 +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 "" +"Укажите вторичные соединения, которые должны быть активированы при активации " +"этого соединения.\n" +"Соединение можно указать с помощью UUID или идентификатора (названия).\n" +"nmcli осуществляет прозрачное преобразование названий в UUID. \n" +"В настоящее время NetworkManager может использовать только соединения VPN\n" +"в качестве вторичных соединений. Для перечисления записей используйте " +"запятые или пробелы.\n" +"\n" +"Пример: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n" + +#: ../clients/cli/settings.c:2841 +msgid "" +"Enter a value which indicates whether the connection is subject to a data\n" +"quota, usage costs or other limitations. Accepted options are:\n" +"'true','yes','on' to set the connection as metered\n" +"'false','no','off' to set the connection as not metered\n" +"'unknown' to let NetworkManager choose a value using some heuristics\n" +msgstr "" +"Введите значение, которое будет диктовать, должно ли соединение " +"подвергаться\n" +"квотированию данных, лимитированию стоимости или другим ограничениям.\n" +"Доступные параметры:\n" +"«true», «yes», «on» — включить лимитное подключение\n" +"«false», «no», «off» — подключить как безлимитное\n" +"«unknown» — позволить NetworkManager выбирать значение с помощью " +"эвристических методов\n" + +#: ../clients/cli/settings.c:2890 ../clients/cli/settings.c:4309 +#: ../clients/cli/settings.c:4355 ../clients/cli/settings.c:4392 +#: ../clients/cli/settings.c:4451 ../clients/cli/settings.c:5400 +#: ../libnm-core/nm-keyfile-reader.c:612 +#, c-format +msgid "invalid option '%s', use one of [%s]" +msgstr "недопустимый параметр «%s»; допустимые значения: [%s]" + +#: ../clients/cli/settings.c:2912 +msgid "0 (disabled)" +msgstr "0 (отключено)" + +#: ../clients/cli/settings.c:2918 +msgid "enabled, " +msgstr "включено," + +#: ../clients/cli/settings.c:2920 +msgid "advertise, " +msgstr "объявление," + +#: ../clients/cli/settings.c:2922 +msgid "willing, " +msgstr "разрешение," + +#: ../clients/cli/settings.c:2950 +msgid "-1 (unset)" +msgstr "-1 (не задано)" + +#: ../clients/cli/settings.c:3060 +#, c-format +msgid "'%s' is not a valid DCB flag" +msgstr "«%s» не содержит допустимый флаг DCB" + +#: ../clients/cli/settings.c:3083 +#, c-format +msgid "'%s' is not a DCB app priority" +msgstr "«%s» не содержит приоритет приложения DCB" + +#: ../clients/cli/settings.c:3109 +msgid "must contain 8 comma-separated numbers" +msgstr "должен содержать 8 чисел, разделенных запятой" + +#: ../clients/cli/settings.c:3126 +#, c-format +msgid "'%s' not a number between 0 and %u (inclusive) or %u" +msgstr "«%s» не является числом в диапазоне от 0 до %u включительно или %u" + +#: ../clients/cli/settings.c:3129 +#, c-format +msgid "'%s' not a number between 0 and %u (inclusive)" +msgstr "«%s» не является числом в диапазоне от 0 до %u включительно" + +#: ../clients/cli/settings.c:3151 +#, c-format +msgid "" +"Warning: changes will have no effect until '%s' includes 1 (enabled)\n" +"\n" +msgstr "" +"Предупреждение. Изменения вступят в силу, только когда «%s» будет равно 1 " +"(включено)\n" +"\n" + +#: ../clients/cli/settings.c:3204 +#, c-format +msgid "bandwidth percentages must total 100%%" +msgstr "сумма процентных частей пропускной способности должна быть равна 100%%" + +#: ../clients/cli/settings.c:3306 ../clients/cli/settings.c:3312 +msgid "SIM operator ID must be a 5 or 6 number MCCMNC code" +msgstr "Идентификатор оператора SIM должен содержать код MCCMNC из 5-6 цифр" + +#: ../clients/cli/settings.c:3335 #, c-format msgid "'%s' is not a valid InfiniBand MAC" msgstr "Недействительный MAC InfiniBand: «%s»" -#: ../clients/cli/settings.c:4097 +#: ../clients/cli/settings.c:3372 #, c-format msgid "'%s' is not a valid IBoIP P_Key" msgstr "Недопустимое значение IBoIP P_Key: «%s»" -#: ../clients/cli/settings.c:4128 +#: ../clients/cli/settings.c:3389 ../clients/cli/settings.c:5007 +#: ../clients/cli/settings.c:5256 +msgid "auto" +msgstr "автоматически" + +#: ../clients/cli/settings.c:3402 ../clients/cli/settings.c:5287 +msgid "default" +msgstr "по умолчанию" + +#: ../clients/cli/settings.c:3451 #, c-format -msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])" -msgstr "" -"Недействительное значение «%s». Допустимый формат: ip[/префикс] " -"[следующий_переход] [метрика])" +msgid "invalid mode '%s', use one of %s" +msgstr "неверный режим «%s»; допустимые значения: %s" -#: ../clients/cli/settings.c:4176 ../clients/cli/settings.c:4195 +#: ../clients/cli/settings.c:3611 +#, c-format +msgid "%d (off)" +msgstr "%d (выключено)" + +#: ../clients/cli/settings.c:3652 ../clients/cli/settings.c:3671 #, c-format msgid "invalid IPv4 address '%s'" msgstr "недопустимый адрес IPv4: «%s»" -#: ../clients/cli/settings.c:4201 ../clients/cli/settings.c:4509 +#: ../clients/cli/settings.c:3677 ../clients/cli/settings.c:4015 #, c-format msgid "the property doesn't contain DNS server '%s'" msgstr "свойство не содержит DNS-сервер «%s»" -#: ../clients/cli/settings.c:4213 +#: ../clients/cli/settings.c:3689 msgid "" "Enter a list of IPv4 addresses of DNS servers.\n" "\n" @@ -5858,22 +5789,22 @@ msgstr "" "\n" "Пример: 8.8.8.8, 8.8.4.4\n" -#: ../clients/cli/settings.c:4249 ../clients/cli/settings.c:4563 +#: ../clients/cli/settings.c:3725 ../clients/cli/settings.c:4069 #, c-format msgid "the property doesn't contain DNS search domain '%s'" msgstr "свойство не содержит домен поиска DNS «%s»" -#: ../clients/cli/settings.c:4287 ../clients/cli/settings.c:4601 +#: ../clients/cli/settings.c:3763 ../clients/cli/settings.c:4107 #, c-format msgid "the property doesn't contain DNS option '%s'" msgstr "свойство не содержит параметра DNS «%s»" -#: ../clients/cli/settings.c:4341 ../clients/cli/settings.c:4654 +#: ../clients/cli/settings.c:3817 ../clients/cli/settings.c:4160 #, c-format msgid "the property doesn't contain IP address '%s'" msgstr "свойство не содержит IP-адрес «%s»" -#: ../clients/cli/settings.c:4354 +#: ../clients/cli/settings.c:3830 msgid "" "Enter a list of IPv4 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5887,17 +5818,17 @@ msgstr "" "\n" "Пример: 92.168.1.5/24 192.168.1.1, 10.0.0.11/24\n" -#: ../clients/cli/settings.c:4370 ../clients/cli/settings.c:4683 +#: ../clients/cli/settings.c:3846 ../clients/cli/settings.c:4189 #, c-format msgid "invalid gateway address '%s'" msgstr "недопустимый адрес шлюза «%s»" -#: ../clients/cli/settings.c:4425 ../clients/cli/settings.c:4738 +#: ../clients/cli/settings.c:3901 ../clients/cli/settings.c:4244 #, c-format msgid "the property doesn't contain route '%s'" msgstr "свойство не содержит маршрут «%s»" -#: ../clients/cli/settings.c:4438 +#: ../clients/cli/settings.c:3914 msgid "" "Enter a list of IPv4 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5920,12 +5851,12 @@ msgstr "" "Примеры: 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" -#: ../clients/cli/settings.c:4484 ../clients/cli/settings.c:4503 +#: ../clients/cli/settings.c:3990 ../clients/cli/settings.c:4009 #, c-format msgid "invalid IPv6 address '%s'" msgstr "недопустимый адрес IPv6: «%s»" -#: ../clients/cli/settings.c:4521 +#: ../clients/cli/settings.c:4027 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 " @@ -5944,7 +5875,7 @@ msgstr "" "\n" "Пример: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n" -#: ../clients/cli/settings.c:4667 +#: ../clients/cli/settings.c:4173 msgid "" "Enter a list of IPv6 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5959,7 +5890,7 @@ msgstr "" "Пример: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, " "1050:0:0:0:5:600:300c:326b\n" -#: ../clients/cli/settings.c:4751 +#: ../clients/cli/settings.c:4257 msgid "" "Enter a list of IPv6 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5984,28 +5915,33 @@ msgstr "" "db8:beef::3 2\n" " abbe::/64 55\n" -#: ../clients/cli/settings.c:4768 ../libnm-core/nm-setting-gsm.c:363 +#: ../clients/cli/settings.c:4274 ../libnm-core/nm-setting-gsm.c:381 #: ../libnm-util/nm-setting-gsm.c:364 #, c-format msgid "'%s' is not a number" msgstr " «%s» не является числом" -#: ../clients/cli/settings.c:4775 +#: ../clients/cli/settings.c:4281 #, c-format msgid "'%s' is not valid; use 0, 1, or 2" msgstr "Недопустимое значение «%s». Используйте 0, 1 или 2." -#: ../clients/cli/settings.c:4822 +#: ../clients/cli/settings.c:4494 #, c-format msgid "'%s' is not a valid channel; use <1-13>" msgstr "Недопустимое значение «%s». Используйте значения от 1 до 13." -#: ../clients/cli/settings.c:4859 +#: ../clients/cli/settings.c:4563 +#, c-format +msgid "invalid method '%s', use one of %s" +msgstr "" + +#: ../clients/cli/settings.c:4628 #, c-format msgid "'%s' is not valid; use [e, o, n]" msgstr "Неверное значение «%s». Допустимые значения: [e, o, n]." -#: ../clients/cli/settings.c:4887 +#: ../clients/cli/settings.c:4658 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 " @@ -6021,16 +5957,21 @@ msgstr "" "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" " set team.config /etc/my-team.conf\n" -#: ../clients/cli/settings.c:4927 +#: ../clients/cli/settings.c:4710 +#, c-format +msgid "invalid option '%s', use '%s' or '%s'" +msgstr "недопустимый параметр «%s»; используйте «%s» или «%s»" + +#: ../clients/cli/settings.c:4781 msgid "no priority to remove" msgstr "нет приоритета для удаления" -#: ../clients/cli/settings.c:4931 +#: ../clients/cli/settings.c:4785 #, c-format msgid "index '%d' is not in the range of <0-%d>" msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>" -#: ../clients/cli/settings.c:4970 +#: ../clients/cli/settings.c:4824 #, c-format msgid "" "Warning: only one mapping at a time is supported; taking the first one (%s)\n" @@ -6038,18 +5979,31 @@ msgstr "" "Предупреждение: допускается использование только одного сопоставления. Будет " "выбрано первое из них: (%s)\n" -#: ../clients/cli/settings.c:4977 +#: ../clients/cli/settings.c:4831 #, c-format msgid "the property doesn't contain mapping '%s'" msgstr "свойство не содержит соответствие «%s»" -#: ../clients/cli/settings.c:5025 +#: ../clients/cli/settings.c:4910 #, c-format msgid "'%s' cannot be empty" msgstr "«%s» не может быть пустым" -#: ../clients/cli/settings.c:5100 ../clients/cli/settings.c:5267 -#: ../libnm-core/nm-setting-wired.c:662 ../libnm-core/nm-setting-wireless.c:857 +#: ../clients/cli/settings.c:5053 +#, c-format +msgid "" +"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or " +"'none'" +msgstr "" +"неверный параметр «%s»; используйте комбинацию [%s] или «ignore», «default» " +"или «none»" + +#: ../clients/cli/settings.c:5064 +msgid "'default' and 'ignore' are incompatible with other flags" +msgstr "«default» и «ignore» несовместимы с другими флагами" + +#: ../clients/cli/settings.c:5115 ../clients/cli/settings.c:5360 +#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857 #: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646 #: ../libnm-util/nm-setting-wireless.c:859 #: ../libnm-util/nm-setting-wireless.c:873 @@ -6057,17 +6011,17 @@ msgstr "«%s» не может быть пустым" msgid "'%s' is not a valid MAC address" msgstr "Недействительный MAC-адрес: «%s»" -#: ../clients/cli/settings.c:5106 ../clients/cli/settings.c:5273 +#: ../clients/cli/settings.c:5121 ../clients/cli/settings.c:5366 #, c-format msgid "the property doesn't contain MAC address '%s'" msgstr "свойство не содержит MAC-адрес «%s»" -#: ../clients/cli/settings.c:5125 +#: ../clients/cli/settings.c:5140 #, c-format msgid "'%s' is not valid; 2 or 3 strings should be provided" msgstr "Недопустимое значение: «%s». Необходимо указать 2 или 3 строки." -#: ../clients/cli/settings.c:5139 +#: ../clients/cli/settings.c:5154 msgid "" "Enter a list of subchannels (comma or space separated).\n" "\n" @@ -6077,12 +6031,12 @@ msgstr "" "\n" "Пример: 0.0.0e20 0.0.0e21 0.0.0e22\n" -#: ../clients/cli/settings.c:5161 +#: ../clients/cli/settings.c:5176 #, c-format msgid "'%s' string value should consist of 1 - 199 characters" msgstr "строка «%s» может содержать от 1 до 199 знаков" -#: ../clients/cli/settings.c:5193 +#: ../clients/cli/settings.c:5208 #, c-format msgid "" "Enter a list of S/390 options formatted as:\n" @@ -6093,54 +6047,59 @@ msgstr "" " параметр = <значение>, параметр = <значение>,...\n" "Допустимые параметры: %s\n" -#: ../clients/cli/settings.c:5239 +#: ../clients/cli/settings.c:5291 +#, c-format +msgid "always" +msgstr "всегда" + +#: ../clients/cli/settings.c:5332 #, c-format msgid "'%s' is not a valid channel" msgstr "Недопустимый канал «%s»." -#: ../clients/cli/settings.c:5245 +#: ../clients/cli/settings.c:5338 #, c-format msgid "'%ld' is not a valid channel" msgstr "Недопустимый канал «%ld»." -#: ../clients/cli/settings.c:5339 +#: ../clients/cli/settings.c:5432 #, c-format msgid "invalid option '%s', use 'default', 'never' or 'always'" msgstr "" "недопустимый параметр «%s»; используйте «default», «never» или «always»" -#: ../clients/cli/settings.c:5400 ../clients/cli/settings.c:5439 -#: ../clients/cli/settings.c:5478 +#: ../clients/cli/settings.c:5542 ../clients/cli/settings.c:5581 +#: ../clients/cli/settings.c:5620 #, c-format msgid "the property doesn't contain protocol '%s'" msgstr "свойство не содержит протокол «%s»" -#: ../clients/cli/settings.c:5517 +#: ../clients/cli/settings.c:5659 #, c-format msgid "" "'%s' not compatible with %s '%s', please change the key or set the right %s " "first." msgstr "«%s» несовместим с %s «%s». Измените ключ или корректно настройте %s" -#: ../clients/cli/settings.c:5525 +#: ../clients/cli/settings.c:5667 #, c-format msgid "WEP key is guessed to be of '%s'\n" msgstr "Ключ WEP определен как «%s»\n" -#: ../clients/cli/settings.c:5527 +#: ../clients/cli/settings.c:5669 #, c-format msgid "WEP key index set to '%d'\n" msgstr "Индекс ключа WEP определен как «%d»\n" -#: ../clients/cli/settings.c:5550 +#: ../clients/cli/settings.c:5692 #, c-format msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]" msgstr "" "«%s» может иметь одно из нескольких значений: [0 (неизвестно), 1 (ключ), 2 " "(парольная фраза)]" -#: ../clients/cli/settings.c:5566 ../clients/cli/settings.c:5569 -#: ../clients/cli/settings.c:5572 ../clients/cli/settings.c:5575 +#: ../clients/cli/settings.c:5708 ../clients/cli/settings.c:5711 +#: ../clients/cli/settings.c:5714 ../clients/cli/settings.c:5717 #, c-format msgid "" "Warning: '%s' is not compatible with '%s' type, please change or delete the " @@ -6149,7 +6108,7 @@ msgstr "" "Предупреждение: «%s» несовместим с типом «%s». Измените его или удалите " "ключ.\n" -#: ../clients/cli/settings.c:5588 +#: ../clients/cli/settings.c:5730 #, c-format msgid "" "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, " @@ -6158,81 +6117,60 @@ msgstr "" "Укажите тип ключей WEP. Возможные значения: 0 (неизвестно), 1 (ключ), 2 " "(парольная фраза).\n" -#: ../clients/cli/settings.c:5601 +#: ../clients/cli/settings.c:5743 #, c-format msgid "'%s' is not a valid PSK" msgstr "«%s» не является действительным PSK" -#: ../clients/cli/settings.c:5645 -#, c-format -msgid "'%s' is not a valid DCB flag" -msgstr "«%s» не содержит допустимый флаг DCB" - -#: ../clients/cli/settings.c:5668 -#, c-format -msgid "'%s' is not a DCB app priority" -msgstr "«%s» не содержит приоритет приложения DCB" - -#: ../clients/cli/settings.c:5694 -msgid "must contain 8 comma-separated numbers" -msgstr "должен содержать 8 чисел, разделенных запятой" - -#: ../clients/cli/settings.c:5711 +#: ../clients/cli/settings.c:5820 #, c-format -msgid "'%s' not a number between 0 and %u (inclusive) or %u" -msgstr "«%s» не является числом в диапазоне от 0 до %u включительно или %u" +msgid "Do you also want to set '%s' to '%s'? [yes]: " +msgstr "Присвоить «%s» значение «%s»? [да]:" -#: ../clients/cli/settings.c:5714 +#: ../clients/cli/settings.c:5822 #, c-format -msgid "'%s' not a number between 0 and %u (inclusive)" -msgstr "«%s» не является числом в диапазоне от 0 до %u включительно" +msgid "Do you also want to clear '%s'? [yes]: " +msgstr "Очистить «%s»? [да]:" -#: ../clients/cli/settings.c:5736 +#: ../clients/cli/settings.c:5998 #, c-format msgid "" -"Warning: changes will have no effect until '%s' includes 1 (enabled)\n" -"\n" +"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n" msgstr "" -"Предупреждение. Изменения вступят в силу, только когда «%s» будет равно 1 " -"(включено)\n" -"\n" +"Предупреждение: %s.%s имеет значение «%s», но будет игнорироваться в режиме " +"инфраструктуры\n" -#: ../clients/cli/settings.c:5789 +#: ../clients/cli/settings.c:6017 #, c-format -msgid "bandwidth percentages must total 100%%" -msgstr "сумма процентных частей пропускной способности должна быть равна 100%%" - -#: ../clients/cli/settings.c:5875 ../clients/cli/settings.c:5881 -msgid "SIM operator ID must be a 5 or 6 number MCCMNC code" -msgstr "Идентификатор оператора SIM должен содержать код MCCMNC из 5-6 цифр" +msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n" +msgstr "Предупреждение: %s.%s требует удаления параметров ipv4 и ipv6\n" -#: ../clients/cli/settings.c:5924 -#, c-format -msgid "invalid option '%s', use '%s' or '%s'" -msgstr "недопустимый параметр «%s»; используйте «%s» или «%s»" +#: ../clients/cli/settings.c:6019 +msgid "Do you want to remove them? [yes] " +msgstr "Хотите их удалить? [да]" -#: ../clients/cli/settings.c:8049 +#: ../clients/cli/settings.c:8402 msgid "don't know how to get the property value" msgstr "неизвестно, как получить значение свойства" -#: ../clients/cli/settings.c:8102 ../clients/cli/settings.c:8142 +#: ../clients/cli/settings.c:8455 ../clients/cli/settings.c:8495 msgid "the property can't be changed" msgstr "свойство не может быть изменено" -#: ../clients/cli/settings.c:8247 +#: ../clients/cli/settings.c:8600 msgid "[NM property description]" msgstr "[описание свойства NM]" -#: ../clients/cli/settings.c:8252 +#: ../clients/cli/settings.c:8605 msgid "[nmcli specific description]" msgstr "[описание в nmcli]" -#: ../clients/cli/utils.c:147 +#: ../clients/cli/utils.c:211 #, c-format msgid "Error: Argument '%s' was expected, but '%s' provided." msgstr "Ошибка. Ожидается аргумент «%s», а получен «%s»." -#: ../clients/cli/utils.c:150 +#: ../clients/cli/utils.c:214 #, c-format msgid "Error: Unexpected argument '%s'" msgstr "Ошибка. Непредвиденный аргумент: «%s»" @@ -6240,51 +6178,41 @@ msgstr "Ошибка. Непредвиденный аргумент: «%s»" #. Translators: the first %s is the partial value entered by #. * the user, the second %s a list of compatible values. #. -#: ../clients/cli/utils.c:490 ../clients/cli/utils.c:521 +#: ../clients/cli/utils.c:554 ../clients/cli/utils.c:585 #, c-format msgid "'%s' is ambiguous (%s)" msgstr "Неоднозначное значение: «%s» (%s)" -#: ../clients/cli/utils.c:500 +#: ../clients/cli/utils.c:564 #, c-format msgid "'%s' is not valid; use [%s] or [%s]" msgstr "Недопустимое значение «%s». Ожидается [%s] или [%s]" -#: ../clients/cli/utils.c:533 +#: ../clients/cli/utils.c:597 #, c-format msgid "'%s' is not valid; use [%s], [%s] or [%s]" msgstr "Недопустимое значение «%s». Ожидается [%s], [%s] или [%s]" -#: ../clients/cli/utils.c:632 +#: ../clients/cli/utils.c:696 #, c-format msgid "'%s' is ambiguous (%s x %s)" msgstr "Неоднозначное значение «%s» (%s x %s)" -#: ../clients/cli/utils.c:644 +#: ../clients/cli/utils.c:708 #, c-format msgid "missing name, try one of [%s]" msgstr "имя не определено, попробуйте выбрать значение из [%s]" -#: ../clients/cli/utils.c:891 +#: ../clients/cli/utils.c:955 #, c-format msgid "field '%s' has to be alone" msgstr "поле «%s» должно быть единственным" -#: ../clients/cli/utils.c:894 +#: ../clients/cli/utils.c:958 #, c-format msgid "invalid field '%s'; allowed fields: %s" msgstr "неверное поле «%s»; допустимые поля: %s" -#: ../clients/cli/utils.c:951 -msgid "Option '--terse' requires specifying '--fields'" -msgstr "Параметр «--terse» требует указания «--fields»" - -#: ../clients/cli/utils.c:955 -#, c-format -msgid "Option '--terse' requires specific '--fields' option values , not '%s'" -msgstr "" -"Параметр «--terse» требует определённых значений «--fields», но не «%s»" - #: ../clients/common/nm-polkit-listener.c:212 msgid "An authentication session is already underway." msgstr "Сеанс аутентификации уже выполняется." @@ -6294,8 +6222,8 @@ msgstr "Сеанс аутентификации уже выполняется." #: ../clients/common/nm-secret-agent-simple.c:303 #: ../clients/common/nm-secret-agent-simple.c:342 #: ../clients/common/nm-secret-agent-simple.c:504 -#: ../clients/common/nm-secret-agent-simple.c:519 -#: ../clients/common/nm-secret-agent-simple.c:537 +#: ../clients/common/nm-secret-agent-simple.c:538 +#: ../clients/common/nm-secret-agent-simple.c:556 #: ../clients/common/nm-vpn-helpers.c:119 #: ../clients/common/nm-vpn-helpers.c:120 #: ../clients/common/nm-vpn-helpers.c:124 @@ -6366,20 +6294,33 @@ msgid "PIN" msgstr "PIN" #: ../clients/common/nm-secret-agent-simple.c:500 -#: ../clients/common/nm-secret-agent-simple.c:515 -#: ../clients/common/nm-secret-agent-simple.c:533 +#: ../clients/common/nm-secret-agent-simple.c:534 +#: ../clients/common/nm-secret-agent-simple.c:552 msgid "Mobile broadband network password" msgstr "Пароль мобильной сети" #: ../clients/common/nm-secret-agent-simple.c:501 -#: ../clients/common/nm-secret-agent-simple.c:516 -#: ../clients/common/nm-secret-agent-simple.c:534 -#: ../clients/common/nm-secret-agent-simple.c:554 +#: ../clients/common/nm-secret-agent-simple.c:535 +#: ../clients/common/nm-secret-agent-simple.c:553 +#: ../clients/common/nm-secret-agent-simple.c:573 #, c-format msgid "A password is required to connect to '%s'." msgstr "Для подключения к «%s» требуется пароль." -#: ../clients/common/nm-secret-agent-simple.c:549 +#: ../clients/common/nm-secret-agent-simple.c:515 +#, c-format +msgid "Secrets are required to access the MACsec network '%s'" +msgstr "" + +#: ../clients/common/nm-secret-agent-simple.c:519 +msgid "MACsec PSK authentication" +msgstr "" + +#: ../clients/common/nm-secret-agent-simple.c:528 +msgid "MACsec EAP authentication" +msgstr "" + +#: ../clients/common/nm-secret-agent-simple.c:568 msgid "VPN password required" msgstr "Требуется пароль VPN" @@ -6432,40 +6373,50 @@ msgstr "Cookie" msgid "Gateway certificate hash" msgstr "Хэш сертификата шлюза" -#: ../clients/nm-online.c:114 +#: ../clients/nm-online.c:91 msgid "Connecting" msgstr "Подключение..." -#: ../clients/nm-online.c:181 +#: ../clients/nm-online.c:189 +#, fuzzy, c-format +msgid "Error: timeout creating NMClient object\n" +msgstr "Ошибка: не удалось создать объект NMClient: %s." + +#: ../clients/nm-online.c:209 +#, fuzzy, c-format +msgid "Error: Could not create NMClient object: %s\n" +msgstr "Ошибка: не удалось создать объект NMClient: %s." + +#: ../clients/nm-online.c:235 msgid "" "Time to wait for a connection, in seconds (without the option, default value " "is 30)" msgstr "Время ожидания соединения в секундах (по умолчанию 30)" -#: ../clients/nm-online.c:182 +#: ../clients/nm-online.c:236 msgid "Exit immediately if NetworkManager is not running or connecting" msgstr "" "Немедленно завершить работу, если NetworkManager не запущен или пытается " "установить соединение" -#: ../clients/nm-online.c:183 +#: ../clients/nm-online.c:237 msgid "Don't print anything" msgstr "Ничего не выводить" -#: ../clients/nm-online.c:184 +#: ../clients/nm-online.c:238 msgid "Wait for NetworkManager startup instead of a connection" msgstr "Ожидать запуска NetworkManager, а не установки соединения" -#: ../clients/nm-online.c:204 +#: ../clients/nm-online.c:260 msgid "" "Waits for NetworkManager to finish activating startup network connections." msgstr "Ожидать успешного соединения в NetworkManager." -#: ../clients/nm-online.c:211 ../clients/nm-online.c:217 +#: ../clients/nm-online.c:267 ../clients/nm-online.c:273 msgid "Invalid option. Please use --help to see a list of valid options." msgstr "Неверный параметр. Используйте --help для вывода списка параметров." -#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:418 +#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430 #: ../clients/tui/nmt-password-dialog.c:174 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69 #: ../clients/tui/nmtui.c:136 @@ -6498,8 +6449,8 @@ msgstr "Ошибка редактора. Сигнал: %d" msgid "Could not re-read file: %s" msgstr "Не удалось повторно прочитать файл: %s" -#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859 -#: ../libnm/nm-device.c:1661 +#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821 +#: ../libnm/nm-device.c:1617 msgid "Ethernet" msgstr "Ethernet" @@ -6508,8 +6459,8 @@ msgstr "Ethernet" msgid "Ethernet connection %d" msgstr "Проводное соединение %d" -#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861 -#: ../libnm/nm-device.c:1663 +#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823 +#: ../libnm/nm-device.c:1619 msgid "Wi-Fi" msgstr "Wi-Fi" @@ -6518,8 +6469,8 @@ msgstr "Wi-Fi" msgid "Wi-Fi connection %d" msgstr "Соединение Wi-Fi %d" -#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1899 -#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1673 +#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1939 +#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1629 msgid "InfiniBand" msgstr "InfiniBand" @@ -6528,8 +6479,8 @@ msgstr "InfiniBand" msgid "InfiniBand connection %d" msgstr "Соединение InfiniBand %d" -#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869 -#: ../libnm/nm-device.c:1671 +#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831 +#: ../libnm/nm-device.c:1627 msgid "Mobile Broadband" msgstr "Мобильное" @@ -6547,10 +6498,10 @@ msgstr "DSL" msgid "DSL connection %d" msgstr "Cоединение DSL %d" -#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1891 -#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626 -#: ../libnm/nm-device.c:1675 -#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4308 +#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1931 +#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626 +#: ../libnm/nm-device.c:1631 +#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4499 msgid "Bond" msgstr "Агрегированное (Bond)" @@ -6559,10 +6510,10 @@ msgstr "Агрегированное (Bond)" msgid "Bond connection %d" msgstr "Агрегированное (Bond) соединение %d" -#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1895 -#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630 -#: ../libnm/nm-device.c:1679 -#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4605 +#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1935 +#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630 +#: ../libnm/nm-device.c:1635 +#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4789 msgid "Bridge" msgstr "Мост" @@ -6571,10 +6522,10 @@ msgstr "Мост" msgid "Bridge connection %d" msgstr "Соединение типа «мост» %d" -#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1893 -#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628 -#: ../libnm/nm-device.c:1677 -#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4414 +#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1933 +#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628 +#: ../libnm/nm-device.c:1633 +#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4602 msgid "Team" msgstr "Агрегированное (Team)" @@ -6643,38 +6594,38 @@ msgstr "Не удалось открыть окно редактора для н msgid "Edit Connection" msgstr "Изменить соединение" -#: ../clients/tui/nmt-editor.c:165 +#: ../clients/tui/nmt-editor.c:174 #, c-format msgid "Unable to save connection: %s" msgstr "Не удалось сохранить соединение: %s" -#: ../clients/tui/nmt-editor.c:179 +#: ../clients/tui/nmt-editor.c:188 #, c-format msgid "Unable to add new connection: %s" msgstr "Не удалось добавить новое соединение: %s" -#: ../clients/tui/nmt-editor.c:321 +#: ../clients/tui/nmt-editor.c:333 msgid "Profile name" msgstr "Имя профиля" -#: ../clients/tui/nmt-editor.c:332 +#: ../clients/tui/nmt-editor.c:344 msgid "Ethernet device" msgstr "Устройство Ethernet" -#: ../clients/tui/nmt-editor.c:334 +#: ../clients/tui/nmt-editor.c:346 msgid "Device" msgstr "Устройство" #. And finally the bottom widgets -#: ../clients/tui/nmt-editor.c:394 +#: ../clients/tui/nmt-editor.c:406 msgid "Automatically connect" msgstr "Подключаться автоматически" -#: ../clients/tui/nmt-editor.c:400 +#: ../clients/tui/nmt-editor.c:412 msgid "Available to all users" msgstr "Доступно всем" -#: ../clients/tui/nmt-editor.c:415 ../clients/tui/nmt-password-dialog.c:171 +#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222 #: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67 msgid "Cancel" @@ -6720,7 +6671,7 @@ msgstr "MII (рекомендуется)" msgid "ARP" msgstr "ARP" -#: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:78 +#: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:85 #: ../clients/tui/nmt-page-team.c:152 msgid "Slaves" msgstr "Слейвы" @@ -6765,7 +6716,7 @@ msgid "BRIDGE PORT" msgstr "ПОРТ МОСТА" #: ../clients/tui/nmt-page-bridge-port.c:67 -#: ../clients/tui/nmt-page-bridge.c:110 +#: ../clients/tui/nmt-page-bridge.c:118 msgid "Priority" msgstr "Приоритет" @@ -6777,32 +6728,32 @@ msgstr "Стоимость пути" msgid "Hairpin mode" msgstr "Режим разворота пакетов" -#: ../clients/tui/nmt-page-bridge.c:88 ../clients/tui/nmt-page-bridge.c:119 -#: ../clients/tui/nmt-page-bridge.c:129 ../clients/tui/nmt-page-bridge.c:139 +#: ../clients/tui/nmt-page-bridge.c:96 ../clients/tui/nmt-page-bridge.c:127 +#: ../clients/tui/nmt-page-bridge.c:137 ../clients/tui/nmt-page-bridge.c:147 msgid "seconds" msgstr "сек." -#: ../clients/tui/nmt-page-bridge.c:89 +#: ../clients/tui/nmt-page-bridge.c:97 msgid "Aging time" msgstr "Время старения" -#: ../clients/tui/nmt-page-bridge.c:91 +#: ../clients/tui/nmt-page-bridge.c:99 msgid "Enable IGMP snooping" msgstr "Включить отслеживание IGMP" -#: ../clients/tui/nmt-page-bridge.c:97 +#: ../clients/tui/nmt-page-bridge.c:105 msgid "Enable STP (Spanning Tree Protocol)" msgstr "Включить STP (Spanning Tree Protocol)" -#: ../clients/tui/nmt-page-bridge.c:120 +#: ../clients/tui/nmt-page-bridge.c:128 msgid "Forward delay" msgstr "Задержка переадресации" -#: ../clients/tui/nmt-page-bridge.c:130 +#: ../clients/tui/nmt-page-bridge.c:138 msgid "Hello time" msgstr "Время приветствия" -#: ../clients/tui/nmt-page-bridge.c:140 +#: ../clients/tui/nmt-page-bridge.c:148 msgid "Max age" msgstr "Максимальный срок" @@ -7634,50 +7585,50 @@ msgstr "Не удалось проверить файл PKCS#12: %d" msgid "Could not generate random data." msgstr "Ошибка при генерации случайных данных." -#: ../libnm-core/nm-connection.c:225 +#: ../libnm-core/nm-connection.c:229 msgid "wrong type; should be a list of strings." msgstr "неверный тип; должен содержать список строк." -#: ../libnm-core/nm-connection.c:295 +#: ../libnm-core/nm-connection.c:299 msgid "unknown setting name" msgstr "неизвестное имя параметра" -#: ../libnm-core/nm-connection.c:307 +#: ../libnm-core/nm-connection.c:311 msgid "duplicate setting name" msgstr "повторяющееся имя параметра" -#: ../libnm-core/nm-connection.c:1044 +#: ../libnm-core/nm-connection.c:1080 msgid "setting not found" msgstr "параметр не найден" -#: ../libnm-core/nm-connection.c:1110 +#: ../libnm-core/nm-connection.c:1146 msgid "setting not allowed in slave connection" msgstr "параметр не может использоваться подчиненными соединениями" -#: ../libnm-core/nm-connection.c:1126 +#: ../libnm-core/nm-connection.c:1162 msgid "setting is required for non-slave connections" msgstr "параметр обязателен для неподчиненных соединений" -#: ../libnm-core/nm-connection.c:1221 +#: ../libnm-core/nm-connection.c:1257 msgid "Unexpected failure to verify the connection" msgstr "Непредвиденная ошибка при проверке соединения" -#: ../libnm-core/nm-connection.c:1258 +#: ../libnm-core/nm-connection.c:1296 msgid "Unexpected failure to normalize the connection" msgstr "Непредвиденная ошибка при нормализации соединения" -#: ../libnm-core/nm-connection.c:1759 ../libnm-core/nm-setting-8021x.c:2654 -#: ../libnm-core/nm-setting-8021x.c:2671 ../libnm-core/nm-setting-8021x.c:2702 -#: ../libnm-core/nm-setting-8021x.c:2719 ../libnm-core/nm-setting-8021x.c:2761 -#: ../libnm-core/nm-setting-8021x.c:2773 ../libnm-core/nm-setting-8021x.c:2791 -#: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2827 -#: ../libnm-core/nm-setting-8021x.c:2992 ../libnm-core/nm-setting-adsl.c:189 +#: ../libnm-core/nm-connection.c:1797 ../libnm-core/nm-setting-8021x.c:2872 +#: ../libnm-core/nm-setting-8021x.c:2889 ../libnm-core/nm-setting-8021x.c:2920 +#: ../libnm-core/nm-setting-8021x.c:2937 ../libnm-core/nm-setting-8021x.c:2979 +#: ../libnm-core/nm-setting-8021x.c:2991 ../libnm-core/nm-setting-8021x.c:3009 +#: ../libnm-core/nm-setting-8021x.c:3021 ../libnm-core/nm-setting-8021x.c:3045 +#: ../libnm-core/nm-setting-8021x.c:3226 ../libnm-core/nm-setting-adsl.c:189 #: ../libnm-core/nm-setting-bluetooth.c:120 -#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141 +#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:159 #: ../libnm-core/nm-setting-connection.c:871 #: ../libnm-core/nm-setting-connection.c:912 -#: ../libnm-core/nm-setting-connection.c:1025 -#: ../libnm-core/nm-setting-ip-config.c:2258 +#: ../libnm-core/nm-setting-connection.c:1026 +#: ../libnm-core/nm-setting-ip-config.c:2409 #: ../libnm-core/nm-setting-ip-tunnel.c:352 #: ../libnm-core/nm-setting-olpc-mesh.c:120 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419 @@ -7706,7 +7657,7 @@ msgstr "Непредвиденная ошибка при нормализаци msgid "property is missing" msgstr "свойство не определено" -#: ../libnm-core/nm-connection.c:1902 +#: ../libnm-core/nm-connection.c:1942 msgid "IP Tunnel" msgstr "Туннель IP" @@ -7715,222 +7666,223 @@ msgstr "Туннель IP" msgid "Method returned type '%s', but expected '%s'" msgstr "Метод вернул тип «%s», но ожидалось «%s»" -#: ../libnm-core/nm-keyfile-reader.c:142 +#: ../libnm-core/nm-keyfile-reader.c:144 msgid "ignoring missing number" msgstr "игнорируется пропущенное число" -#: ../libnm-core/nm-keyfile-reader.c:151 +#: ../libnm-core/nm-keyfile-reader.c:153 #, c-format msgid "ignoring invalid number '%s'" msgstr "игнорируется неверное число: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:171 +#: ../libnm-core/nm-keyfile-reader.c:173 #, c-format msgid "ignoring invalid %s address: %s" msgstr "игнорируется неверный адрес %s: %s" -#: ../libnm-core/nm-keyfile-reader.c:211 +#: ../libnm-core/nm-keyfile-reader.c:213 #, c-format msgid "ignoring invalid gateway '%s' for %s route" msgstr "игнорируется неверный шлюз «%s» для маршрута %s" -#: ../libnm-core/nm-keyfile-reader.c:231 +#: ../libnm-core/nm-keyfile-reader.c:233 #, c-format msgid "ignoring invalid %s route: %s" msgstr "игнорируется неверный маршрут %s: %s" -#: ../libnm-core/nm-keyfile-reader.c:349 +#: ../libnm-core/nm-keyfile-reader.c:351 #, c-format msgid "unexpected character '%c' for address %s: '%s' (position %td)" msgstr "непредвиденный символ «%c» адреса %s: «%s» (позиция %td)" -#: ../libnm-core/nm-keyfile-reader.c:359 +#: ../libnm-core/nm-keyfile-reader.c:361 #, c-format msgid "unexpected character '%c' for %s: '%s' (position %td)" msgstr "непредвиденный символ «%c» для %s: «%s» (позиция %td)" -#: ../libnm-core/nm-keyfile-reader.c:368 +#: ../libnm-core/nm-keyfile-reader.c:370 #, c-format msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)" msgstr "непредвиденный символ «%c» в длине префикса для %s: «%s» (позиция %td)" -#: ../libnm-core/nm-keyfile-reader.c:379 +#: ../libnm-core/nm-keyfile-reader.c:381 #, c-format msgid "garbage at the end of value %s: '%s'" msgstr "лишние данные в конце значения %s: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:385 +#: ../libnm-core/nm-keyfile-reader.c:387 #, c-format msgid "deprecated semicolon at the end of value %s: '%s'" msgstr "устаревшая точка с запятой в конце значения %s: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:400 +#: ../libnm-core/nm-keyfile-reader.c:402 #, c-format msgid "invalid prefix length for %s '%s', defaulting to %d" msgstr "" "недопустимая длина префикса для %s «%s»; по умолчанию будет использоваться %d" -#: ../libnm-core/nm-keyfile-reader.c:407 +#: ../libnm-core/nm-keyfile-reader.c:409 #, c-format msgid "missing prefix length for %s '%s', defaulting to %d" msgstr "" "не указана длина префикса для %s «%s»; по умолчанию будет использоваться %d" -#: ../libnm-core/nm-keyfile-reader.c:510 +#: ../libnm-core/nm-keyfile-reader.c:543 #, c-format msgid "ignoring invalid DNS server IPv4 address '%s'" msgstr "игнорируется недопустимый адрес IPv4 сервера DNS: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:549 +#: ../libnm-core/nm-keyfile-reader.c:582 #, c-format msgid "ignoring invalid DNS server IPv6 address '%s'" msgstr "игнорируется недопустимый адрес IPv6 сервера DNS: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:644 ../libnm-core/nm-keyfile-reader.c:1540 +#: ../libnm-core/nm-keyfile-reader.c:676 ../libnm-core/nm-keyfile-reader.c:1603 #, c-format msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)" msgstr "" "игнорируется недопустимый байтовый элемент «%d» (должен лежать в диапазоне " "от 0 до 255)" -#: ../libnm-core/nm-keyfile-reader.c:655 +#: ../libnm-core/nm-keyfile-reader.c:687 msgid "ignoring invalid MAC address" msgstr "игнорируется недопустимый MAC-адрес" -#: ../libnm-core/nm-keyfile-reader.c:864 +#: ../libnm-core/nm-keyfile-reader.c:924 msgid "ignoring invalid SSID" msgstr "игнорируется недействительный SSID" -#: ../libnm-core/nm-keyfile-reader.c:880 +#: ../libnm-core/nm-keyfile-reader.c:940 msgid "ignoring invalid raw password" msgstr "игнорируется неверный пароль в необработанном виде" -#: ../libnm-core/nm-keyfile-reader.c:955 ../libnm-core/nm-keyfile-reader.c:1131 +#: ../libnm-core/nm-keyfile-reader.c:1015 +#: ../libnm-core/nm-keyfile-reader.c:1191 #, c-format msgid "certificate or key file '%s' does not exist" msgstr "файла сертификата или ключа «%s» не существует" -#: ../libnm-core/nm-keyfile-reader.c:960 +#: ../libnm-core/nm-keyfile-reader.c:1020 #, c-format msgid "invalid key/cert value path \"%s\"" msgstr "неверный путь к ключу/сертификату: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:970 +#: ../libnm-core/nm-keyfile-reader.c:1030 #, c-format msgid "invalid PKCS#11 URI \"%s\"" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1008 +#: ../libnm-core/nm-keyfile-reader.c:1068 msgid "invalid key/cert value data:;base64, is not base64" msgstr "недопустимые данные ключа/сертификата: не является base64" -#: ../libnm-core/nm-keyfile-reader.c:1021 +#: ../libnm-core/nm-keyfile-reader.c:1081 msgid "invalid key/cert value data:;base64,file://" msgstr "недопустимые данные ключа/сертификата data:;base64,file://" -#: ../libnm-core/nm-keyfile-reader.c:1168 +#: ../libnm-core/nm-keyfile-reader.c:1228 msgid "invalid key/cert value is not a valid blob" msgstr "" "недопустимое значение ключа/сертификата: не содержит действительный большой " "двоичный объект" -#: ../libnm-core/nm-keyfile-reader.c:1173 +#: ../libnm-core/nm-keyfile-reader.c:1233 msgid "invalid key/cert value" msgstr "недопустимое значение ключа/сертификата" -#: ../libnm-core/nm-keyfile-reader.c:1220 +#: ../libnm-core/nm-keyfile-reader.c:1280 #, c-format msgid "invalid parity value '%s'" msgstr "недопустимое значение четности: «%s»" -#: ../libnm-core/nm-keyfile-reader.c:1238 +#: ../libnm-core/nm-keyfile-reader.c:1298 #, c-format msgid "ignoring invalid team configuration: %s" msgstr "" -#: ../libnm-core/nm-keyfile-reader.c:1441 +#: ../libnm-core/nm-keyfile-reader.c:1504 #, c-format msgid "error loading setting value: %s" msgstr "произошла ошибка при загрузке значения параметра: %s" -#: ../libnm-core/nm-keyfile-reader.c:1473 +#: ../libnm-core/nm-keyfile-reader.c:1536 #, c-format msgid "invalid negative value (%i)" msgstr "недопустимое отрицательное значение (%i)" -#: ../libnm-core/nm-keyfile-reader.c:1494 +#: ../libnm-core/nm-keyfile-reader.c:1557 #, c-format msgid "invalid char value (%i)" msgstr "недопустимое символьное значение (%i)" -#: ../libnm-core/nm-keyfile-reader.c:1517 +#: ../libnm-core/nm-keyfile-reader.c:1580 #, c-format msgid "invalid int64 value (%s)" msgstr "недопустимое значение int64 (%s)" -#: ../libnm-core/nm-keyfile-reader.c:1576 +#: ../libnm-core/nm-keyfile-reader.c:1639 #, c-format msgid "too large FLAGS property '%s' (%llu)" msgstr "слишком большое значение свойства FLAGS «%s» (%llu)" -#: ../libnm-core/nm-keyfile-reader.c:1589 +#: ../libnm-core/nm-keyfile-reader.c:1652 #, c-format msgid "unhandled setting property type '%s'" msgstr "необрабатываемый тип свойства параметра «%s»" -#: ../libnm-core/nm-keyfile-reader.c:1620 +#: ../libnm-core/nm-keyfile-reader.c:1683 #, c-format msgid "invalid setting name '%s'" msgstr "недопустимое название параметра «%s»" -#: ../libnm-core/nm-setting-8021x.c:414 +#: ../libnm-core/nm-setting-8021x.c:436 msgid "data missing" msgstr "отсутствуют данные" -#: ../libnm-core/nm-setting-8021x.c:450 +#: ../libnm-core/nm-setting-8021x.c:472 msgid "binary data missing" msgstr "отсутствуют двоичные данные" -#: ../libnm-core/nm-setting-8021x.c:478 +#: ../libnm-core/nm-setting-8021x.c:500 msgid "URI not NUL terminated" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:487 +#: ../libnm-core/nm-setting-8021x.c:509 msgid "URI is empty" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:495 +#: ../libnm-core/nm-setting-8021x.c:517 msgid "URI is not valid UTF-8" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:731 ../libnm-util/nm-setting-8021x.c:639 +#: ../libnm-core/nm-setting-8021x.c:753 ../libnm-util/nm-setting-8021x.c:639 msgid "CA certificate must be in X.509 format" msgstr "Сертификат центра сертификации должен быть в формате X.509" -#: ../libnm-core/nm-setting-8021x.c:1101 ../libnm-core/nm-setting-8021x.c:1405 -#: ../libnm-core/nm-setting-8021x.c:1781 ../libnm-util/nm-setting-8021x.c:957 +#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512 +#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543 msgid "invalid certificate format" msgstr "недействительный формат сертификата" -#: ../libnm-core/nm-setting-8021x.c:2098 ../libnm-util/nm-setting-8021x.c:1812 +#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812 msgid "invalid private key" msgstr "недействительный закрытый ключ" -#: ../libnm-core/nm-setting-8021x.c:2445 ../libnm-util/nm-setting-8021x.c:2123 +#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123 msgid "invalid phase2 private key" msgstr "недействительный закрытый ключ фазы 2" -#: ../libnm-core/nm-setting-8021x.c:2661 ../libnm-core/nm-setting-8021x.c:2678 -#: ../libnm-core/nm-setting-8021x.c:2709 ../libnm-core/nm-setting-8021x.c:2726 -#: ../libnm-core/nm-setting-8021x.c:2767 ../libnm-core/nm-setting-8021x.c:2779 -#: ../libnm-core/nm-setting-8021x.c:2797 ../libnm-core/nm-setting-8021x.c:2809 -#: ../libnm-core/nm-setting-8021x.c:2834 ../libnm-core/nm-setting-adsl.c:196 -#: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157 +#: ../libnm-core/nm-setting-8021x.c:2879 ../libnm-core/nm-setting-8021x.c:2896 +#: ../libnm-core/nm-setting-8021x.c:2927 ../libnm-core/nm-setting-8021x.c:2944 +#: ../libnm-core/nm-setting-8021x.c:2985 ../libnm-core/nm-setting-8021x.c:2997 +#: ../libnm-core/nm-setting-8021x.c:3015 ../libnm-core/nm-setting-8021x.c:3027 +#: ../libnm-core/nm-setting-8021x.c:3052 ../libnm-core/nm-setting-adsl.c:196 +#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175 #: ../libnm-core/nm-setting-connection.c:878 -#: ../libnm-core/nm-setting-connection.c:923 ../libnm-core/nm-setting-gsm.c:281 -#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375 -#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2265 +#: ../libnm-core/nm-setting-connection.c:923 ../libnm-core/nm-setting-gsm.c:299 +#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393 +#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2416 #: ../libnm-core/nm-setting-ip4-config.c:198 #: ../libnm-core/nm-setting-ip4-config.c:205 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158 @@ -7938,7 +7890,7 @@ msgstr "недействительный закрытый ключ фазы 2" #: ../libnm-core/nm-setting-wimax.c:135 #: ../libnm-core/nm-setting-wireless-security.c:891 #: ../libnm-core/nm-setting-wireless-security.c:915 -#: ../libnm-core/nm-setting.c:1134 ../libnm-util/nm-setting-8021x.c:2332 +#: ../libnm-core/nm-setting.c:1135 ../libnm-util/nm-setting-8021x.c:2332 #: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390 #: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458 #: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488 @@ -7957,19 +7909,24 @@ msgstr "недействительный закрытый ключ фазы 2" msgid "property is empty" msgstr "пустое свойство" -#: ../libnm-core/nm-setting-8021x.c:2691 ../libnm-core/nm-setting-8021x.c:2739 +#: ../libnm-core/nm-setting-8021x.c:2909 ../libnm-core/nm-setting-8021x.c:2957 #: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372 #: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430 #, c-format msgid "has to match '%s' property for PKCS#12" msgstr "должно соответствовать свойству «%s» для PKCS#12" -#: ../libnm-core/nm-setting-8021x.c:2966 +#: ../libnm-core/nm-setting-8021x.c:3188 #, c-format msgid "certificate is invalid: %s" msgstr "недействительный сертификат: %s" -#: ../libnm-core/nm-setting-8021x.c:3001 +#: ../libnm-core/nm-setting-8021x.c:3198 +#, c-format +msgid "password is not supported when certificate is not on a PKCS#11 token" +msgstr "" + +#: ../libnm-core/nm-setting-8021x.c:3235 #: ../libnm-core/nm-setting-bluetooth.c:129 #: ../libnm-core/nm-setting-infiniband.c:192 #: ../libnm-core/nm-setting-infiniband.c:207 @@ -7977,8 +7934,8 @@ msgstr "недействительный сертификат: %s" #: ../libnm-core/nm-setting-ip6-config.c:215 #: ../libnm-core/nm-setting-ip6-config.c:226 #: ../libnm-core/nm-setting-olpc-mesh.c:149 -#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:676 -#: ../libnm-core/nm-setting-wired.c:686 +#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678 +#: ../libnm-core/nm-setting-wired.c:688 #: ../libnm-core/nm-setting-wireless-security.c:934 #: ../libnm-core/nm-setting-wireless-security.c:943 #: ../libnm-core/nm-setting-wireless-security.c:952 @@ -8010,9 +7967,9 @@ msgstr "недействительный сертификат: %s" msgid "property is invalid" msgstr "неверное свойство" -#: ../libnm-core/nm-setting-8021x.c:3026 ../libnm-core/nm-setting-8021x.c:3036 -#: ../libnm-core/nm-setting-8021x.c:3046 ../libnm-core/nm-setting-8021x.c:3056 -#: ../libnm-core/nm-setting-8021x.c:3066 ../libnm-core/nm-setting-adsl.c:208 +#: ../libnm-core/nm-setting-8021x.c:3260 ../libnm-core/nm-setting-8021x.c:3270 +#: ../libnm-core/nm-setting-8021x.c:3280 ../libnm-core/nm-setting-8021x.c:3299 +#: ../libnm-core/nm-setting-8021x.c:3309 ../libnm-core/nm-setting-adsl.c:208 #: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146 #: ../libnm-core/nm-setting-wireless-security.c:870 #: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724 @@ -8024,99 +7981,96 @@ msgstr "неверное свойство" msgid "'%s' is not a valid value for the property" msgstr "«%s» — недопустимое значение свойства" +#: ../libnm-core/nm-setting-8021x.c:3290 +#, fuzzy +msgid "invalid auth flags" +msgstr "неверный маршру: %s" + #: ../libnm-core/nm-setting-bluetooth.c:168 #, c-format msgid "'%s' connection requires '%s' or '%s' setting" msgstr "соединение «%s» требует настройки параметра «%s» или «%s»" -#: ../libnm-core/nm-setting-bond.c:550 ../libnm-util/nm-setting-bond.c:502 +#: ../libnm-core/nm-setting-bond.c:552 ../libnm-util/nm-setting-bond.c:502 #, c-format msgid "invalid option '%s' or its value '%s'" msgstr "недопустимый параметр «%s» или его значение «%s»" -#: ../libnm-core/nm-setting-bond.c:575 ../libnm-util/nm-setting-bond.c:521 +#: ../libnm-core/nm-setting-bond.c:577 ../libnm-util/nm-setting-bond.c:521 #, c-format msgid "only one of '%s' and '%s' can be set" msgstr "Может быть определено только одно из двух — «%s» или «%s»." -#: ../libnm-core/nm-setting-bond.c:588 ../libnm-util/nm-setting-bond.c:532 +#: ../libnm-core/nm-setting-bond.c:590 ../libnm-util/nm-setting-bond.c:532 #, c-format msgid "mandatory option '%s' is missing" msgstr "Обязательный параметр «%s» не определен." -#: ../libnm-core/nm-setting-bond.c:598 ../libnm-util/nm-setting-bond.c:541 +#: ../libnm-core/nm-setting-bond.c:600 ../libnm-util/nm-setting-bond.c:541 #, c-format msgid "'%s' is not a valid value for '%s'" msgstr "«%s» — недопустимое значение «%s» " -#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:554 +#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:554 #, c-format msgid "'%s=%s' is incompatible with '%s > 0'" msgstr " «%s=%s» несовместимо с «%s > 0»" -#: ../libnm-core/nm-setting-bond.c:627 +#: ../libnm-core/nm-setting-bond.c:629 #, c-format msgid "'%s' is not a valid for '%s' option: %s" msgstr "" -#: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:577 +#: ../libnm-core/nm-setting-bond.c:640 ../libnm-util/nm-setting-bond.c:577 #, c-format msgid "'%s' option is only valid for '%s=%s'" msgstr "Параметр «%s» действителен только для «%s=%s»." -#: ../libnm-core/nm-setting-bond.c:651 ../libnm-util/nm-setting-bond.c:590 +#: ../libnm-core/nm-setting-bond.c:653 ../libnm-util/nm-setting-bond.c:590 #, c-format msgid "'%s=%s' is not a valid configuration for '%s'" msgstr "Недопустимая конфигурация («%s=%s») для «%s»" -#: ../libnm-core/nm-setting-bond.c:664 ../libnm-core/nm-setting-bond.c:673 -#: ../libnm-core/nm-setting-bond.c:693 ../libnm-core/nm-setting-bond.c:729 +#: ../libnm-core/nm-setting-bond.c:666 ../libnm-core/nm-setting-bond.c:675 +#: ../libnm-core/nm-setting-bond.c:695 ../libnm-core/nm-setting-bond.c:731 #: ../libnm-util/nm-setting-bond.c:603 ../libnm-util/nm-setting-bond.c:612 #: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668 #, c-format msgid "'%s' option requires '%s' option to be set" msgstr " Для «%s» необходимо, чтобы был определен параметр «%s»" -#: ../libnm-core/nm-setting-bond.c:704 ../libnm-util/nm-setting-bond.c:643 +#: ../libnm-core/nm-setting-bond.c:706 ../libnm-util/nm-setting-bond.c:643 #, c-format msgid "'%s' option is empty" msgstr "Пустой параметр: «%s»" -#: ../libnm-core/nm-setting-bond.c:716 ../libnm-util/nm-setting-bond.c:655 +#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:655 #, c-format msgid "'%s' is not a valid IPv4 address for '%s' option" msgstr "Недопустимый адрес IPv4 («%s») для «%s»." -#: ../libnm-core/nm-setting-bond.c:744 ../libnm-util/nm-setting-bond.c:682 +#: ../libnm-core/nm-setting-bond.c:746 ../libnm-util/nm-setting-bond.c:682 #, c-format msgid "'%s' option is only valid with mode '%s'" msgstr "параметр «%s» действителен только в режиме «%s»" -#: ../libnm-core/nm-setting-bond.c:755 +#: ../libnm-core/nm-setting-bond.c:757 #, c-format msgid "'%s' and '%s' cannot have different values" msgstr "«%s» и «%s» не могут иметь разные значения" -#: ../libnm-core/nm-setting-bond.c:771 +#: ../libnm-core/nm-setting-bond.c:773 #, c-format msgid "'%s' option should be string" msgstr "параметр «%s» должен содержать строку" -#: ../libnm-core/nm-setting-bridge-port.c:124 -#: ../libnm-core/nm-setting-bridge-port.c:136 -#: ../libnm-util/nm-setting-bridge-port.c:154 -#: ../libnm-util/nm-setting-bridge-port.c:166 -#, c-format -msgid "'%d' is not a valid value for the property (should be <= %d)" -msgstr "Недопустимое значение свойства: «%d» (должно быть <= %d)." - -#: ../libnm-core/nm-setting-bridge-port.c:154 +#: ../libnm-core/nm-setting-bridge-port.c:127 #: ../libnm-core/nm-setting-team-port.c:99 #, c-format msgid "missing setting" msgstr "пропущен параметр" -#: ../libnm-core/nm-setting-bridge-port.c:165 +#: ../libnm-core/nm-setting-bridge-port.c:138 #: ../libnm-core/nm-setting-team-port.c:110 #, c-format msgid "" @@ -8131,8 +8085,8 @@ msgstr "" msgid "value '%d' is out of range <%d-%d>" msgstr "значение «%d» выходит за пределы допустимого диапазона: <%d-%d>" -#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:650 -#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754 +#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:652 +#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756 #: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633 #: ../libnm-util/nm-setting-wired.c:691 msgid "is not a valid MAC address" @@ -8154,35 +8108,35 @@ msgstr "недопустимый тип соединения «%s»" msgid "Unknown slave type '%s'" msgstr "неизвестный тип подчиненного соединения: «%s»" -#: ../libnm-core/nm-setting-connection.c:978 +#: ../libnm-core/nm-setting-connection.c:979 #: ../libnm-util/nm-setting-connection.c:887 #, c-format msgid "Slave connections need a valid '%s' property" msgstr "Подчиненные соединения должны иметь действительное свойство «%s»" -#: ../libnm-core/nm-setting-connection.c:999 +#: ../libnm-core/nm-setting-connection.c:1000 #: ../libnm-util/nm-setting-connection.c:897 #, c-format msgid "Cannot set '%s' without '%s'" msgstr " «%s» не может быть настраиваться без «%s»" -#: ../libnm-core/nm-setting-connection.c:1013 +#: ../libnm-core/nm-setting-connection.c:1014 #, c-format msgid "metered value %d is not valid" msgstr "недействительное лимитное значение %d" -#: ../libnm-core/nm-setting-connection.c:1034 +#: ../libnm-core/nm-setting-connection.c:1035 #, c-format msgid "property type should be set to '%s'" msgstr "свойство должно иметь тип «%s»" -#: ../libnm-core/nm-setting-connection.c:1049 +#: ../libnm-core/nm-setting-connection.c:1050 #, c-format msgid "slave-type '%s' requires a '%s' setting in the connection" msgstr "" "для подчиненного соединения типа «%s» необходимо определить параметр «%s»" -#: ../libnm-core/nm-setting-connection.c:1059 +#: ../libnm-core/nm-setting-connection.c:1060 #, c-format msgid "" "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " @@ -8191,6 +8145,13 @@ msgstr "" "Определить подчиненное соединение с установленным «%s» и типом порта «%s». " "«%s» должно иметь значение «%s»." +#: ../libnm-core/nm-setting-connection.c:1077 +#, fuzzy, c-format +msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting" +msgstr "" +"Определить подчиненное соединение с установленным «%s» и типом порта «%s». " +"«%s» должно иметь значение «%s»." + #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594 msgid "flags invalid" msgstr "неверные флаги" @@ -8221,26 +8182,26 @@ msgstr "неверное свойство" msgid "property missing" msgstr "свойство не определено" -#: ../libnm-core/nm-setting-gsm.c:294 ../libnm-util/nm-setting-gsm.c:295 +#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295 #, c-format msgid "property value '%s' is empty or too long (>64)" msgstr "пустое значение «%s» или свойство не определено (>64)" -#: ../libnm-core/nm-setting-gsm.c:326 ../libnm-util/nm-setting-gsm.c:327 +#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327 #, c-format msgid "'%s' contains invalid char(s) (use [A-Za-z._-])" msgstr "«%s» содержит недопустимые символы. Используйте [A-Za-z._-]." -#: ../libnm-core/nm-setting-gsm.c:352 ../libnm-util/nm-setting-gsm.c:353 +#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353 #, c-format msgid "'%s' length is invalid (should be 5 or 6 digits)" msgstr "«%s» должно содержать 5-6 цифр" -#: ../libnm-core/nm-setting-gsm.c:397 +#: ../libnm-core/nm-setting-gsm.c:415 msgid "property is empty or wrong size" msgstr "свойство пустое или имеет неверный размер" -#: ../libnm-core/nm-setting-gsm.c:407 +#: ../libnm-core/nm-setting-gsm.c:425 msgid "property must contain only digits" msgstr "свойство может содержать только цифры" @@ -8304,45 +8265,82 @@ msgstr "Недопустимый префикс адреса IPv6: «%u»" msgid "Invalid routing metric '%s'" msgstr "Недопустимая метрика маршрутизации: «%s»" -#: ../libnm-core/nm-setting-ip-config.c:2278 +#: ../libnm-core/nm-setting-ip-config.c:1260 +#, fuzzy +msgid "unknown attribute" +msgstr "неизвестное имя параметра" + +#: ../libnm-core/nm-setting-ip-config.c:1270 +#, fuzzy, c-format +msgid "invalid attribute type '%s'" +msgstr "недопустимое значение четности: «%s»" + +#: ../libnm-core/nm-setting-ip-config.c:1281 +#, c-format +msgid "attribute is not valid for a IPv4 route" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:1282 +#, c-format +msgid "attribute is not valid for a IPv6 route" +msgstr "" + +#: ../libnm-core/nm-setting-ip-config.c:1298 +#: ../libnm-core/nm-setting-ip-config.c:1322 +#, fuzzy, c-format +msgid "'%s' is not a valid IPv4 address" +msgstr "недействительный IP-адрес: «%s»" + +#: ../libnm-core/nm-setting-ip-config.c:1299 +#: ../libnm-core/nm-setting-ip-config.c:1323 +#, fuzzy, c-format +msgid "'%s' is not a valid IPv6 address" +msgstr "недействительный IP-адрес: «%s»" + +#: ../libnm-core/nm-setting-ip-config.c:1313 +#, fuzzy, c-format +msgid "invalid prefix %s" +msgstr "неверный маршру: %s" + +#: ../libnm-core/nm-setting-ip-config.c:2429 #, c-format msgid "%d. DNS server address is invalid" msgstr "%d. Неверный адрес DNS-сервера" -#: ../libnm-core/nm-setting-ip-config.c:2294 +#: ../libnm-core/nm-setting-ip-config.c:2445 #, c-format msgid "%d. IP address is invalid" msgstr "%d. Неверный IP-адрес" -#: ../libnm-core/nm-setting-ip-config.c:2306 +#: ../libnm-core/nm-setting-ip-config.c:2457 #, c-format msgid "%d. IP address has 'label' property with invalid type" msgstr "%d. IP-адрес содержит свойство «label» недопустимого типа" -#: ../libnm-core/nm-setting-ip-config.c:2315 +#: ../libnm-core/nm-setting-ip-config.c:2466 #, c-format msgid "%d. IP address has invalid label '%s'" msgstr "%d. IP-адрес содержит неверную метку «%s»" -#: ../libnm-core/nm-setting-ip-config.c:2329 +#: ../libnm-core/nm-setting-ip-config.c:2480 msgid "gateway cannot be set if there are no addresses configured" msgstr "шлюз не может быть настроен, если заданы адреса" -#: ../libnm-core/nm-setting-ip-config.c:2338 +#: ../libnm-core/nm-setting-ip-config.c:2489 msgid "gateway is invalid" msgstr "неверный шлюз" -#: ../libnm-core/nm-setting-ip-config.c:2352 +#: ../libnm-core/nm-setting-ip-config.c:2503 #, c-format msgid "%d. route is invalid" msgstr "%d. Неверный маршрут" -#: ../libnm-core/nm-setting-ip-config.c:2361 +#: ../libnm-core/nm-setting-ip-config.c:2512 #, c-format msgid "%d. route cannot be a default route" msgstr "%d. Нельзя выбрать маршрут по умолчанию" -#: ../libnm-core/nm-setting-ip-config.c:2372 +#: ../libnm-core/nm-setting-ip-config.c:2523 #, fuzzy, c-format msgid "a gateway is incompatible with '%s'" msgstr " «%s=%s» несовместимо с «%s > 0»" @@ -8413,8 +8411,9 @@ msgid "'%d' is not a valid tunnel mode" msgstr "Недопустимый туннельный режим: «%d»" #: ../libnm-core/nm-setting-ip-tunnel.c:330 -#: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:645 -#: ../libnm-core/nm-setting-vxlan.c:403 ../libnm-util/nm-setting-vlan.c:567 +#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167 +#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403 +#: ../libnm-util/nm-setting-vlan.c:567 #, c-format msgid "'%s' is neither an UUID nor an interface name" msgstr "«%s» может содержать UUID или имя интерфейса." @@ -8439,12 +8438,42 @@ msgstr "Недопустимый ключ туннеля: «%s»" msgid "a fixed TTL is allowed only when path MTU discovery is enabled" msgstr "выбор фиксированного TTL возможен только при включении обнаружения MTU" -#: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:659 -#: ../libnm-util/nm-setting-vlan.c:580 +#: ../libnm-core/nm-setting-macsec.c:235 +msgid "the key is empty" +msgstr "" + +#: ../libnm-core/nm-setting-macsec.c:246 +#, c-format +msgid "the key must be %d characters" +msgstr "" + +#: ../libnm-core/nm-setting-macsec.c:254 +#, fuzzy +msgid "the key contains non-hexadecimal characters" +msgstr "ВИ включает не шестнадцатеричные цифры." + +#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634 +#: ../libnm-util/nm-setting-vlan.c:556 +#, c-format +msgid "'%s' value doesn't match '%s=%s'" +msgstr "Значение «%s» не соответствует «%s=%s»" + +#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181 +#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580 #, c-format msgid "property is not specified and neither is '%s:%s'" msgstr "Не определено свойство и «%s:%s»" +#: ../libnm-core/nm-setting-macsec.c:333 +#, c-format +msgid "EAP key management requires '%s' setting presence" +msgstr "" + +#: ../libnm-core/nm-setting-macsec.c:344 +#, c-format +msgid "invalid port %d" +msgstr "" + #: ../libnm-core/nm-setting-macvlan.c:192 msgid "non promiscuous operation is allowed only in passthru mode" msgstr "разнородные действия возможны только в сквозном режиме" @@ -8521,10 +8550,67 @@ msgstr "«%s»: неверный идентификатор пользовате msgid "'%s': invalid group ID" msgstr "«%s»: недействительный идентификатор группы" -#: ../libnm-core/nm-setting-vlan.c:634 ../libnm-util/nm-setting-vlan.c:556 +#: ../libnm-core/nm-setting-user.c:111 +#, fuzzy +msgid "missing key" +msgstr "пропущен параметр" + +#: ../libnm-core/nm-setting-user.c:117 +#, fuzzy +msgid "key is too long" +msgstr "Ошибка: слишком длинный SSID." + +#: ../libnm-core/nm-setting-user.c:122 +#, fuzzy +msgid "key must be UTF8" +msgstr "Пароль должен использовать кодировку UTF-8" + +#: ../libnm-core/nm-setting-user.c:145 +msgid "key requires a '.' for a namespace" +msgstr "" + +#: ../libnm-core/nm-setting-user.c:158 +msgid "key cannot contain \"..\"" +msgstr "" + +#: ../libnm-core/nm-setting-user.c:163 +#, fuzzy +msgid "key contains invalid characters" +msgstr "ВИ включает не шестнадцатеричные цифры." + +#: ../libnm-core/nm-setting-user.c:188 +#, fuzzy +msgid "value is missing" +msgstr "свойство не определено" + +#: ../libnm-core/nm-setting-user.c:195 +#, fuzzy +msgid "value is too large" +msgstr "Значение «%d» вне диапазона <0-3>" + +#: ../libnm-core/nm-setting-user.c:201 +#, fuzzy +msgid "value is not valid UTF8" +msgstr "Недействительный UUID: «%s»" + +#: ../libnm-core/nm-setting-user.c:338 +msgid "maximum number of user data entries reached" +msgstr "" + +#: ../libnm-core/nm-setting-user.c:379 +#, fuzzy, c-format +msgid "invalid key \"%s\": %s" +msgstr "неверный маршру: %s" + +#: ../libnm-core/nm-setting-user.c:383 +#, fuzzy, c-format +msgid "invalid value for \"%s\": %s" +msgstr "«%s» — недопустимое значение «%s» " + +#: ../libnm-core/nm-setting-user.c:398 #, c-format -msgid "'%s' value doesn't match '%s=%s'" -msgstr "Значение «%s» не соответствует «%s=%s»" +msgid "maximum number of user data entries reached (%u instead of %u)" +msgstr "" #: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600 #, c-format @@ -8537,6 +8623,10 @@ msgstr "" msgid "flags are invalid" msgstr "неверные флаги" +#: ../libnm-core/nm-setting-vlan.c:691 +msgid "vlan setting should have a ethernet setting as well" +msgstr "" + #: ../libnm-core/nm-setting-vpn.c:460 #, c-format msgid "secret was empty" @@ -8551,7 +8641,7 @@ msgstr "параметр содержит пароль с пустым имен msgid "secret value was empty" msgstr "пустое значение пароля" -#: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784 +#: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1785 msgid "not a secret property" msgstr "не является секретным свойством" @@ -8579,39 +8669,39 @@ msgstr "Недействительный MAC-адрес: «%s»" msgid "%d is greater than local port max %d" msgstr "%d превышает максимально допустимый номер локального порта, %d" -#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:613 +#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613 #, c-format msgid "'%s' is not a valid Ethernet port value" msgstr "«%s» не является допустимым значением порта Ethernet" -#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:623 +#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623 #, c-format msgid "'%s' is not a valid duplex value" msgstr "«%s» не является допустимым значением дуплекса" -#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:680 +#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680 #, c-format msgid "invalid '%s' or its value '%s'" msgstr "недопустимый параметр «%s» или его значение «%s»" -#: ../libnm-core/nm-setting-wired.c:736 +#: ../libnm-core/nm-setting-wired.c:738 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags" msgstr "" "Флаги режима Wake-on-LAN «default» и «ignore» являются взаимоисключающими" -#: ../libnm-core/nm-setting-wired.c:745 +#: ../libnm-core/nm-setting-wired.c:747 msgid "Wake-on-LAN password can only be used with magic packet mode" msgstr "Пароль Wake-on-LAN может использоваться только в режиме magic packet" -#: ../libnm-core/nm-setting-wired.c:768 +#: ../libnm-core/nm-setting-wired.c:770 msgid "when link autonegotiation is enabled no duplex value is accepted" msgstr "" -#: ../libnm-core/nm-setting-wired.c:776 +#: ../libnm-core/nm-setting-wired.c:778 msgid "when link autonegotiation is enabled speed should be 0" msgstr "" -#: ../libnm-core/nm-setting-wired.c:786 +#: ../libnm-core/nm-setting-wired.c:788 msgid "both speed and duplex are required for static link configuration" msgstr "" @@ -8672,137 +8762,172 @@ msgstr "" msgid "conflicting value of mac-address-randomization and cloned-mac-address" msgstr "" -#: ../libnm-core/nm-setting.c:837 +#: ../libnm-core/nm-setting.c:838 #, c-format msgid "duplicate property" msgstr "дублируемое свойство" -#: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912 +#: ../libnm-core/nm-setting.c:866 ../libnm-core/nm-setting.c:913 #, c-format msgid "can't set property of type '%s' from value of type '%s'" msgstr "" "свойство типа «%s» не может быть настроено на основании значения типа «%s»" -#: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898 +#: ../libnm-core/nm-setting.c:885 ../libnm-core/nm-setting.c:899 #, c-format msgid "failed to set property: %s" msgstr "не удалось установить свойство: %s" -#: ../libnm-core/nm-setting.c:926 +#: ../libnm-core/nm-setting.c:927 #, c-format msgid "can not set property: %s" msgstr "свойство не может быть настроено: %s" -#: ../libnm-core/nm-setting.c:942 +#: ../libnm-core/nm-setting.c:943 #, c-format msgid "unknown property" msgstr "неизвестное свойство" -#: ../libnm-core/nm-setting.c:1682 +#: ../libnm-core/nm-setting.c:1683 msgid "secret not found" msgstr "секрет не найден" -#: ../libnm-core/nm-setting.c:1774 +#: ../libnm-core/nm-setting.c:1775 msgid "secret is not set" msgstr "секрет не настроен" -#: ../libnm-core/nm-utils.c:2488 +#: ../libnm-core/nm-utils.c:2444 #, c-format msgid "failed stat file %s: %s" msgstr "не удалось получить статические данные для файла %s: %s" -#: ../libnm-core/nm-utils.c:2497 +#: ../libnm-core/nm-utils.c:2453 #, c-format msgid "not a file (%s)" msgstr "не является файлом (%s)" -#: ../libnm-core/nm-utils.c:2508 +#: ../libnm-core/nm-utils.c:2464 #, c-format msgid "invalid file owner %d for %s" msgstr "неверный владелец файла %d для %s" -#: ../libnm-core/nm-utils.c:2519 +#: ../libnm-core/nm-utils.c:2475 #, c-format msgid "file permissions for %s" msgstr "права доступа к файлам для %s" -#: ../libnm-core/nm-utils.c:2529 +#: ../libnm-core/nm-utils.c:2485 #, c-format msgid "reject %s" msgstr "отказать %s" -#: ../libnm-core/nm-utils.c:2549 +#: ../libnm-core/nm-utils.c:2505 #, c-format msgid "path is not absolute (%s)" msgstr "путь не является абсолютным (%s)" -#: ../libnm-core/nm-utils.c:2563 +#: ../libnm-core/nm-utils.c:2519 #, c-format msgid "Plugin file does not exist (%s)" msgstr "Файл модуля не существует (%s)" -#: ../libnm-core/nm-utils.c:2571 +#: ../libnm-core/nm-utils.c:2527 #, c-format msgid "Plugin is not a valid file (%s)" msgstr "Модуль не является действительным файлом (%s)" -#: ../libnm-core/nm-utils.c:2581 +#: ../libnm-core/nm-utils.c:2537 #, c-format msgid "libtool archives are not supported (%s)" msgstr "архивы libtool не поддерживаются (%s)" -#: ../libnm-core/nm-utils.c:2663 ../libnm-util/nm-utils.c:1803 +#: ../libnm-core/nm-utils.c:2619 ../libnm-util/nm-utils.c:1803 #, c-format msgid "Could not find \"%s\" binary" msgstr "Не удалось найти бинарный файл «%s»" -#: ../libnm-core/nm-utils.c:3709 +#: ../libnm-core/nm-utils.c:3665 #, c-format msgid "not a valid ethernet MAC address for mask at position %lld" msgstr "" -#: ../libnm-core/nm-utils.c:3724 +#: ../libnm-core/nm-utils.c:3680 #, c-format msgid "not a valid ethernet MAC address #%u at position %lld" msgstr "" -#: ../libnm-core/nm-utils.c:3758 +#: ../libnm-core/nm-utils.c:3714 msgid "interface name is too short" msgstr "" -#: ../libnm-core/nm-utils.c:3764 +#: ../libnm-core/nm-utils.c:3720 msgid "interface name is longer than 15 characters" msgstr "" -#: ../libnm-core/nm-utils.c:3770 +#: ../libnm-core/nm-utils.c:3726 msgid "interface name is reserved" msgstr "" -#: ../libnm-core/nm-utils.c:3777 +#: ../libnm-core/nm-utils.c:3733 msgid "interface name contains an invalid character" msgstr "" -#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629 +#: ../libnm-core/nm-utils.c:4534 ../libnm-core/nm-utils.c:4668 msgid "value is NULL" msgstr "" -#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629 +#: ../libnm-core/nm-utils.c:4534 ../libnm-core/nm-utils.c:4668 msgid "value is empty" msgstr "" -#: ../libnm-core/nm-utils.c:4504 +#: ../libnm-core/nm-utils.c:4543 #, c-format msgid "invalid JSON at position %d (%s)" msgstr "" -#: ../libnm-core/nm-utils.c:4516 ../libnm-core/nm-utils.c:4648 +#: ../libnm-core/nm-utils.c:4555 ../libnm-core/nm-utils.c:4687 msgid "is not a JSON object" msgstr "" -#: ../libnm-core/nm-utils.c:4618 +#: ../libnm-core/nm-utils.c:4657 msgid "not valid utf-8" msgstr "" +#: ../libnm-core/nm-utils.c:4782 ../libnm-core/nm-utils.c:4800 +#, c-format +msgid "unterminated escape sequence" +msgstr "" + +#: ../libnm-core/nm-utils.c:4810 +#, c-format +msgid "missing key-value separator '%c'" +msgstr "" + +#: ../libnm-core/nm-utils.c:4827 +#, fuzzy, c-format +msgid "unknown attribute '%s'" +msgstr "неизвестное устройство «%s»" + +#: ../libnm-core/nm-utils.c:4837 +#, fuzzy, c-format +msgid "invalid uint32 value '%s' for attribute '%s'" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-utils.c:4846 +#, fuzzy, c-format +msgid "invalid uint8 value '%s' for attribute '%s'" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-utils.c:4859 +#, fuzzy, c-format +msgid "invalid boolean value '%s' for attribute '%s'" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-utils.c:4867 +#, c-format +msgid "unsupported attribute '%s' of type '%s'" +msgstr "" + #: ../libnm-core/nm-vpn-editor-plugin.c:296 #, c-format msgid "cannot load plugin \"%s\": %s" @@ -8887,51 +9012,51 @@ msgstr "отсутствует имя для получения информац msgid "missing service for VPN plugin info" msgstr "отсутствует служба для получения информации о модуле VPN" -#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1665 +#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1621 msgid "Bluetooth" msgstr "Bluetooth" -#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1667 +#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1623 msgid "OLPC Mesh" msgstr "OLPC Mesh" -#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1669 +#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1625 msgid "WiMAX" msgstr "WiMAX" -#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1683 +#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1639 msgid "ADSL" msgstr "ADSL" -#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1685 +#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1641 msgid "MACVLAN" msgstr "MACVLAN" -#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1687 +#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1643 msgid "VXLAN" msgstr "VXLAN" -#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1689 +#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1645 msgid "IPTunnel" msgstr "IP-туннель" -#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1691 +#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1647 msgid "Tun" msgstr "Tun" -#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1693 +#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1649 msgid "Veth" msgstr "Veth" -#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1725 +#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1685 msgid "Wired" msgstr "Проводное" -#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1756 +#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1716 msgid "PCI" msgstr "PCI" -#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1758 +#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1718 msgid "USB" msgstr "USB" @@ -8941,8 +9066,8 @@ msgstr "USB" #. * "%2$s (%1$s)" if there's no grammatical way to combine #. * the strings otherwise. #. -#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071 -#: ../libnm/nm-device.c:1852 ../libnm/nm-device.c:1871 +#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034 +#: ../libnm/nm-device.c:1813 ../libnm/nm-device.c:1832 #, c-format msgctxt "long device name" msgid "%s %s" @@ -9070,6 +9195,15 @@ msgstr "" "Устройство не поддерживает возможности Bluetooth, запрашиваемые этим " "соединением." +#: ../libnm/nm-device-dummy.c:46 +#, fuzzy +msgid "The connection was not a dummy connection." +msgstr "Это соединение не является модемным подключением." + +#: ../libnm/nm-device-dummy.c:53 ../libnm/nm-device-generic.c:97 +msgid "The connection did not specify an interface name." +msgstr "Это соединение не определяет название интерфейса." + #: ../libnm/nm-device-ethernet.c:206 msgid "The connection was not an Ethernet or PPPoE connection." msgstr "Это соединение не является соединением Ethernet или PPPoE." @@ -9102,10 +9236,6 @@ msgstr "MAC-адрес устройства (%s) был добавлен сое msgid "The connection was not a generic connection." msgstr "Это соединение не относится к общему типу." -#: ../libnm/nm-device-generic.c:97 -msgid "The connection did not specify an interface name." -msgstr "Это соединение не определяет название интерфейса." - #: ../libnm/nm-device-tun.c:208 msgid "The connection was not a tun connection." msgstr "Это соединение не является туннельным." @@ -9196,12 +9326,20 @@ msgstr "" msgid "The connection was not a WiMAX connection." msgstr "Это соединение не относится к WiMAX." -#: ../libnm/nm-device.c:2583 +#: ../libnm/nm-device.c:1651 +msgid "MACsec" +msgstr "" + +#: ../libnm/nm-device.c:1653 +msgid "Dummy" +msgstr "" + +#: ../libnm/nm-device.c:2544 #, c-format msgid "The connection was not valid: %s" msgstr "Недействительное соединение: %s" -#: ../libnm/nm-device.c:2592 +#: ../libnm/nm-device.c:2553 #, c-format msgid "The interface names of the device and the connection didn't match." msgstr "Имена интерфейсов устройства и соединения не совпадают." @@ -9361,17 +9499,17 @@ msgstr "" msgid "System policy prevents enabling or disabling device statistics" msgstr "" -#: ../shared/nm-utils/nm-shared-utils.c:264 +#: ../shared/nm-utils/nm-shared-utils.c:312 #, c-format msgid "object class '%s' has no property named '%s'" msgstr "класс объекта «%s» не содержит свойства «%s»" -#: ../shared/nm-utils/nm-shared-utils.c:271 +#: ../shared/nm-utils/nm-shared-utils.c:319 #, c-format msgid "property '%s' of object class '%s' is not writable" msgstr "свойство «%s» класса объекта «%s» недоступно для записи" -#: ../shared/nm-utils/nm-shared-utils.c:278 +#: ../shared/nm-utils/nm-shared-utils.c:326 #, c-format msgid "" "construct property \"%s\" for object '%s' can't be set after construction" @@ -9379,20 +9517,20 @@ msgstr "" "формирование свойства «%s» для объекта «%s» не может быть настроено после " "сборки" -#: ../shared/nm-utils/nm-shared-utils.c:286 +#: ../shared/nm-utils/nm-shared-utils.c:334 #, c-format msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" msgstr "" "Недопустимое название свойства: «%s::%s». «%s» не является подтипом GObject" -#: ../shared/nm-utils/nm-shared-utils.c:295 +#: ../shared/nm-utils/nm-shared-utils.c:343 #, c-format msgid "unable to set property '%s' of type '%s' from value of type '%s'" msgstr "" "не удалось установить свойство «%s», так как его тип «%s» не может быть " "заменен типом «%s»" -#: ../shared/nm-utils/nm-shared-utils.c:306 +#: ../shared/nm-utils/nm-shared-utils.c:354 #, c-format msgid "" "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " @@ -9411,45 +9549,45 @@ msgctxt "connection id fallback" msgid "%s %d" msgstr "%s %d" -#: ../src/main.c:171 ../src/main.c:306 +#: ../src/main.c:176 ../src/main.c:315 #, c-format msgid "Failed to read configuration: %s\n" msgstr "Не удалось прочитать конфигурацию: %s\n" #. Logging/debugging -#: ../src/main.c:185 ../src/nm-iface-helper.c:302 +#: ../src/main.c:190 ../src/nm-iface-helper.c:309 msgid "Print NetworkManager version and exit" msgstr "Показать версию NetworkManager и выйти" -#: ../src/main.c:186 ../src/nm-iface-helper.c:303 +#: ../src/main.c:191 ../src/nm-iface-helper.c:310 msgid "Don't become a daemon" msgstr "Не использовать в качестве службы" -#: ../src/main.c:187 ../src/nm-iface-helper.c:305 +#: ../src/main.c:192 ../src/nm-iface-helper.c:312 #, c-format msgid "Log level: one of [%s]" msgstr "Уровень журнала: одно значение из [%s]" -#: ../src/main.c:189 ../src/nm-iface-helper.c:307 +#: ../src/main.c:194 ../src/nm-iface-helper.c:314 #, c-format msgid "Log domains separated by ',': any combination of [%s]" msgstr "" "Домены журналов должны быть перечислены через запятую и могут содержать " "любую комбинацию [%s]. " -#: ../src/main.c:191 ../src/nm-iface-helper.c:309 +#: ../src/main.c:196 ../src/nm-iface-helper.c:316 msgid "Make all warnings fatal" msgstr "Сделать все предупреждения критическими" -#: ../src/main.c:192 +#: ../src/main.c:197 msgid "Specify the location of a PID file" msgstr "Укажите расположение PID файла" -#: ../src/main.c:194 +#: ../src/main.c:199 msgid "Print NetworkManager configuration and exit" msgstr "Показать настройки NetworkManager и выйти" -#: ../src/main.c:204 +#: ../src/main.c:209 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -9461,28 +9599,28 @@ msgstr "" "А также позволяет пользователю задать беспроводные точки доступа, \n" "с которыми будут ассоциированы сетевые карты." -#: ../src/main.c:291 ../src/main-utils.c:283 ../src/nm-iface-helper.c:407 +#: ../src/main.c:300 ../src/main-utils.c:286 ../src/nm-iface-helper.c:414 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s. Используйте --help для вывода списка допустимых параметров.\n" -#: ../src/main.c:296 ../src/nm-iface-helper.c:412 +#: ../src/main.c:305 ../src/nm-iface-helper.c:419 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n" msgstr "Неизвестные домены журналов «%s» в строке команды. Пропускаются...\n" -#: ../src/main.c:321 +#: ../src/main.c:330 #, c-format msgid "Error in configuration file: %s.\n" msgstr "Ошибка в файле конфигурации: %s\n" -#: ../src/main.c:326 +#: ../src/main.c:335 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n" msgstr "" "Неизвестный домен журналов «%s» в файле конфигурации. Пропускается...\n" -#: ../src/main.c:337 ../src/nm-iface-helper.c:422 +#: ../src/main.c:346 ../src/nm-iface-helper.c:429 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "Невозможно преобразовать в службу: %s [ошибка %u]\n" @@ -9502,26 +9640,26 @@ msgstr "При записи в %s произошла ошибка: %s\n" msgid "Closing %s failed: %s\n" msgstr "При закрытии %s произошла ошибка: %s\n" -#: ../src/main-utils.c:148 ../src/main-utils.c:156 +#: ../src/main-utils.c:148 ../src/main-utils.c:159 #, c-format msgid "Cannot create '%s': %s" msgstr "Не удалось создать «%s»: %s" -#: ../src/main-utils.c:209 +#: ../src/main-utils.c:212 #, c-format msgid "%s is already running (pid %ld)\n" msgstr "%s уже запущен (pid %ld)\n" -#: ../src/main-utils.c:219 +#: ../src/main-utils.c:222 #, c-format msgid "You must be root to run %s!\n" msgstr "Вы должны быть суперпользователем для запуска %s\n" -#: ../src/dhcp/nm-dhcp-dhclient-utils.c:252 +#: ../src/dhcp/nm-dhcp-dhclient-utils.c:278 msgid "# Created by NetworkManager\n" msgstr "# Создано в NetworkManager\n" -#: ../src/dhcp/nm-dhcp-dhclient-utils.c:261 +#: ../src/dhcp/nm-dhcp-dhclient-utils.c:288 #, c-format msgid "" "# Merged from %s\n" @@ -9530,7 +9668,7 @@ msgstr "" "# Объединено с %s\n" "\n" -#: ../src/devices/bluetooth/nm-bluez-device.c:209 +#: ../src/devices/bluetooth/nm-bluez-device.c:210 #, c-format msgid "%s Network" msgstr "Сеть %s" @@ -9572,9 +9710,9 @@ msgid "Unknown/unhandled Bluetooth connection type" msgstr "Неизвестный или необрабатываемый тип соединения Bluetooth" #: ../src/devices/bluetooth/nm-device-bt.c:347 -#: ../src/devices/nm-device-ethernet.c:1508 -#: ../src/devices/nm-device-infiniband.c:204 -#: ../src/devices/wifi/nm-device-wifi.c:910 +#: ../src/devices/nm-device-ethernet.c:1454 +#: ../src/devices/nm-device-infiniband.c:210 +#: ../src/devices/wifi/nm-device-wifi.c:928 msgid "connection does not match device" msgstr "соединение не соответствует устройству" @@ -9586,11 +9724,16 @@ msgstr "Агрегированное (Bond) соединение" msgid "Bridge connection" msgstr "Мостовое соединение" -#: ../src/devices/nm-device-ethernet.c:1489 +#: ../src/devices/nm-device-dummy.c:70 +#, fuzzy +msgid "Dummy connection" +msgstr "Соединение ADSL" + +#: ../src/devices/nm-device-ethernet.c:1435 msgid "PPPoE connection" msgstr "Соединение PPPoE" -#: ../src/devices/nm-device-ethernet.c:1489 +#: ../src/devices/nm-device-ethernet.c:1435 msgid "Wired connection" msgstr "Проводное соединение" @@ -9611,7 +9754,7 @@ msgstr "Соединение MACVLAN" msgid "TUN connection" msgstr "Соединение TUN" -#: ../src/devices/team/nm-device-team.c:134 +#: ../src/devices/team/nm-device-team.c:135 msgid "Team connection" msgstr "Агрегированное (Team) соединение" @@ -9619,7 +9762,7 @@ msgstr "Агрегированное (Team) соединение" msgid "Mesh" msgstr "Mesh" -#: ../src/devices/wifi/nm-device-wifi.c:877 +#: ../src/devices/wifi/nm-device-wifi.c:895 msgid "WPA Ad-Hoc disabled due to kernel bugs" msgstr "WPA Ad-Hoc отключен из-за ошибок ядра" @@ -9799,135 +9942,135 @@ msgstr "Не удалось получить информацию о защит msgid "GSM mobile broadband connection requires a 'gsm' setting" msgstr "Мобильное соединение GSM требует установки параметра «gsm»" -#: ../src/nm-config.c:466 +#: ../src/nm-config.c:486 msgid "Config file location" msgstr "Расположение файла конфигурации" -#: ../src/nm-config.c:467 +#: ../src/nm-config.c:487 msgid "Config directory location" msgstr "Путь к каталогу конфигурации" -#: ../src/nm-config.c:468 +#: ../src/nm-config.c:488 msgid "System config directory location" msgstr "Расположение каталога с системными настройками" -#: ../src/nm-config.c:469 +#: ../src/nm-config.c:489 msgid "Internal config file location" msgstr "Расположение внутреннего файла конфигурации" -#: ../src/nm-config.c:470 +#: ../src/nm-config.c:490 msgid "State file location" msgstr "Расположение файла состояния" -#: ../src/nm-config.c:471 +#: ../src/nm-config.c:491 msgid "State file for no-auto-default devices" msgstr "" "Файл состояния для устройств, которые автоматически не устанавливают " "параметры по умолчанию" -#: ../src/nm-config.c:472 +#: ../src/nm-config.c:492 msgid "List of plugins separated by ','" msgstr "Список модулей (через запятую)" -#: ../src/nm-config.c:473 +#: ../src/nm-config.c:493 msgid "Quit after initial configuration" msgstr "Выйти после исходной настройки" -#: ../src/nm-config.c:474 ../src/nm-iface-helper.c:304 +#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:311 msgid "Don't become a daemon, and log to stderr" msgstr "Не работать в режиме службы и не входить в stderr" #. These three are hidden for now, and should eventually just go away. -#: ../src/nm-config.c:477 +#: ../src/nm-config.c:497 msgid "An http(s) address for checking internet connectivity" msgstr "http(s) адрес для проверки соединения с Интернетом" -#: ../src/nm-config.c:478 +#: ../src/nm-config.c:498 msgid "The interval between connectivity checks (in seconds)" msgstr "Интервал между проверками соединения (в секундах)" -#: ../src/nm-config.c:479 +#: ../src/nm-config.c:499 msgid "The expected start of the response" msgstr "Ожидается начало ответа" #. Interface/IP config -#: ../src/nm-iface-helper.c:284 +#: ../src/nm-iface-helper.c:291 msgid "The interface to manage" msgstr "Интерфейс для управления" -#: ../src/nm-iface-helper.c:285 +#: ../src/nm-iface-helper.c:292 msgid "Connection UUID" msgstr "UUID соединения" -#: ../src/nm-iface-helper.c:286 +#: ../src/nm-iface-helper.c:293 msgid "Connection Token for Stable IDs" msgstr "" -#: ../src/nm-iface-helper.c:287 +#: ../src/nm-iface-helper.c:294 msgid "Whether to manage IPv6 SLAAC" msgstr "Разрешает управлять IPv6 SLAAC" -#: ../src/nm-iface-helper.c:288 +#: ../src/nm-iface-helper.c:295 msgid "Whether SLAAC must be successful" msgstr "Должен ли SLAAC быть успешным" -#: ../src/nm-iface-helper.c:289 +#: ../src/nm-iface-helper.c:296 msgid "Use an IPv6 temporary privacy address" msgstr "Использовать временный частный адрес IPv6" -#: ../src/nm-iface-helper.c:290 +#: ../src/nm-iface-helper.c:297 msgid "Current DHCPv4 address" msgstr "Текущий адрес DHCPv4" -#: ../src/nm-iface-helper.c:291 +#: ../src/nm-iface-helper.c:298 msgid "Whether DHCPv4 must be successful" msgstr "Должен ли DHCPv4 быть успешным" -#: ../src/nm-iface-helper.c:292 +#: ../src/nm-iface-helper.c:299 msgid "Hex-encoded DHCPv4 client ID" msgstr "Идентификатор клиента DHCPv4, зашифрованный в шестнадцатеричном виде" -#: ../src/nm-iface-helper.c:293 +#: ../src/nm-iface-helper.c:300 msgid "Hostname to send to DHCP server" msgstr "Имя узла для передачи серверу DHCP" -#: ../src/nm-iface-helper.c:293 +#: ../src/nm-iface-helper.c:300 msgid "barbar" msgstr "чточто" -#: ../src/nm-iface-helper.c:294 +#: ../src/nm-iface-helper.c:301 msgid "FQDN to send to DHCP server" msgstr "Полное имя узла (FQDN) для передаче серверу DHCP" -#: ../src/nm-iface-helper.c:294 +#: ../src/nm-iface-helper.c:301 msgid "host.domain.org" msgstr "узел.домен.org" -#: ../src/nm-iface-helper.c:295 +#: ../src/nm-iface-helper.c:302 msgid "Route priority for IPv4" msgstr "Приоритет маршрута для IPv4" -#: ../src/nm-iface-helper.c:295 +#: ../src/nm-iface-helper.c:302 msgid "0" msgstr "0" -#: ../src/nm-iface-helper.c:296 +#: ../src/nm-iface-helper.c:303 msgid "Route priority for IPv6" msgstr "Приоритет маршрута для IPv6" -#: ../src/nm-iface-helper.c:296 +#: ../src/nm-iface-helper.c:303 msgid "1024" msgstr "1024" -#: ../src/nm-iface-helper.c:297 +#: ../src/nm-iface-helper.c:304 msgid "Hex-encoded Interface Identifier" msgstr "Идентификатор интерфейса, зашифрованный в шестнадцатеричном виде" -#: ../src/nm-iface-helper.c:298 +#: ../src/nm-iface-helper.c:305 msgid "IPv6 SLAAC address generation mode" msgstr "Режим генерации адреса IPv6 SLAAC" -#: ../src/nm-iface-helper.c:299 +#: ../src/nm-iface-helper.c:306 msgid "" "The logging backend configuration value. See logging.backend in " "NetworkManager.conf" @@ -9935,7 +10078,7 @@ msgstr "" "Значение настройки механизма ведения журнала. См. logging.backend в " "NetworkManager.conf" -#: ../src/nm-iface-helper.c:319 +#: ../src/nm-iface-helper.c:326 msgid "" "nm-iface-helper is a small, standalone process that manages a single network " "interface." @@ -9943,31 +10086,39 @@ msgstr "" "nm-iface-helper — небольшой независимый процесс, осуществляющий управление " "отдельным сетевым интерфейсом." -#: ../src/nm-iface-helper.c:388 +#: ../src/nm-iface-helper.c:395 #, c-format msgid "An interface name and UUID are required\n" msgstr "Необходимо указать имя интерфейса и UUID\n" -#: ../src/nm-iface-helper.c:394 +#: ../src/nm-iface-helper.c:401 #, c-format msgid "Failed to find interface index for %s (%s)\n" msgstr "Не удалось найти индекс интерфейса для %s (%s)\n" -#: ../src/nm-iface-helper.c:456 +#: ../src/nm-iface-helper.c:462 #, c-format msgid "(%s): Invalid IID %s\n" msgstr "(%s): недействительный IID %s\n" -#: ../src/nm-logging.c:266 +#: ../src/nm-logging.c:267 #, c-format msgid "Unknown log level '%s'" msgstr "Неизвестный уровень ведения журнала «%s»" -#: ../src/nm-logging.c:368 +#: ../src/nm-logging.c:369 #, c-format msgid "Unknown log domain '%s'" msgstr "Неизвестный домен журналирования «%s»" -#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:107 -msgid "System" -msgstr "Система" +#, fuzzy +#~ msgid "unrecognized option '%s'" +#~ msgstr "Недопустимый параметр «%s»" + +#~ msgid "Option '--terse' requires specifying '--fields'" +#~ msgstr "Параметр «--terse» требует указания «--fields»" + +#~ msgid "" +#~ "Option '--terse' requires specific '--fields' option values , not '%s'" +#~ msgstr "" +#~ "Параметр «--terse» требует определённых значений «--fields», но не «%s»" |